back to working map
move geolocation stuff
move geolocation stuff