adding map
Merge branch 'feature/adding-map'