diff --git a/code/controllers/master_controller.dm b/code/controllers/master_controller.dm
index 1fd81402544..7a078a67970 100644
--- a/code/controllers/master_controller.dm
+++ b/code/controllers/master_controller.dm
@@ -36,29 +36,7 @@ var/global/pipe_processing_killed = 0
 	return QDEL_HINT_HARDDEL_NOW
 
 /datum/controller/game_controller/proc/setup()
-	preloadTemplates()
-	if(!config.disable_away_missions)
-		createRandomZlevel()
-	// Create 6 extra space levels to put space ruins on
-	if(!config.disable_space_ruins)
-		var/timer = start_watch()
-		log_startup_progress("Creating random space levels...")
-		seedRuins(level_name_to_num(EMPTY_AREA), rand(0, 3), /area/space, space_ruins_templates)
-		log_startup_progress("Loaded random space levels in [stop_watch(timer)]s.")
-
-		// load in extra levels of space ruins
-
-		var/num_extra_space = rand(config.extra_space_ruin_levels_min, config.extra_space_ruin_levels_max)
-		for(var/i = 1, i <= num_extra_space, i++)
-			var/zlev = space_manager.add_new_zlevel("[EMPTY_AREA] #[i]", linkage = CROSSLINKED)
-			seedRuins(zlev, rand(0, 3), /area/space, space_ruins_templates)
-
-	space_manager.do_transition_setup()
-
 	setupfactions()
 	setup_economy()
 
-	for(var/i=0, i<max_secret_rooms, i++)
-		make_mining_asteroid_secret()
-
 	populate_spawn_points()
\ No newline at end of file
diff --git a/code/controllers/subsystem/mapping.dm b/code/controllers/subsystem/mapping.dm
new file mode 100644
index 00000000000..6bf2b38e21f
--- /dev/null
+++ b/code/controllers/subsystem/mapping.dm
@@ -0,0 +1,37 @@
+SUBSYSTEM_DEF(mapping)
+   	name = "Mapping"
+   	init_order = 12
+   	flags = SS_NO_FIRE
+
+/datum/controller/subsystem/mapping/New()
+   	NEW_SS_GLOBAL(SSmapping)
+   	return ..()
+
+/datum/controller/subsystem/mapping/Initialize(timeofday)
+   	// Load all Z level templates
+    preloadTemplates()
+    // Pick a random away mission.
+   	if(!config.disable_away_missions)
+   	   	createRandomZlevel()
+    // Seed space ruins
+   	if(!config.disable_space_ruins)
+   	   	var/timer = start_watch()
+   	   	log_startup_progress("Creating random space levels...")
+   	   	seedRuins(level_name_to_num(EMPTY_AREA), rand(0, 3), /area/space, space_ruins_templates)
+   	   	log_startup_progress("Loaded random space levels in [stop_watch(timer)]s.")
+
+   	   	// load in extra levels of space ruins
+
+   	   	var/num_extra_space = rand(config.extra_space_ruin_levels_min, config.extra_space_ruin_levels_max)
+   	   	for(var/i = 1, i <= num_extra_space, i++)
+   	   	   	var/zlev = space_manager.add_new_zlevel("[EMPTY_AREA] #[i]", linkage = CROSSLINKED)
+   	   	   	seedRuins(zlev, rand(0, 3), /area/space, space_ruins_templates)
+
+    // Setup the Z-level linkage
+    space_manager.do_transition_setup()
+   	// Populate mining Z-level hidden rooms
+    for(var/i=0, i<max_secret_rooms, i++)
+   	   	make_mining_asteroid_secret()
+
+/datum/controller/subsystem/mapping/Recover()
+   	flags |= SS_NO_INIT 
\ No newline at end of file
diff --git a/paradise.dme b/paradise.dme
index a2faec5c589..1811d3a9c25 100644
--- a/paradise.dme
+++ b/paradise.dme
@@ -215,6 +215,7 @@
 #include "code\controllers\subsystem\garbage.dm"
 #include "code\controllers\subsystem\icon_smooth.dm"
 #include "code\controllers\subsystem\machinery.dm"
+#include "code\controllers\subsystem\mapping.dm"
 #include "code\controllers\subsystem\mobs.dm"
 #include "code\controllers\subsystem\nano_mob_hunter.dm"
 #include "code\controllers\subsystem\nanoui.dm"