More refactoring. First test with levels.