Unbroke stuff, also semi-implemented map loading