added to TODO while working on map find