Putting the map into the other bit
Merge branch 'master' of github.com:daruane/spunout_supa_hacka