Making progress on map. it is slow though