got the map fully working