Map stuff

Stuff for map