Did further work on map loading
Finished loading map info :D