all map logic now in one file and one view