Partial work on map.