refactoring in progress, may or may not compile, and i need my bed