Revert "Benji branch"

Reverts FC-Chaps/Mapping-Project#11