refactoring out lame classes while I'm in here