most of the way through what i'm going to call...

REFACTORING