Begin bringing back projection of map
More work
Working. Still needs testing