pre-final stuff
More refactoring!
couple o' bugs preventing build