Plane code! More refactoring, fixed up the rest of MapManager