Got a half decent version of the map working