Moved around all the stuff that needed moving
Made MappingControl a singleton