Add basic map
Add map markers
Add todo
Merge branch 'feature-shows-map'