map functionality 85% in place
redo--map 85% functional