Revert "Map Changes, Merge Conflict Fix? I hope?"

This reverts commit a2a4ace9f893b51108f941f0df04ef1b1ed8a871.
Revert "Map Changes, Attempt #2"

This reverts commit 5801818e95cd3b0a45bd727cd55526c0a9c16691.