Added the map stuff