Changes a'comin'

Long-needed revamp due!