Long overdue working version of map
Pre-alpha of final map