started on the map, need tests