Cleaning up and rebuilding some of the stuff, also no map right away