diff --git a/ChapterMaster.yyp b/ChapterMaster.yyp
index c77b88834..13129b3a5 100644
--- a/ChapterMaster.yyp
+++ b/ChapterMaster.yyp
@@ -173,6 +173,7 @@
     {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"daemon7.png","CopyToMask":-1,"filePath":"datafiles/images/diplomacy",},
     {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"daemon8.png","CopyToMask":-1,"filePath":"datafiles/images/diplomacy",},
     {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"daemon9.png","CopyToMask":-1,"filePath":"datafiles/images/diplomacy",},
+    {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"diplomacy_icons.png","CopyToMask":-1,"filePath":"datafiles/images/diplomacy",},
     {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"diplomacy10.png","CopyToMask":-1,"filePath":"datafiles/images/diplomacy",},
     {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"diplomacy11.png","CopyToMask":-1,"filePath":"datafiles/images/diplomacy",},
     {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"diplomacy12.png","CopyToMask":-1,"filePath":"datafiles/images/diplomacy",},
@@ -183,7 +184,6 @@
     {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"diplomacy6.png","CopyToMask":-1,"filePath":"datafiles/images/diplomacy",},
     {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"diplomacy7.png","CopyToMask":-1,"filePath":"datafiles/images/diplomacy",},
     {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"diplomacy8.png","CopyToMask":-1,"filePath":"datafiles/images/diplomacy",},
-    {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"diplomacy_icons.png","CopyToMask":-1,"filePath":"datafiles/images/diplomacy",},
     {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"instructions.txt","CopyToMask":9223372036854775807,"filePath":"datafiles/images/diplomacy",},
     {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"symbol1.png","CopyToMask":-1,"filePath":"datafiles/images/diplomacy",},
     {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"symbol2.png","CopyToMask":-1,"filePath":"datafiles/images/diplomacy",},
@@ -396,10 +396,10 @@
     {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"eldar.json","CopyToMask":-1,"filePath":"datafiles/main/names",},
     {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"genestealercult.json","CopyToMask":-1,"filePath":"datafiles/main/names",},
     {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"hulk.json","CopyToMask":-1,"filePath":"datafiles/main/names",},
-    {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"imperial.json","CopyToMask":-1,"filePath":"datafiles/main/names",},
     {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"imperial_ship.json","CopyToMask":-1,"filePath":"datafiles/main/names",},
-    {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"ork.json","CopyToMask":-1,"filePath":"datafiles/main/names",},
+    {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"imperial.json","CopyToMask":-1,"filePath":"datafiles/main/names",},
     {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"ork_ship.json","CopyToMask":-1,"filePath":"datafiles/main/names",},
+    {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"ork.json","CopyToMask":-1,"filePath":"datafiles/main/names",},
     {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"sector.json","CopyToMask":-1,"filePath":"datafiles/main/names",},
     {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"space_marine.json","CopyToMask":-1,"filePath":"datafiles/main/names",},
     {"resourceType":"GMIncludedFile","resourceVersion":"1.0","name":"star.json","CopyToMask":-1,"filePath":"datafiles/main/names",},
@@ -1447,6 +1447,6 @@
   ],
   "templateType": null,
   "TextureGroups": [
-    {"resourceType":"GMTextureGroup","resourceVersion":"1.3","name":"Default","autocrop":true,"border":2,"compressFormat":"bz2","customOptions":"","directory":"","groupParent":null,"isScaled":false,"loadType":"default","mipsToGenerate":0,"targets":-1,},
+    {"resourceType":"GMTextureGroup","resourceVersion":"1.3","name":"Default","autocrop":true,"border":2,"compressFormat":"bz2","directory":"","groupParent":null,"isScaled":false,"loadType":"default","mipsToGenerate":0,"targets":-1,},
   ],
 }
\ No newline at end of file
diff --git a/fonts/fnt_menu/fnt_menu.old.png b/fonts/fnt_menu/fnt_menu.old.png
index 5136b0e9e..2e723baae 100644
Binary files a/fonts/fnt_menu/fnt_menu.old.png and b/fonts/fnt_menu/fnt_menu.old.png differ
diff --git a/fonts/fnt_menu/fnt_menu.png b/fonts/fnt_menu/fnt_menu.png
index 2e723baae..b2b016724 100644
Binary files a/fonts/fnt_menu/fnt_menu.png and b/fonts/fnt_menu/fnt_menu.png differ
diff --git a/objects/obj_controller/Alarm_0.gml b/objects/obj_controller/Alarm_0.gml
index 7d9932e0d..f557c6977 100644
--- a/objects/obj_controller/Alarm_0.gml
+++ b/objects/obj_controller/Alarm_0.gml
@@ -3,7 +3,5 @@ instance_activate_object(obj_star);
 if (instance_exists(obj_ini)) and (global.load==0){
 	alarm[1]=2;
     instance_activate_object(obj_star);
-    instance_activate_object(obj_restart_vars);
     instance_activate_all();
 }
-instance_activate_object(obj_restart_vars);
diff --git a/objects/obj_controller/Alarm_1.gml b/objects/obj_controller/Alarm_1.gml
index 63065e8e4..4948560dc 100644
--- a/objects/obj_controller/Alarm_1.gml
+++ b/objects/obj_controller/Alarm_1.gml
@@ -1,6 +1,5 @@
 // Sets up the sector spawn and assigns spawned enemies to the sector
 instance_activate_object(obj_star);
-instance_activate_object(obj_restart_vars);
 instance_activate_all();
 
 // Should determine here, randomly what sort of enemy planets there are
@@ -627,8 +626,6 @@ for(var i=0; i<100; i++){
 }
 // End craftworld
 
