Refactoring things a little to start map generation sorta.