More refactoring, Schimmy implementation.