Merge pull request #75 from sli-fox/steph_branch

Steph branch
intermediate changes
intermediate changes 2
Merge pull request #89 from sli-fox/jeremy

Jeremy
able to undo/redo map
Merge pull request #90 from sli-fox/mri

able to undo/redo map