More refactoring! Break everything!