Engineering remap

PLEASE DON'T MERGE THIS YET

These are all the code changes for my engineering remap, details are in the commits.

I still need to commit the map, but will only do that once Snapshots map changes have been merged, otherwise they'll probably conflict.