INitial map work
Map is showing!
Merge branch 'map'