Re-add switch throwing functionality to the map