A version for easy reference with the map button in case we want to revert
Strip out unwanted features and make Seb's changes

Sorry for hopelessly broad and vague commit