-scr_restart_variables(2);
-
 if (!instance_exists(obj_saveload)) and (instance_exists(obj_creation)) and (global.load=0){
     for(var i=1; i<=10; i++){
         if (obj_creation.world[i]!=""){
diff --git a/objects/obj_creation/Create_0.gml b/objects/obj_creation/Create_0.gml
index 9ba4ec85a..0899ca528 100644
--- a/objects/obj_creation/Create_0.gml
+++ b/objects/obj_creation/Create_0.gml
@@ -875,8 +875,8 @@ if (global.restart>0){
     slide=2;
     slide_show=2;
     
-    scr_restart_variables(4);
-    with(obj_restart_vars){instance_destroy();}
+    reset_creation_variables();
+    //with(obj_restart_vars){instance_destroy();}
     global.restart=0;
 }
 
diff --git a/objects/obj_saveload/Alarm_1.gml b/objects/obj_saveload/Alarm_1.gml
index 46d5ef74b..45eb4eb9a 100644
--- a/objects/obj_saveload/Alarm_1.gml
+++ b/objects/obj_saveload/Alarm_1.gml
@@ -4,8 +4,6 @@ obj_cursor.image_alpha=1;obj_controller.cooldown=20;
 
 
 if (global.restart>0){
-    instance_create(0,0,obj_restart_vars);
-    scr_restart_variables(3);
     
     with(obj_ini){instance_destroy();}
     room_goto(Creation);
diff --git a/scripts/scr_initialize_custom/scr_initialize_custom.gml b/scripts/scr_initialize_custom/scr_initialize_custom.gml
index 33ab5acc2..f64bfadb0 100644
--- a/scripts/scr_initialize_custom/scr_initialize_custom.gml
+++ b/scripts/scr_initialize_custom/scr_initialize_custom.gml
@@ -3141,10 +3141,6 @@ function scr_initialize_custom() {
 	// obj_controller.marines-=commands;
 
 
-	instance_create(0, 0, obj_restart_vars);
-	scr_restart_variables(1);
-
-
 	scr_add_item("Bolter", 20);
 	scr_add_item("Chainsword", 20);
 	scr_add_item("Bolt Pistol", 5);
diff --git a/scripts/scr_load/scr_load.gml b/scripts/scr_load/scr_load.gml
index 3e4464749..476cc1f9a 100644
--- a/scripts/scr_load/scr_load.gml
+++ b/scripts/scr_load/scr_load.gml
@@ -565,27 +565,6 @@ function scr_load(save_part, save_id) {
 	    ini_open("tsave.ini");
 	    // file_delete("tsave.ini");
 
-	    var i=0;
-	    obj_controller.restart_name=ini_read_string("Res","nm","");
-	    obj_controller.restart_founding=ini_read_real("Res","found",0);
-	    obj_controller.restart_secret=ini_read_string("Res","secre","");
-	    obj_controller.restart_title[0]=ini_read_string("Res","tit0","");
-	    var i;i=0;repeat(11){i+=1;obj_controller.restart_title[i]=ini_read_string("Res","tit"+string(i),"");}
-	    obj_controller.restart_icon=ini_read_real("Res","ico",0);
-	    obj_controller.restart_icon_name=ini_read_string("Res","icn","");
-	    obj_controller.restart_powers=ini_read_string("Res","power","");
-	    var ad;ad=-1;repeat(5){ad+=1;obj_controller.restart_adv[ad]=ini_read_string("Res","adv"+string(ad),"");obj_controller.restart_dis[ad]=ini_read_string("Res","dis"+string(ad),"");}
-	    obj_controller.restart_recruiting_type=ini_read_string("Res","rcrtyp","");
-	    obj_controller.restart_trial=ini_read_string("Res","trial","");
-	    obj_controller.restart_recruiting_name=ini_read_string("Res","rcrnam","");
-	    obj_controller.restart_home_type=ini_read_string("Res","homtyp","");
-	    obj_controller.restart_home_name=ini_read_string("Res","homnam","");
-	    obj_controller.restart_flagship_name=ini_read_string("Res","flagship","");
-	    obj_controller.restart_fleet_type=ini_read_real("Res","flit",0);
-	    obj_controller.restart_recruiting_exists=ini_read_real("Res","recr_e",0);
-	    obj_controller.restart_homeworld_exists=ini_read_real("Res","home_e",0);
-	    obj_controller.restart_homeworld_rule=ini_read_real("Res","home_r",0);
-	    obj_controller.restart_battle_cry=ini_read_string("Res","cry","");
 
 
 	    with(obj_controller){
@@ -596,131 +575,7 @@ function scr_load(save_part, save_id) {
 //	    	star_ui_name_node();
 	    }
 
-	    var tempa,tempa2,q,good;tempa="";tempa2=0;q=0;good=0;
-
-		tempa = ini_read_string("Res", "maincol", "");
-		tempa2 = 0;
-		q = 0;
-		good = 0;
-		for(var q=0; q<global.colors_count; q++){
-			if (tempa = obj_controller.col[q]) and(good = 0) {
-				good = q;
-				tempa2 = q;
-			}
-		}
-		obj_controller.restart_main_color = tempa2;
-
-		tempa = ini_read_string("Res", "seccol", "");
-		tempa2 = 0;
-		q = 0;
-		good = 0;
-		for(var q=0; q<global.colors_count; q++){
-			if (tempa = obj_controller.col[q]) and(good = 0) {
-				good = q;
-				tempa2 = q;
-			}
-		}
-		obj_controller.restart_secondary_color = tempa2;
-
-		tempa = ini_read_string("Res", "tricol", "");
-		tempa2 = 0;
-		q = 0;
-		good = 0;
-		for(var q=0; q<global.colors_count; q++){
-			if (tempa = obj_controller.col[q]) and(good = 0) {
-				good = q;
-				tempa2 = q;
-			}
-		}
-		obj_controller.restart_trim_color = tempa2;
-
-		tempa = ini_read_string("Res", "paul2col", "");
-		tempa2 = 0;
-		q = 0;
-		good = 0;
-		for(var q=0; q<global.colors_count; q++){
-			if (tempa = obj_controller.col[q]) and(good = 0) {
-				good = q;
-				tempa2 = q;
-			}
-		}
-		obj_controller.restart_pauldron2_color = tempa2;
-
-		tempa = ini_read_string("Res", "paul1col", "");
-		tempa2 = 0;
-		q = 0;
-		good = 0;
-		for(var q=0; q<global.colors_count; q++){
-			if (tempa = obj_controller.col[q]) and(good = 0) {
-				good = q;
-				tempa2 = q;
-			}
-		}
-		obj_controller.restart_pauldron_color = tempa2;
-
-		tempa = ini_read_string("Res", "lenscol", "");
-		tempa2 = 0;
-		q = 0;
-		good = 0;
-		for(var q=0; q<global.colors_count; q++){
-			if (tempa = obj_controller.col[q]) and(good = 0) {
-				good = q;
-				tempa2 = q;
-			}
-		}
-		obj_controller.restart_lens_color = tempa2;
-
-		tempa = ini_read_string("Res", "wepcol", "");
-		tempa2 = 0;
-		q = 0;
-		good = 0;
-		for(var q=0; q<global.colors_count; q++){
-			if (tempa = obj_controller.col[q]) and(good = 0) {
-				good = q;
-				tempa2 = q;
-			}
-		}
-		obj_controller.restart_weapon_color = tempa2;
-
-	    //
-
-	    obj_controller.restart_col_special=ini_read_real("Res","speccol",0);
-	    obj_controller.restart_trim=ini_read_real("Res","trim",0);
-	    obj_controller.restart_skin_color=ini_read_real("Res","skin",0);
-	    obj_controller.restart_hapothecary=ini_read_string("Res","hapo","");
-	    obj_controller.restart_hchaplain=ini_read_string("Res","hcha","");
-	    obj_controller.restart_clibrarian=ini_read_string("Res","clib","");
-	    obj_controller.restart_fmaster=ini_read_string("Res","fmas","");
-	    obj_controller.restart_recruiter=ini_read_string("Res","recruiter","");
-	    obj_controller.restart_admiral=ini_read_string("Res","admir","");
-	    obj_controller.restart_equal_specialists=ini_read_real("Res","eqspec",0);
-		if (ini_read_string("Res","load2",0)!= 0){
-			 obj_controller.restart_load_to_ships = json_parse(base64_decode(ini_read_string("Res","load2",0)));
-		} else { obj_controller.restart_load_to_ships=[0,0,0]}
-	    obj_controller.restart_successors=ini_read_string("Res","successors",0);
-
-	    obj_controller.restart_mutations=ini_read_real("Res","muta",0);
-	    obj_controller.restart_preomnor=ini_read_real("Res","preo",0);
-	    obj_controller.restart_voice=ini_read_real("Res","voic",0);
-	    obj_controller.restart_doomed=ini_read_real("Res","doom",0);
-	    obj_controller.restart_lyman=ini_read_real("Res","lyma",0);
-	    obj_controller.restart_omophagea=ini_read_real("Res","omop",0);
-	    obj_controller.restart_ossmodula=ini_read_real("Res","ossm",0);
-	    obj_controller.restart_membrane=ini_read_real("Res","memb",0);
-	    obj_controller.restart_zygote=ini_read_real("Res","zygo",0);
-	    obj_controller.restart_betchers=ini_read_real("Res","betc",0);
-	    obj_controller.restart_catalepsean=ini_read_real("Res","catal",0);
-	    obj_controller.restart_secretions=ini_read_real("Res","secr",0);
-	    obj_controller.restart_occulobe=ini_read_real("Res","occu",0);
-	    obj_controller.restart_mucranoid=ini_read_real("Res","mucra",0);
-	    obj_controller.restart_master_name=ini_read_string("Res","master_name","");
-	    obj_controller.restart_master_melee=ini_read_real("Res","master_melee",0);
-	    obj_controller.restart_master_ranged=ini_read_real("Res","master_ranged",0);
-	    obj_controller.restart_master_specialty=ini_read_real("Res","master_specialty",0);
-	    obj_controller.restart_strength=ini_read_real("Res","strength",0);
-	    obj_controller.restart_cooperation=ini_read_real("Res","cooperation",0);
-	    obj_controller.restart_purity=ini_read_real("Res","purity",0);
-	    obj_controller.restart_stability=ini_read_real("Res","stability",0);
+	    
 	    obj_controller.squads = false;
 
 	    i=99;
diff --git a/scripts/scr_restart_variables/scr_restart_variables.gml b/scripts/scr_restart_variables/scr_restart_variables.gml
index 2ae2b68c7..c41531e97 100644
--- a/scripts/scr_restart_variables/scr_restart_variables.gml
+++ b/scripts/scr_restart_variables/scr_restart_variables.gml
@@ -581,265 +581,269 @@ function scr_restart_variables(saved_game) {
 		}
 
 		if (saved_game == 4) {
-			for (var i = 0; i < 21; i++) {
-				world[i] = "";
-				world_type[i] = "";
-				world_feature[i] = "";
-			}
 
-			for (var i = 0; i < 6; i++) {
-				adv[i] = "";
-				adv_num[i] = 0;
-				dis[i] = "";
-				dis_num[i] = 0;
-			}
+		}
+	} catch (_exception) {
+		handle_exception(_exception);
+	}
+}
 
-			points = 100;
-			maxpoints = 100;
-			custom = 0;
+function reset_creation_variables(){
+	for (var i = 0; i < 21; i++) {
+		world[i] = "";
+		world_type[i] = "";
+		world_feature[i] = "";
+	}
 
-			hapothecary = global.name_generator.generate_space_marine_name();
-			hchaplain = global.name_generator.generate_space_marine_name();
-			clibrarian = global.name_generator.generate_space_marine_name();
-			fmaster = global.name_generator.generate_space_marine_name();
-			recruiter = global.name_generator.generate_space_marine_name();
-			admiral = global.name_generator.generate_space_marine_name();
+	for (var i = 0; i < 6; i++) {
+		adv[i] = "";
+		adv_num[i] = 0;
+		dis[i] = "";
+		dis_num[i] = 0;
+	}
 
-			// First is for the correct slot, second is for default info
-			for (var i = 100; i < 103; i++) {
-				race[i, 2] = 1;
-				role[i, 2] = "Honour Guard";
-				wep1[i, 2] = "Power Sword";
-				wep2[i, 2] = "Bolter";
-				armour[i, 2] = "Artificer Armour";
-
-				race[i, 3] = 1;
-				role[i, 3] = "Veteran";
-				wep1[i, 3] = "Chainsword";
-				wep2[i, 3] = "Bolter";
-				armour[i, 3] = "Power Armour";
-
-				race[i, 4] = 1;
-				role[i, 4] = "Terminator";
-				wep1[i, 4] = "Power Fist";
-				wep2[i, 4] = "Storm Bolter";
-				armour[i, 4] = "Terminator Armour";
-
-				race[i, 5] = 1;
-				role[i, 5] = "Captain";
-				wep1[i, 5] = "Power Sword";
-				wep2[i, 5] = "Bolt Pistol";
-				armour[i, 5] = "Power Armour";
-				gear[i, 5] = "Iron Halo";
-
-				race[i, 6] = 1;
-				role[i, 6] = "Dreadnought";
-				wep1[i, 6] = "Close Combat Weapon";
-				wep2[i, 6] = "Twin Linked Lascannon";
-				armour[i, 6] = "Dreadnought";
-
-				race[i, 8] = 1;
-				role[i, 8] = "Tactical Marine";
-				wep1[i, 8] = "Bolter";
-				wep2[i, 8] = "Combat Knife";
-				armour[i, 8] = "Power Armour";
-
-				race[i, 9] = 1;
-				role[i, 9] = "Devastator Marine";
-				wep1[i, 9] = "";
-				wep2[i, 9] = "Combat Knife";
-				armour[i, 9] = "Power Armour";
-
-				race[i, 10] = 1;
-				role[i, 10] = "Assault Marine";
-				wep1[i, 10] = "Chainsword";
-				wep2[i, 10] = "Bolt Pistol";
-				armour[i, 10] = "Power Armour";
-				mobi[i, 10] = "Jump Pack";
-
-				race[i, 11] = 1;
-				role[i, 11] = "Ancient";
-				wep1[i, 11] = "Company Standard";
-				wep2[i, 11] = "Power Sword";
-				armour[i, 11] = "Power Armour";
-
-				race[i, 12] = 1;
-				role[i, 12] = "Scout";
-				wep1[i, 12] = "Sniper Rifle";
-				wep2[i, 12] = "Combat Knife";
-				armour[i, 12] = "Scout Armour";
-
-				race[i, 14] = 1;
-				role[i, 14] = "Chaplain";
-				wep1[i, 14] = "Power Sword";
-				wep2[i, 14] = "Bolt Pistol";
-				armour[i, 14] = "Power Armour";
-				gear[i, 14] = "Rosarius";
-
-				race[i, 15] = 1;
-				role[i, 15] = "Apothecary";
-				wep1[i, 15] = "Chainsword";
-				wep2[i, 15] = "Bolt Pistol";
-				armour[i, 15] = "Power Armour";
-				gear[i, 15] = "Narthecium";
-
-				race[i, 16] = 1;
-				role[i, 16] = "Techmarine";
-				wep1[i, 16] = "Power Axe";
-				wep2[i, 16] = "Storm Bolter";
-				armour[i, 16] = "Artificer Armour";
-				gear[i, 16] = "";
-				mobi[i, 16] = "Servo-arm";
-
-				race[i, 17] = 1;
-				role[i, 17] = "Librarian";
-				wep1[i, 17] = "Force Staff";
-				wep2[i, 17] = "Bolt Pistol";
-				armour[i, 17] = "Power Armour";
-				gear[i, 17] = "Psychic Hood";
-
-				race[i, 18] = 1;
-				role[i, 18] = "Sergeant";
-				wep1[i, 18] = "Chainsword";
-				wep2[i, 18] = "Storm Bolter";
-				armour[i, 18] = "Power Armour";
-				gear[i, 18] = "";
-
-				race[i, 19] = 1;
-				role[i, 19] = "Veteran Sergeant";
-				wep1[i, 19] = "Chainsword";
-				wep2[i, 19] = "Storm Bolter";
-				armour[i, 19] = "Power Armour";
-				gear[i, 19] = "";
-			}
+	points = 100;
+	maxpoints = 100;
+	custom = 0;
+
+	hapothecary = global.name_generator.generate_space_marine_name();
+	hchaplain = global.name_generator.generate_space_marine_name();
+	clibrarian = global.name_generator.generate_space_marine_name();
+	fmaster = global.name_generator.generate_space_marine_name();
+	recruiter = global.name_generator.generate_space_marine_name();
+	admiral = global.name_generator.generate_space_marine_name();
+
+	// First is for the correct slot, second is for default info
+	for (var i = 100; i < 103; i++) {
+		race[i, 2] = 1;
+		role[i, 2] = "Honour Guard";
+		wep1[i, 2] = "Power Sword";
+		wep2[i, 2] = "Bolter";
+		armour[i, 2] = "Artificer Armour";
+
+		race[i, 3] = 1;
+		role[i, 3] = "Veteran";
+		wep1[i, 3] = "Chainsword";
+		wep2[i, 3] = "Bolter";
+		armour[i, 3] = "Power Armour";
+
+		race[i, 4] = 1;
+		role[i, 4] = "Terminator";
+		wep1[i, 4] = "Power Fist";
+		wep2[i, 4] = "Storm Bolter";
+		armour[i, 4] = "Terminator Armour";
+
+		race[i, 5] = 1;
+		role[i, 5] = "Captain";
+		wep1[i, 5] = "Power Sword";
+		wep2[i, 5] = "Bolt Pistol";
+		armour[i, 5] = "Power Armour";
+		gear[i, 5] = "Iron Halo";
+
+		race[i, 6] = 1;
+		role[i, 6] = "Dreadnought";
+		wep1[i, 6] = "Close Combat Weapon";
+		wep2[i, 6] = "Twin Linked Lascannon";
+		armour[i, 6] = "Dreadnought";
+
+		race[i, 8] = 1;
+		role[i, 8] = "Tactical Marine";
+		wep1[i, 8] = "Bolter";
+		wep2[i, 8] = "Combat Knife";
+		armour[i, 8] = "Power Armour";
+
+		race[i, 9] = 1;
+		role[i, 9] = "Devastator Marine";
+		wep1[i, 9] = "";
+		wep2[i, 9] = "Combat Knife";
+		armour[i, 9] = "Power Armour";
+
+		race[i, 10] = 1;
+		role[i, 10] = "Assault Marine";
+		wep1[i, 10] = "Chainsword";
+		wep2[i, 10] = "Bolt Pistol";
+		armour[i, 10] = "Power Armour";
+		mobi[i, 10] = "Jump Pack";
+
+		race[i, 11] = 1;
+		role[i, 11] = "Ancient";
+		wep1[i, 11] = "Company Standard";
+		wep2[i, 11] = "Power Sword";
+		armour[i, 11] = "Power Armour";
+
+		race[i, 12] = 1;
+		role[i, 12] = "Scout";
+		wep1[i, 12] = "Sniper Rifle";
+		wep2[i, 12] = "Combat Knife";
+		armour[i, 12] = "Scout Armour";
+
+		race[i, 14] = 1;
+		role[i, 14] = "Chaplain";
+		wep1[i, 14] = "Power Sword";
+		wep2[i, 14] = "Bolt Pistol";
+		armour[i, 14] = "Power Armour";
+		gear[i, 14] = "Rosarius";
+
+		race[i, 15] = 1;
+		role[i, 15] = "Apothecary";
+		wep1[i, 15] = "Chainsword";
+		wep2[i, 15] = "Bolt Pistol";
+		armour[i, 15] = "Power Armour";
+		gear[i, 15] = "Narthecium";
+
+		race[i, 16] = 1;
+		role[i, 16] = "Techmarine";
+		wep1[i, 16] = "Power Axe";
+		wep2[i, 16] = "Storm Bolter";
+		armour[i, 16] = "Artificer Armour";
+		gear[i, 16] = "";
+		mobi[i, 16] = "Servo-arm";
+
+		race[i, 17] = 1;
+		role[i, 17] = "Librarian";
+		wep1[i, 17] = "Force Staff";
+		wep2[i, 17] = "Bolt Pistol";
+		armour[i, 17] = "Power Armour";
+		gear[i, 17] = "Psychic Hood";
+
+		race[i, 18] = 1;
+		role[i, 18] = "Sergeant";
+		wep1[i, 18] = "Chainsword";
+		wep2[i, 18] = "Storm Bolter";
+		armour[i, 18] = "Power Armour";
+		gear[i, 18] = "";
+
+		race[i, 19] = 1;
+		role[i, 19] = "Veteran Sergeant";
+		wep1[i, 19] = "Chainsword";
+		wep2[i, 19] = "Storm Bolter";
+		armour[i, 19] = "Power Armour";
+		gear[i, 19] = "";
+	}
 
-			points = 100;
-			selected_chapter = 999;
-			chapter = obj_restart_vars.restart_name;
-			founding = obj_restart_vars.restart_founding;
-			founding_secret = obj_restart_vars.restart_secret;
+	points = 100;
+	selected_chapter = 999;
+	chapter = obj_restart_vars.restart_name;
+	founding = obj_restart_vars.restart_founding;
+	founding_secret = obj_restart_vars.restart_secret;
 
-			company_title[0] = "";
+	company_title[0] = "";
 
-			for (var i = 1; i <= 11; i++) {
-				company_title[i] = obj_restart_vars.restart_title[i];
-			}
+	for (var i = 1; i <= 11; i++) {
+		company_title[i] = obj_restart_vars.restart_title[i];
+	}
 
-			icon = obj_restart_vars.restart_icon;
-			icon_name = obj_restart_vars.restart_icon_name;
-			discipline = obj_restart_vars.restart_powers;
+	icon = obj_restart_vars.restart_icon;
+	icon_name = obj_restart_vars.restart_icon_name;
+	discipline = obj_restart_vars.restart_powers;
 
-			for (var ad = 0; ad < 5; ad++) {
-				if (ad == 0) {
-					adv[ad] = "";
-					dis[ad] = "";
-				}
-				if (ad > 0) {
-					adv[ad] = obj_restart_vars.restart_adv[ad];
-					dis[ad] = obj_restart_vars.restart_dis[ad];
-				}
-			}
-			// show_message("D: "+string(dis[1]));
-
-			// Need disposition here
-
-			recruiting = obj_restart_vars.restart_recruiting_type;
-			aspirant_trial = obj_restart_vars.restart_trial;
-			recruiting_name = obj_restart_vars.restart_recruiting_name;
-			homeworld = obj_restart_vars.restart_home_type;
-			homeworld_name = obj_restart_vars.restart_home_name;
-			fleet_type = obj_restart_vars.restart_fleet_type;
-			flagship_name = obj_restart_vars.restart_flagship_name;
-
-			recruiting_exists = obj_restart_vars.restart_recruiting_exists;
-			homeworld_exists = obj_restart_vars.restart_homeworld_exists;
-			homeworld_rule = obj_restart_vars.restart_homeworld_rule;
-
-			battle_cry = obj_restart_vars.restart_battle_cry;
-
-			main_color = obj_restart_vars.restart_main_color;
-			secondary_color = obj_restart_vars.restart_secondary_color;
-			main_trim = obj_restart_vars.restart_trim_color;
-			left_pauldron = obj_restart_vars.restart_pauldron2_color;
-			right_pauldron = obj_restart_vars.restart_pauldron_color;
-			lens_color = obj_restart_vars.restart_lens_color;
-			weapon_color = obj_restart_vars.restart_weapon_color;
-			col_special = obj_restart_vars.restart_col_special;
-			trim = obj_restart_vars.restart_trim;
-			skin_color = obj_restart_vars.restart_skin_color;
-
-			hapothecary = obj_restart_vars.restart_hapothecary;
-			hchaplain = obj_restart_vars.restart_hchaplain;
-			clibrarian = obj_restart_vars.restart_clibrarian;
-			fmaster = obj_restart_vars.restart_fmaster;
-			recruiter = obj_restart_vars.restart_recruiter;
-			admiral = obj_restart_vars.restart_admiral;
-
-			equal_specialists = obj_restart_vars.restart_equal_specialists;
-			load_to_ships = obj_restart_vars.restart_load_to_ships;
-			successors = obj_restart_vars.restart_successors;
-
-			mutations = obj_restart_vars.restart_mutations;
-			preomnor = obj_restart_vars.restart_preomnor;
-			voice = obj_restart_vars.restart_voice;
-			doomed = obj_restart_vars.restart_doomed;
-			lyman = obj_restart_vars.restart_lyman;
-			omophagea = obj_restart_vars.restart_omophagea;
-			ossmodula = obj_restart_vars.restart_ossmodula;
-			membrane = obj_restart_vars.restart_membrane;
-			zygote = obj_restart_vars.restart_zygote;
-			betchers = obj_restart_vars.restart_betchers;
-			catalepsean = obj_restart_vars.restart_catalepsean;
-			secretions = obj_restart_vars.restart_secretions;
-			occulobe = obj_restart_vars.restart_occulobe;
-			mucranoid = obj_restart_vars.restart_mucranoid;
-
-			chapter_master_name = obj_restart_vars.restart_master_name;
-			chapter_master_melee = obj_restart_vars.restart_master_melee;
-			chapter_master_ranged = obj_restart_vars.restart_master_ranged;
-			chapter_master_specialty = obj_restart_vars.restart_master_specialty;
-
-			strength = obj_restart_vars.restart_strength;
-			cooperation = obj_restart_vars.restart_cooperation;
-			purity = obj_restart_vars.restart_purity;
-			stability = obj_restart_vars.restart_stability;
-
-			for (var i = 0; i < 21; i++) {
-				race[100, i] = obj_restart_vars.r_race[100, i];
-
-				role[100, i] = obj_restart_vars.r_role[100, i];
-				wep1[100, i] = obj_restart_vars.r_wep1[100, i];
-				wep2[100, i] = obj_restart_vars.r_wep2[100, i];
-				armour[100, i] = obj_restart_vars.r_armour[100, i];
-				gear[100, i] = obj_restart_vars.r_gear[100, i];
-				mobi[100, i] = obj_restart_vars.r_mobi[100, i];
-			}
+	for (var ad = 0; ad < 5; ad++) {
+		if (ad == 0) {
+			adv[ad] = "";
+			dis[ad] = "";
+		}
+		if (ad > 0) {
+			adv[ad] = obj_restart_vars.restart_adv[ad];
+			dis[ad] = obj_restart_vars.restart_dis[ad];
+		}
+	}
+	// show_message("D: "+string(dis[1]));
+
+	// Need disposition here
+
+	recruiting = obj_restart_vars.restart_recruiting_type;
+	aspirant_trial = obj_restart_vars.restart_trial;
+	recruiting_name = obj_restart_vars.restart_recruiting_name;
+	homeworld = obj_restart_vars.restart_home_type;
+	homeworld_name = obj_restart_vars.restart_home_name;
+	fleet_type = obj_restart_vars.restart_fleet_type;
+	flagship_name = obj_restart_vars.restart_flagship_name;
+
+	recruiting_exists = obj_restart_vars.restart_recruiting_exists;
+	homeworld_exists = obj_restart_vars.restart_homeworld_exists;
+	homeworld_rule = obj_restart_vars.restart_homeworld_rule;
+
+	battle_cry = obj_restart_vars.restart_battle_cry;
+
+	main_color = obj_restart_vars.restart_main_color;
+	secondary_color = obj_restart_vars.restart_secondary_color;
+	main_trim = obj_restart_vars.restart_trim_color;
+	left_pauldron = obj_restart_vars.restart_pauldron2_color;
+	right_pauldron = obj_restart_vars.restart_pauldron_color;
+	lens_color = obj_restart_vars.restart_lens_color;
+	weapon_color = obj_restart_vars.restart_weapon_color;
+	col_special = obj_restart_vars.restart_col_special;
+	trim = obj_restart_vars.restart_trim;
+	skin_color = obj_restart_vars.restart_skin_color;
+
+	hapothecary = obj_restart_vars.restart_hapothecary;
+	hchaplain = obj_restart_vars.restart_hchaplain;
+	clibrarian = obj_restart_vars.restart_clibrarian;
+	fmaster = obj_restart_vars.restart_fmaster;
+	recruiter = obj_restart_vars.restart_recruiter;
+	admiral = obj_restart_vars.restart_admiral;
+
+	equal_specialists = obj_restart_vars.restart_equal_specialists;
+	load_to_ships = obj_restart_vars.restart_load_to_ships;
+	successors = obj_restart_vars.restart_successors;
+
+	mutations = obj_restart_vars.restart_mutations;
+	preomnor = obj_restart_vars.restart_preomnor;
+	voice = obj_restart_vars.restart_voice;
+	doomed = obj_restart_vars.restart_doomed;
+	lyman = obj_restart_vars.restart_lyman;
+	omophagea = obj_restart_vars.restart_omophagea;
+	ossmodula = obj_restart_vars.restart_ossmodula;
+	membrane = obj_restart_vars.restart_membrane;
+	zygote = obj_restart_vars.restart_zygote;
+	betchers = obj_restart_vars.restart_betchers;
+	catalepsean = obj_restart_vars.restart_catalepsean;
+	secretions = obj_restart_vars.restart_secretions;
+	occulobe = obj_restart_vars.restart_occulobe;
+	mucranoid = obj_restart_vars.restart_mucranoid;
+
+	chapter_master_name = obj_restart_vars.restart_master_name;
+	chapter_master_melee = obj_restart_vars.restart_master_melee;
+	chapter_master_ranged = obj_restart_vars.restart_master_ranged;
+	chapter_master_specialty = obj_restart_vars.restart_master_specialty;
+
+	strength = obj_restart_vars.restart_strength;
+	cooperation = obj_restart_vars.restart_cooperation;
+	purity = obj_restart_vars.restart_purity;
+	stability = obj_restart_vars.restart_stability;
+
+	for (var i = 0; i < 21; i++) {
+		race[100, i] = obj_restart_vars.r_race[100, i];
+
+		role[100, i] = obj_restart_vars.r_role[100, i];
+		wep1[100, i] = obj_restart_vars.r_wep1[100, i];
+		wep2[100, i] = obj_restart_vars.r_wep2[100, i];
+		armour[100, i] = obj_restart_vars.r_armour[100, i];
+		gear[100, i] = obj_restart_vars.r_gear[100, i];
+		mobi[100, i] = obj_restart_vars.r_mobi[100, i];
+	}
 
-			custom = 1;
-			restarted = 1;
-			mutations_selected = mutations;
+	custom = 1;
+	restarted = 1;
+	mutations_selected = mutations;
 
-			for (var i = 1; i <= 4; i++) {
-				if ((adv[i] != "") && (adv_num[i] == 0)) {
-					for (var n = 1; n <= 40; n++) {
-						if (obj_creation.all_advantages[n].name == adv[i]) {
-							adv_num[i] = n;
-						}
-					}
+	for (var i = 1; i <= 4; i++) {
+		if ((adv[i] != "") && (adv_num[i] == 0)) {
+			for (var n = 1; n <= 40; n++) {
+				if (obj_creation.all_advantages[n].name == adv[i]) {
+					adv_num[i] = n;
 				}
 			}
+		}
+	}
 
-			for (var i = 1; i <= 4; i++) {
-				if ((dis[i] != "") && (dis_num[i] == 0)) {
-					for (var n = 1; n <= 40; n++) {
-						if (obj_creation.all_disadvantages[n].name[n] == dis[i]) {
-							dis_num[i] = n;
-						}
-					}
+	for (var i = 1; i <= 4; i++) {
+		if ((dis[i] != "") && (dis_num[i] == 0)) {
+			for (var n = 1; n <= 40; n++) {
+				if (obj_creation.all_disadvantages[n].name[n] == dis[i]) {
+					dis_num[i] = n;
 				}
 			}
 		}
-	} catch (_exception) {
-		handle_exception(_exception);
-	}
+	}	
 }
diff --git a/scripts/scr_save/scr_save.gml b/scripts/scr_save/scr_save.gml
index a3a64a403..fe35549b0 100644
--- a/scripts/scr_save/scr_save.gml
+++ b/scripts/scr_save/scr_save.gml
@@ -421,91 +421,6 @@ function scr_save(save_part,save_id) {
                 }
             }
 	    }
-
-
-
-
-	    var i=0;
-	    ini_write_string("Res","nm",obj_controller.restart_name);
-	    ini_write_real("Res","found",obj_controller.restart_founding);
-	    ini_write_string("Res","secre",obj_controller.restart_secret);
-	    ini_write_string("Res","tit0",obj_controller.restart_title[0]);
-
-	    repeat(11){i+=1;ini_write_string("Res","tit"+string(i),obj_controller.restart_title[i]);}
-	    ini_write_real("Res","ico",obj_controller.restart_icon);
-	    ini_write_string("Res","icn",obj_controller.restart_icon_name);
-	    ini_write_string("Res","power",obj_controller.restart_powers);
-	    var ad;ad=-1;repeat(5){ad+=1;ini_write_string("Res","adv"+string(ad),obj_controller.restart_adv[ad]);ini_write_string("Res","dis"+string(ad),obj_controller.restart_dis[ad]);}
-	    ini_write_string("Res","rcrtyp",obj_controller.restart_recruiting_type);
-	    ini_write_string("Res","trial",obj_controller.restart_trial);
-	    ini_write_string("Res","rcrnam",obj_controller.restart_recruiting_name);
-	    ini_write_string("Res","homtyp",obj_controller.restart_home_type);
-	    ini_write_string("Res","homnam",obj_controller.restart_home_name);
-
-	    ini_write_real("Res","flit",obj_controller.restart_fleet_type);
-	    ini_write_real("Res","recr_e",obj_controller.restart_recruiting_exists);
-	    ini_write_real("Res","home_e",obj_controller.restart_homeworld_exists);
-	    ini_write_real("Res","home_r",obj_controller.restart_homeworld_rule);
-	    ini_write_string("Res","cry",obj_controller.restart_battle_cry);
-	    ini_write_string("Res","flagship",obj_controller.restart_flagship_name);
-	    ini_write_string("Res","maincol",obj_controller.col[obj_controller.restart_main_color]);
-	    ini_write_string("Res","seccol",obj_controller.col[obj_controller.restart_secondary_color]);
-	    ini_write_string("Res","tricol",obj_controller.col[obj_controller.restart_trim_color]);
-	    ini_write_string("Res","paul2col",obj_controller.col[obj_controller.restart_pauldron2_color]);
-	    ini_write_string("Res","paul1col",obj_controller.col[obj_controller.restart_pauldron_color]);
-	    ini_write_string("Res","lenscol",obj_controller.col[obj_controller.restart_lens_color]);
-	    ini_write_string("Res","wepcol",obj_controller.col[obj_controller.restart_weapon_color]);
-	    ini_write_real("Res","speccol",obj_controller.restart_col_special);
-	    ini_write_real("Res","trim",obj_controller.restart_trim);
-	    ini_write_real("Res","skin",obj_controller.restart_skin_color);
-	    ini_write_string("Res","hapo",obj_controller.restart_hapothecary);
-	    ini_write_string("Res","hcha",obj_controller.restart_hchaplain);
-	    ini_write_string("Res","clib",obj_controller.restart_clibrarian);
-	    ini_write_string("Res","fmas",obj_controller.restart_fmaster);
-	    ini_write_string("Res","recruiter",obj_controller.restart_recruiter);
-	    ini_write_string("Res","admir",obj_controller.restart_admiral);
-	    ini_write_real("Res","eqspec",obj_controller.restart_equal_specialists);
-	    ini_write_string("Res","load2",base64_encode(json_stringify(obj_controller.restart_load_to_ships)));
-	    ini_write_real("Res","successors",obj_controller.restart_successors);
-	    ini_write_real("Res","muta",obj_controller.restart_mutations);
-	    ini_write_real("Res","preo",obj_controller.restart_preomnor);
-	    ini_write_real("Res","voic",obj_controller.restart_voice);
-	    ini_write_real("Res","doom",obj_controller.restart_doomed);
-	    ini_write_real("Res","lyma",obj_controller.restart_lyman);
-	    ini_write_real("Res","omop",obj_controller.restart_omophagea);
-	    ini_write_real("Res","ossm",obj_controller.restart_ossmodula);
-	    ini_write_real("Res","memb",obj_controller.restart_membrane);
-	    ini_write_real("Res","zygo",obj_controller.restart_zygote);
-	    ini_write_real("Res","betc",obj_controller.restart_betchers);
-	    ini_write_real("Res","catal",obj_controller.restart_catalepsean);
-	    ini_write_real("Res","secr",obj_controller.restart_secretions);
-	    ini_write_real("Res","occu",obj_controller.restart_occulobe);
-	    ini_write_real("Res","mucra",obj_controller.restart_mucranoid);
-	    ini_write_string("Res","master_name",obj_controller.restart_master_name);
-	    ini_write_real("Res","master_melee",obj_controller.restart_master_melee);
-	    ini_write_real("Res","master_ranged",obj_controller.restart_master_ranged);
-	    ini_write_real("Res","master_specialty",obj_controller.restart_master_specialty);
-	    ini_write_real("Res","strength",obj_controller.restart_strength);
-	    ini_write_real("Res","cooperation",obj_controller.restart_cooperation);
-	    ini_write_real("Res","purity",obj_controller.restart_purity);
-	    ini_write_real("Res","stability",obj_controller.restart_stability);
-	    i=99;
-	    repeat(3){i+=1;
-	         var o;o=1;
-	         repeat(14){o+=1;
-	            if (o=11) then o=12;
-	            if (o=13) then o=14;
-	            ini_write_real("Res","r_race"+string(i)+"."+string(o),obj_controller.r_race[i,o]);
-	            ini_write_string("Res","r_role"+string(i)+"."+string(o),obj_controller.r_role[i,o]);
-	            ini_write_string("Res","r_wep1"+string(i)+"."+string(o),obj_controller.r_wep1[i,o]);
-	            ini_write_string("Res","r_wep2"+string(i)+"."+string(o),obj_controller.r_wep2[i,o]);
-	            ini_write_string("Res","r_armour"+string(i)+"."+string(o),obj_controller.r_armour[i,o]);
-	            ini_write_string("Res","r_mobi"+string(i)+"."+string(o),obj_controller.r_mobi[i,o]);
-	            ini_write_string("Res","r_gear"+string(i)+"."+string(o),obj_controller.r_gear[i,o]);
-	         }
-	    }// 100 is defaults, 101 is the allowable starting equipment
-
-
 	    ini_close();
 	}