Added map view
Merge all of the things!!!