diff --git a/@GMS/addons/custom_server/Configs/blck_configs_default.sqf b/@GMS/addons/custom_server/Configs/blck_configs_default.sqf
index 3b78722..c2d43e0 100644
--- a/@GMS/addons/custom_server/Configs/blck_configs_default.sqf
+++ b/@GMS/addons/custom_server/Configs/blck_configs_default.sqf
@@ -45,6 +45,8 @@ AI WEAPONS, UNIFORMS, VESTS AND GEAR
 	blck_crateMoneyRed = [175, 300];
 	blck_crateMoneyGreen = [300, 500];
 	blck_crateMoneyOrange = [500, 750];
+
+	blck_crateTypes = ["Box_FIA_Ammo_F","Box_FIA_Support_F","Box_FIA_Wps_F","I_SupplyCrate_F","Box_NATO_AmmoVeh_F","Box_East_AmmoVeh_F","IG_supplyCrate_F","Box_NATO_Wps_F","I_CargoNet_01_ammo_F","O_CargoNet_01_ammo_F","B_CargoNet_01_ammo_F"];  // Default crate type.
 	
 	blck_allowSalesAtBlackMktTraders = true; // Allow vehicles to be sold at Halvjes black market traders.
 	
@@ -63,6 +65,18 @@ AI WEAPONS, UNIFORMS, VESTS AND GEAR
 		"I_APC_Wheeled_03_cannon_F"	
 	];
 
+	blck_light_AT_ARMA3 = [
+		"O_G_Offroad_01_AT_F", 
+		"B_G_Offroad_01_AT_F", 
+		"O_T_LSV_02_AT_F", 
+		"O_LSV_02_AT_F", 
+		"B_T_LSV_01_AT_F", 
+		"B_LSV_01_AT_F"
+	];
+	blck_tracked_AA_ARMA3 = [
+		"O_APC_Tracked_02_AA_F",
+		"B_APC_Tracked_01_AA_F"	
+	];
 	blck_tracked_APC_ARMA3 = [
 		"B_APC_Tracked_01_rcws_F",
 		"B_APC_Tracked_01_CRV_F",
@@ -523,6 +537,87 @@ AI WEAPONS, UNIFORMS, VESTS AND GEAR
 		blck_NVG = ["NVG"];
         blck_buildingMaterials = [];
 
+		blck_UMS_uniforms = 
+		[
+			"U_I_Wetsuit",
+			"U_O_Wetsuit",
+			"U_B_Wetsuit"
+		];
+
+		blck_UMS_headgear = 
+		[
+			"G_Diving",
+			"G_B_Diving",
+			"G_O_Diving",
+			"G_I_Diving"
+		];
+
+		blck_UMS_vests = 
+		[
+			"V_RebreatherB",
+			"V_RebreatherIA",
+			"V_RebreatherIR"
+		];
+
+		blck_UMS_weapons = 
+		[
+			"arifle_SDAR_F"
+		];
+
+		if ((tolower blck_modType) isEqualTo "exile") then
+		{
+			blck_UMS_submarines =
+			[
+				
+				"Exile_Boat_SDV_CSAT",
+				"Exile_Boat_SDV_Digital",
+				"Exile_Boat_SDV_Grey"
+			];
+			
+			blck_UMS_crates =	["Exile_Container_SupplyBox"];
+		};
+		if ((tolower blck_modType) isEqualTo "epoch") then
+		{
+			blck_UMS_submarines = ["B_SDV_01_EPOCH"];
+			blck_UMS_crates = blck_crateTypes;
+			//blck_UMS_crates = ["container_epoch"];	
+		};
+		if ((toLower blck_modType) isEqualTo "default") then 
+		{
+			blck_UMS_submarines =
+			[
+				
+				"Exile_Boat_SDV_CSAT",
+				"Exile_Boat_SDV_Digital",
+				"Exile_Boat_SDV_Grey"
+			];
+			
+			blck_UMS_crates = blck_crateTypes;
+
+		};
+
+		blck_UMS_unarmedSurfaceVessels = 
+		[
+			"B_Boat_Transport_01_F",
+			"I_Boat_Transport_01_F"
+		];
+		blck_UMS_armedSurfaceVessels =
+		[
+			"B_Boat_Armed_01_minigun_F",
+			"I_Boat_Armed_01_minigun_F"	
+		];
+		blck_UMS_surfaceVessels = blck_UMS_unarmedSurfaceVessels + blck_UMS_armedSurfaceVessels;
+		blck_UMS_shipWrecks =
+		[
+			"Land_Boat_06_wreck_F",
+			"Land_Boat_05_wreck_F",
+			"Land_Boat_04_wreck_F",
+			"Land_Boat_02_abandoned_F",
+			"Land_Boat_01_abandoned_red_F",
+			"Land_Boat_01_abandoned_blue_F"
+		];
+
+
 /***************************************************************************************
 DEFAULT CONTENTS OF LOOT CRATES FOR EACH MISSION
 Note however that these configurations can be used in any way you like or replaced with mission-specific customized loot arrays
@@ -869,8 +964,5 @@ blck_contructionLoot = blck_BoxLoot_Orange;
 blck_highPoweredLoot = blck_BoxLoot_Orange;
 blck_supportLoot = blck_BoxLoot_Orange;
 
-
-blck_crateTypes = ["Box_FIA_Ammo_F","Box_FIA_Support_F","Box_FIA_Wps_F","I_SupplyCrate_F","Box_NATO_AmmoVeh_F","Box_East_AmmoVeh_F","IG_supplyCrate_F","Box_NATO_Wps_F","I_CargoNet_01_ammo_F","O_CargoNet_01_ammo_F","B_CargoNet_01_ammo_F"];  // Default crate type.
-
 diag_log "[blckeagls] Default Configurations Loaded";
 
diff --git a/@GMS/addons/custom_server/Configs/blck_configs_default_mil.sqf b/@GMS/addons/custom_server/Configs/blck_configs_default_mil.sqf
index 3b78722..54c5125 100644
--- a/@GMS/addons/custom_server/Configs/blck_configs_default_mil.sqf
+++ b/@GMS/addons/custom_server/Configs/blck_configs_default_mil.sqf
@@ -12,7 +12,7 @@
 
 #include "\q\addons\custom_server\Configs\blck_defines.hpp";
 #include "\q\addons\custom_server\init\build.sqf";
-diag_log format["[blckeagls] loading default configurations for blckeagls build %1",blck_buildNumber];
+//diag_log format["[blckeagls] loading default configurations for blckeagls build %1",blck_buildNumber];
 ////////////
 // default settings
 ////////////	
@@ -45,6 +45,9 @@ AI WEAPONS, UNIFORMS, VESTS AND GEAR
 	blck_crateMoneyRed = [175, 300];
 	blck_crateMoneyGreen = [300, 500];
 	blck_crateMoneyOrange = [500, 750];
+
+
+	blck_crateTypes = ["Box_FIA_Ammo_F","Box_FIA_Support_F","Box_FIA_Wps_F","I_SupplyCrate_F","Box_NATO_AmmoVeh_F","Box_East_AmmoVeh_F","IG_supplyCrate_F","Box_NATO_Wps_F","I_CargoNet_01_ammo_F","O_CargoNet_01_ammo_F","B_CargoNet_01_ammo_F"];  // Default crate type.
 	
 	blck_allowSalesAtBlackMktTraders = true; // Allow vehicles to be sold at Halvjes black market traders.
 	
@@ -506,7 +509,87 @@ AI WEAPONS, UNIFORMS, VESTS AND GEAR
 		blck_vests_red = blck_vests;
 		blck_vests_green = blck_vests;
 		blck_vests_orange = blck_vests;
-		
+				
+		blck_UMS_uniforms = 
+		[
+			"U_I_Wetsuit",
+			"U_O_Wetsuit",
+			"U_B_Wetsuit"
+		];
+
+		blck_UMS_headgear = 
+		[
+			"G_Diving",
+			"G_B_Diving",
+			"G_O_Diving",
+			"G_I_Diving"
+		];
+
+		blck_UMS_vests = 
+		[
+			"V_RebreatherB",
+			"V_RebreatherIA",
+			"V_RebreatherIR"
+		];
+
+		blck_UMS_weapons = 
+		[
+			"arifle_SDAR_F"
+		];
+
+		if ((tolower blck_modType) isEqualTo "exile") then
+		{
+			blck_UMS_submarines =
+			[
+				
+				"Exile_Boat_SDV_CSAT",
+				"Exile_Boat_SDV_Digital",
+				"Exile_Boat_SDV_Grey"
+			];
+			
+			blck_UMS_crates =	["Exile_Container_SupplyBox"];
+		};
+		if ((tolower blck_modType) isEqualTo "epoch") then
+		{
+			blck_UMS_submarines = ["B_SDV_01_EPOCH"];
+			blck_UMS_crates = blck_crateTypes;
+			//blck_UMS_crates = ["container_epoch"];	
+		};
+		if ((toLower blck_modType) isEqualTo "default") then 
+		{
+			blck_UMS_submarines =
+			[
+				
+				"Exile_Boat_SDV_CSAT",
+				"Exile_Boat_SDV_Digital",
+				"Exile_Boat_SDV_Grey"
+			];
+			
+			blck_UMS_crates = blck_crateTypes;
+
+		};
+
+		blck_UMS_unarmedSurfaceVessels = 
+		[
+			"B_Boat_Transport_01_F",
+			"I_Boat_Transport_01_F"
+		];
+		blck_UMS_armedSurfaceVessels =
+		[
+			"B_Boat_Armed_01_minigun_F",
+			"I_Boat_Armed_01_minigun_F"	
+		];
+		blck_UMS_surfaceVessels = blck_UMS_unarmedSurfaceVessels + blck_UMS_armedSurfaceVessels;
+		blck_UMS_shipWrecks =
+		[
+			"Land_Boat_06_wreck_F",
+			"Land_Boat_05_wreck_F",
+			"Land_Boat_04_wreck_F",
+			"Land_Boat_02_abandoned_F",
+			"Land_Boat_01_abandoned_red_F",
+			"Land_Boat_01_abandoned_blue_F"
+		];
+
 			//CraftingFood
         blck_Meats=[
         ];
@@ -869,8 +952,5 @@ blck_contructionLoot = blck_BoxLoot_Orange;
 blck_highPoweredLoot = blck_BoxLoot_Orange;
 blck_supportLoot = blck_BoxLoot_Orange;
 
-
-blck_crateTypes = ["Box_FIA_Ammo_F","Box_FIA_Support_F","Box_FIA_Wps_F","I_SupplyCrate_F","Box_NATO_AmmoVeh_F","Box_East_AmmoVeh_F","IG_supplyCrate_F","Box_NATO_Wps_F","I_CargoNet_01_ammo_F","O_CargoNet_01_ammo_F","B_CargoNet_01_ammo_F"];  // Default crate type.
-
 diag_log "[blckeagls] Default Configurations Loaded";
 
diff --git a/@GMS/addons/custom_server/Configs/blck_configs_epoch.sqf b/@GMS/addons/custom_server/Configs/blck_configs_epoch.sqf
index fb54a89..a4d56a6 100644
--- a/@GMS/addons/custom_server/Configs/blck_configs_epoch.sqf
+++ b/@GMS/addons/custom_server/Configs/blck_configs_epoch.sqf
@@ -45,6 +45,8 @@ AI WEAPONS, UNIFORMS, VESTS AND GEAR
 	blck_crateMoneyRed = [175, 300];
 	blck_crateMoneyGreen = [300, 500];
 	blck_crateMoneyOrange = [500, 750];
+
+	blck_crateTypes = ["Box_FIA_Ammo_F","Box_FIA_Support_F","Box_FIA_Wps_F","I_SupplyCrate_F","Box_NATO_AmmoVeh_F","Box_East_AmmoVeh_F","IG_supplyCrate_F","Box_NATO_Wps_F","I_CargoNet_01_ammo_F","O_CargoNet_01_ammo_F","B_CargoNet_01_ammo_F"];  // Default crate type.
 	
 	blck_allowSalesAtBlackMktTraders = true; // Allow vehicles to be sold at Halvjes black market traders.
 	
@@ -515,7 +517,87 @@ AI WEAPONS, UNIFORMS, VESTS AND GEAR
 		blck_vests_red = blck_vests;
 		blck_vests_green = blck_vests;
 		blck_vests_orange = blck_vests;
-		
+
+		blck_UMS_uniforms = 
+		[
+			"U_I_Wetsuit",
+			"U_O_Wetsuit",
+			"U_B_Wetsuit"
+		];
+
+		blck_UMS_headgear = 
+		[
+			"G_Diving",
+			"G_B_Diving",
+			"G_O_Diving",
+			"G_I_Diving"
+		];
+
+		blck_UMS_vests = 
+		[
+			"V_RebreatherB",
+			"V_RebreatherIA",
+			"V_RebreatherIR"
+		];
+
+		blck_UMS_weapons = 
+		[
+			"arifle_SDAR_F"
+		];
+
+		if ((tolower blck_modType) isEqualTo "exile") then
+		{
+			blck_UMS_submarines =
+			[
+				
+				"Exile_Boat_SDV_CSAT",
+				"Exile_Boat_SDV_Digital",
+				"Exile_Boat_SDV_Grey"
+			];
+			
+			blck_UMS_crates =	["Exile_Container_SupplyBox"];
+		};
+		if ((tolower blck_modType) isEqualTo "epoch") then
+		{
+			blck_UMS_submarines = ["B_SDV_01_EPOCH"];
+			blck_UMS_crates = blck_crateTypes;
+			//blck_UMS_crates = ["container_epoch"];	
+		};
+		if ((toLower blck_modType) isEqualTo "default") then 
+		{
+			blck_UMS_submarines =
+			[
+				
+				"Exile_Boat_SDV_CSAT",
+				"Exile_Boat_SDV_Digital",
+				"Exile_Boat_SDV_Grey"
+			];
+			
+			blck_UMS_crates = blck_crateTypes;
+
+		};
+
+		blck_UMS_unarmedSurfaceVessels = 
+		[
+			"B_Boat_Transport_01_F",
+			"I_Boat_Transport_01_F"
+		];
+		blck_UMS_armedSurfaceVessels =
+		[
+			"B_Boat_Armed_01_minigun_F",
+			"I_Boat_Armed_01_minigun_F"	
+		];
+		blck_UMS_surfaceVessels = blck_UMS_unarmedSurfaceVessels + blck_UMS_armedSurfaceVessels;
+		blck_UMS_shipWrecks =
+		[
+			"Land_Boat_06_wreck_F",
+			"Land_Boat_05_wreck_F",
+			"Land_Boat_04_wreck_F",
+			"Land_Boat_02_abandoned_F",
+			"Land_Boat_01_abandoned_red_F",
+			"Land_Boat_01_abandoned_blue_F"
+		];
+				
 			//CraftingFood
         blck_Meats=[
             "SnakeCarcass_EPOCH","RabbitCarcass_EPOCH","ChickenCarcass_EPOCH","GoatCarcass_EPOCH","SheepCarcass_EPOCH","DogCarcass_EPOCH","ItemTrout","ItemSeaBass","ItemTuna"
@@ -1095,8 +1177,5 @@ blck_contructionLoot = blck_BoxLoot_Orange;
 blck_highPoweredLoot = blck_BoxLoot_Orange;
 blck_supportLoot = blck_BoxLoot_Orange;
 
-
-blck_crateTypes = ["Box_FIA_Ammo_F","Box_FIA_Support_F","Box_FIA_Wps_F","I_SupplyCrate_F","Box_NATO_AmmoVeh_F","Box_East_AmmoVeh_F","IG_supplyCrate_F","Box_NATO_Wps_F","I_CargoNet_01_ammo_F","O_CargoNet_01_ammo_F","B_CargoNet_01_ammo_F"];  // Default crate type.
-
 diag_log "[blckeagls] Configurations for Epoch Loaded";
 
diff --git a/@GMS/addons/custom_server/Configs/blck_configs_epoch_mil.sqf b/@GMS/addons/custom_server/Configs/blck_configs_epoch_mil.sqf
index cd4c22d..64d7ed9 100644
--- a/@GMS/addons/custom_server/Configs/blck_configs_epoch_mil.sqf
+++ b/@GMS/addons/custom_server/Configs/blck_configs_epoch_mil.sqf
@@ -45,6 +45,7 @@ AI WEAPONS, UNIFORMS, VESTS AND GEAR
 	blck_crateMoneyRed = [175, 300];
 	blck_crateMoneyGreen = [300, 500];
 	blck_crateMoneyOrange = [500, 750];
+	blck_crateTypes = ["Box_FIA_Ammo_F","Box_FIA_Support_F","Box_FIA_Wps_F","I_SupplyCrate_F","Box_NATO_AmmoVeh_F","Box_East_AmmoVeh_F","IG_supplyCrate_F","Box_NATO_Wps_F","I_CargoNet_01_ammo_F","O_CargoNet_01_ammo_F","B_CargoNet_01_ammo_F"];  // Default crate type.
 	
 	blck_maximumItemPriceInAI_Loadouts = 100;
 
@@ -152,10 +153,7 @@ AI WEAPONS, UNIFORMS, VESTS AND GEAR
 	];		
 	
 	blck_AIPatrolVehicles = ["B_G_Offroad_01_armed_EPOCH","B_LSV_01_armed_F"]; // Type of vehicle spawned to defend AI bases	
-	blck_AIPatrolVehiclesBlue = blck_AIPatrolVehicles;
-	blck_AIPatrolVehiclesRed = blck_AIPatrolVehicles;
-	blck_AIPatrolVehiclesGreen = blck_AIPatrolVehicles;
-	blck_AIPatrolVehiclesOrange = blck_AIPatrolVehicles;
+
 	
 	blck_AIPatrolVehicles = 
 	[
@@ -180,6 +178,12 @@ AI WEAPONS, UNIFORMS, VESTS AND GEAR
 	"B_APC_Tracked_01_CRV_F",
 	"B_APC_Tracked_01_rcws_F"																						
 	]; // Type of vehicle spawned to defend AI bases	
+
+	blck_AIPatrolVehiclesBlue = blck_AIPatrolVehicles;
+	blck_AIPatrolVehiclesRed = blck_AIPatrolVehicles;
+	blck_AIPatrolVehiclesGreen = blck_AIPatrolVehicles;
+	blck_AIPatrolVehiclesOrange = blck_AIPatrolVehicles;
+		
 	// Blacklisted itesm
 	blck_blacklistedOptics = ["optic_Nightstalker","optic_tws","optic_tws_mg"];
 	
@@ -550,6 +554,86 @@ AI WEAPONS, UNIFORMS, VESTS AND GEAR
 		blck_vests_red = blck_vests;
 		blck_vests_green = blck_vests;
 		blck_vests_orange = blck_vests;
+
+		blck_UMS_uniforms = 
+		[
+			"U_I_Wetsuit",
+			"U_O_Wetsuit",
+			"U_B_Wetsuit"
+		];
+
+		blck_UMS_headgear = 
+		[
+			"G_Diving",
+			"G_B_Diving",
+			"G_O_Diving",
+			"G_I_Diving"
+		];
+
+		blck_UMS_vests = 
+		[
+			"V_RebreatherB",
+			"V_RebreatherIA",
+			"V_RebreatherIR"
+		];
+
+		blck_UMS_weapons = 
+		[
+			"arifle_SDAR_F"
+		];
+
+		if ((tolower blck_modType) isEqualTo "exile") then
+		{
+			blck_UMS_submarines =
+			[
+				
+				"Exile_Boat_SDV_CSAT",
+				"Exile_Boat_SDV_Digital",
+				"Exile_Boat_SDV_Grey"
+			];
+			
+			blck_UMS_crates =	["Exile_Container_SupplyBox"];
+		};
+		if ((tolower blck_modType) isEqualTo "epoch") then
+		{
+			blck_UMS_submarines = ["B_SDV_01_EPOCH"];
+			blck_UMS_crates = blck_crateTypes;
+			//blck_UMS_crates = ["container_epoch"];	
+		};
+		if ((toLower blck_modType) isEqualTo "default") then 
+		{
+			blck_UMS_submarines =
+			[
+				
+				"Exile_Boat_SDV_CSAT",
+				"Exile_Boat_SDV_Digital",
+				"Exile_Boat_SDV_Grey"
+			];
+			
+			blck_UMS_crates = blck_crateTypes;
+
+		};
+
+		blck_UMS_unarmedSurfaceVessels = 
+		[
+			"B_Boat_Transport_01_F",
+			"I_Boat_Transport_01_F"
+		];
+		blck_UMS_armedSurfaceVessels =
+		[
+			"B_Boat_Armed_01_minigun_F",
+			"I_Boat_Armed_01_minigun_F"	
+		];
+		blck_UMS_surfaceVessels = blck_UMS_unarmedSurfaceVessels + blck_UMS_armedSurfaceVessels;
+		blck_UMS_shipWrecks =
+		[
+			"Land_Boat_06_wreck_F",
+			"Land_Boat_05_wreck_F",
+			"Land_Boat_04_wreck_F",
+			"Land_Boat_02_abandoned_F",
+			"Land_Boat_01_abandoned_red_F",
+			"Land_Boat_01_abandoned_blue_F"
+		];
 		
 			//CraftingFood
         blck_Meats=[
@@ -1010,7 +1094,5 @@ for examples of how you can do this see \Major\Compositions.sqf
 	blck_highPoweredLoot = blck_BoxLoot_Orange;
 	blck_supportLoot = blck_BoxLoot_Orange;
 
-	blck_crateTypes = ["Box_FIA_Ammo_F","Box_FIA_Support_F","Box_FIA_Wps_F","I_SupplyCrate_F","Box_NATO_AmmoVeh_F","Box_East_AmmoVeh_F","IG_supplyCrate_F","Box_NATO_Wps_F","I_CargoNet_01_ammo_F","O_CargoNet_01_ammo_F","B_CargoNet_01_ammo_F"];  // Default crate type.
-	
 	diag_log "[blckeagls] Configurations for Epoch Loaded";
 
diff --git a/@GMS/addons/custom_server/Configs/blck_configs_exile.sqf b/@GMS/addons/custom_server/Configs/blck_configs_exile.sqf
index 099a0b9..df6fb37 100644
--- a/@GMS/addons/custom_server/Configs/blck_configs_exile.sqf
+++ b/@GMS/addons/custom_server/Configs/blck_configs_exile.sqf
@@ -56,7 +56,9 @@ AI WEAPONS, UNIFORMS, VESTS AND GEAR
 	blck_crateMoneyRed = [175, 300];
 	blck_crateMoneyGreen = [300, 500];
 	blck_crateMoneyOrange = [500, 750];
-	
+
+	blck_crateTypes = ["Box_FIA_Ammo_F","Box_FIA_Support_F","Box_FIA_Wps_F","I_SupplyCrate_F","Box_NATO_AmmoVeh_F","Box_East_AmmoVeh_F","IG_supplyCrate_F","Box_NATO_Wps_F","I_CargoNet_01_ammo_F","O_CargoNet_01_ammo_F","B_CargoNet_01_ammo_F"];  // Default crate type.
+			
 	blck_maximumItemPriceInAI_Loadouts = 1000;
 	
 	blck_armed_vehicles_Exile = [
@@ -643,6 +645,86 @@ AI WEAPONS, UNIFORMS, VESTS AND GEAR
 	blck_vests_red = blck_vests;
 	blck_vests_green = blck_vests;
 	blck_vests_orange = blck_vests;		
+
+	blck_UMS_uniforms = 
+	[
+		"U_I_Wetsuit",
+		"U_O_Wetsuit",
+		"U_B_Wetsuit"
+	];
+
+	blck_UMS_headgear = 
+	[
+		"G_Diving",
+		"G_B_Diving",
+		"G_O_Diving",
+		"G_I_Diving"
+	];
+
+	blck_UMS_vests = 
+	[
+		"V_RebreatherB",
+		"V_RebreatherIA",
+		"V_RebreatherIR"
+	];
+
+	blck_UMS_weapons = 
+	[
+		"arifle_SDAR_F"
+	];
+
+	if ((tolower blck_modType) isEqualTo "exile") then
+	{
+		blck_UMS_submarines =
+		[
+			
+			"Exile_Boat_SDV_CSAT",
+			"Exile_Boat_SDV_Digital",
+			"Exile_Boat_SDV_Grey"
+		];
+		
+		blck_UMS_crates =	["Exile_Container_SupplyBox"];
+	};
+	if ((tolower blck_modType) isEqualTo "epoch") then
+	{
+		blck_UMS_submarines = ["B_SDV_01_EPOCH"];
+		blck_UMS_crates = blck_crateTypes;
+		//blck_UMS_crates = ["container_epoch"];	
+	};
+	if ((toLower blck_modType) isEqualTo "default") then 
+	{
+		blck_UMS_submarines =
+		[
+			
+			"Exile_Boat_SDV_CSAT",
+			"Exile_Boat_SDV_Digital",
+			"Exile_Boat_SDV_Grey"
+		];
+		
+		blck_UMS_crates = blck_crateTypes;
+
+	};
+
+	blck_UMS_unarmedSurfaceVessels = 
+	[
+		"B_Boat_Transport_01_F",
+		"I_Boat_Transport_01_F"
+	];
+	blck_UMS_armedSurfaceVessels =
+	[
+		"B_Boat_Armed_01_minigun_F",
+		"I_Boat_Armed_01_minigun_F"	
+	];
+	blck_UMS_surfaceVessels = blck_UMS_unarmedSurfaceVessels + blck_UMS_armedSurfaceVessels;
+	blck_UMS_shipWrecks =
+	[
+		"Land_Boat_06_wreck_F",
+		"Land_Boat_05_wreck_F",
+		"Land_Boat_04_wreck_F",
+		"Land_Boat_02_abandoned_F",
+		"Land_Boat_01_abandoned_red_F",
+		"Land_Boat_01_abandoned_blue_F"
+	];
 		
 	//CraftingFood
 	blck_Meats=[
@@ -1190,6 +1272,4 @@ blck_highPoweredLoot = [
 		]
 ];
 
-	blck_crateTypes = ["Box_FIA_Ammo_F","Box_FIA_Support_F","Box_FIA_Wps_F","I_SupplyCrate_F","Box_NATO_AmmoVeh_F","Box_East_AmmoVeh_F","IG_supplyCrate_F","Box_NATO_Wps_F","I_CargoNet_01_ammo_F","O_CargoNet_01_ammo_F","B_CargoNet_01_ammo_F"];  // Default crate type.
-		
-	diag_log format["[blckeagls] Configurations for Exile Loaded"];
+diag_log format["[blckeagls] Configurations for Exile Loaded"];
diff --git a/@GMS/addons/custom_server/Configs/blck_configs_exile_mil.sqf b/@GMS/addons/custom_server/Configs/blck_configs_exile_mil.sqf
index 7affd6e..cf33878 100644
--- a/@GMS/addons/custom_server/Configs/blck_configs_exile_mil.sqf
+++ b/@GMS/addons/custom_server/Configs/blck_configs_exile_mil.sqf
@@ -47,6 +47,8 @@ AI WEAPONS, UNIFORMS, VESTS AND GEAR
 	blck_crateMoneyGreen = [300, 500];
 	blck_crateMoneyOrange = [500, 750];
 
+	blck_crateTypes = ["Box_FIA_Ammo_F","Box_FIA_Support_F","Box_FIA_Wps_F","I_SupplyCrate_F","Box_NATO_AmmoVeh_F","Box_East_AmmoVeh_F","IG_supplyCrate_F","Box_NATO_Wps_F","I_CargoNet_01_ammo_F","O_CargoNet_01_ammo_F","B_CargoNet_01_ammo_F"];  // Default crate type.
+		
 	blck_maximumItemPriceInAI_Loadouts = 1000;
 	
 	blck_armed_vehicles_Exile = [
@@ -663,6 +665,86 @@ AI WEAPONS, UNIFORMS, VESTS AND GEAR
 	blck_vests_red = blck_vests;
 	blck_vests_green = blck_vests;
 	blck_vests_orange = blck_vests;	
+
+	blck_UMS_uniforms = 
+	[
+		"U_I_Wetsuit",
+		"U_O_Wetsuit",
+		"U_B_Wetsuit"
+	];
+
+	blck_UMS_headgear = 
+	[
+		"G_Diving",
+		"G_B_Diving",
+		"G_O_Diving",
+		"G_I_Diving"
+	];
+
+	blck_UMS_vests = 
+	[
+		"V_RebreatherB",
+		"V_RebreatherIA",
+		"V_RebreatherIR"
+	];
+
+	blck_UMS_weapons = 
+	[
+		"arifle_SDAR_F"
+	];
+
+	if ((tolower blck_modType) isEqualTo "exile") then
+	{
+		blck_UMS_submarines =
+		[
+			
+			"Exile_Boat_SDV_CSAT",
+			"Exile_Boat_SDV_Digital",
+			"Exile_Boat_SDV_Grey"
+		];
+		
+		blck_UMS_crates =	["Exile_Container_SupplyBox"];
+	};
+	if ((tolower blck_modType) isEqualTo "epoch") then
+	{
+		blck_UMS_submarines = ["B_SDV_01_EPOCH"];
+		blck_UMS_crates = blck_crateTypes;
+		//blck_UMS_crates = ["container_epoch"];	
+	};
+	if ((toLower blck_modType) isEqualTo "default") then 
+	{
+		blck_UMS_submarines =
+		[
+			
+			"Exile_Boat_SDV_CSAT",
+			"Exile_Boat_SDV_Digital",
+			"Exile_Boat_SDV_Grey"
+		];
+		
+		blck_UMS_crates = blck_crateTypes;
+
+	};
+
+	blck_UMS_unarmedSurfaceVessels = 
+	[
+		"B_Boat_Transport_01_F",
+		"I_Boat_Transport_01_F"
+	];
+	blck_UMS_armedSurfaceVessels =
+	[
+		"B_Boat_Armed_01_minigun_F",
+		"I_Boat_Armed_01_minigun_F"	
+	];
+	blck_UMS_surfaceVessels = blck_UMS_unarmedSurfaceVessels + blck_UMS_armedSurfaceVessels;
+	blck_UMS_shipWrecks =
+	[
+		"Land_Boat_06_wreck_F",
+		"Land_Boat_05_wreck_F",
+		"Land_Boat_04_wreck_F",
+		"Land_Boat_02_abandoned_F",
+		"Land_Boat_01_abandoned_red_F",
+		"Land_Boat_01_abandoned_blue_F"
+	];
 		
 	//CraftingFood
 	blck_Meats=[
@@ -1238,9 +1320,6 @@ blck_highPoweredLoot = [
 			
 		]
 ];
-	// Time the marker remains after completing the mission in seconds - experimental not yet implemented
 
-	blck_crateTypes = ["Box_FIA_Ammo_F","Box_FIA_Support_F","Box_FIA_Wps_F","I_SupplyCrate_F","Box_NATO_AmmoVeh_F","Box_East_AmmoVeh_F","IG_supplyCrate_F","Box_NATO_Wps_F","I_CargoNet_01_ammo_F","O_CargoNet_01_ammo_F","B_CargoNet_01_ammo_F"];  // Default crate type.
-		
 	diag_log format["[blckeagls] Configurations for Exile Loaded"];
 
diff --git a/@GMS/addons/custom_server/Missions/GMS_missionLists.sqf b/@GMS/addons/custom_server/Missions/GMS_missionLists.sqf
index 12e6090..5123d6f 100644
--- a/@GMS/addons/custom_server/Missions/GMS_missionLists.sqf
+++ b/@GMS/addons/custom_server/Missions/GMS_missionLists.sqf
@@ -24,3 +24,6 @@ private  _missionListGreen = ["default","medicalCamp","redCamp","resupplyCamp","
 
 private _pathOrange = "Orange";
 private _missionListOrange = ["default","medicalCamp","redCamp","resupplyCamp","bunker","dashq","tko_camp"];
+
+private _pathUMS = "UMS\dynamicMissions";
+private _missionListUMS = ["default"];
diff --git a/@GMS/addons/custom_server/Missions/UMS/GMS_UMS_configurations.sqf b/@GMS/addons/custom_server/Missions/UMS/GMS_UMS_configurations.sqf
index a9d24f8..67b1e5a 100644
--- a/@GMS/addons/custom_server/Missions/UMS/GMS_UMS_configurations.sqf
+++ b/@GMS/addons/custom_server/Missions/UMS/GMS_UMS_configurations.sqf
@@ -52,8 +52,8 @@ if ((tolower blck_modType) isEqualTo "exile") then
 if ((tolower blck_modType) isEqualTo "epoch") then
 {
 	blck_UMS_submarines = ["B_SDV_01_EPOCH"];
-	//blck_UMS_crates = blck_crateTypes;
-	blck_UMS_crates = ["container_epoch"];	
+	blck_UMS_crates = blck_crateTypes;
+	//blck_UMS_crates = ["container_epoch"];	
 };
 if ((toLower blck_modType) isEqualTo "default") then 
 {
diff --git a/@GMS/addons/custom_server/Missions/UMS/GMS_UMS_init.sqf b/@GMS/addons/custom_server/Missions/UMS/GMS_UMS_init.sqf
index 78da88b..3514792 100644
--- a/@GMS/addons/custom_server/Missions/UMS/GMS_UMS_init.sqf
+++ b/@GMS/addons/custom_server/Missions/UMS/GMS_UMS_init.sqf
@@ -18,7 +18,7 @@ blck_UMS_ActiveDynamicMissions = [];
 //diag_log "Including GMS_UMS_configurations.sqf";
 #include "GMS_UMS_configurations.sqf";
 //diag_log "Including GMS_UMS_dynamicMissionLIsts.sqf";
-#include "GMS_UMS_dynamicMissionList.sqf";
+//#include "GMS_UMS_dynamicMissionList.sqf";
 //diag_log format ["Initializing UMS static missions at %1",diag_tickTime];
 [] execVM "q\addons\custom_server\Missions\UMS\GMS_UMS_StaticMissions_init.sqf";
 
diff --git a/@GMS/addons/custom_server/changeLog.sqf b/@GMS/addons/custom_server/changeLog.sqf
index 15afaf7..fc29705 100644
--- a/@GMS/addons/custom_server/changeLog.sqf
+++ b/@GMS/addons/custom_server/changeLog.sqf
@@ -6,12 +6,16 @@ Ideas or code from that by He-Man, Vampire and KiloSwiss have been used for cert
 Many thanks for new Coding and ideas from Grahame.
 
 Significant Changes:
+
 =====================
-7.00 Build 212
-New: 
+7.00 Build 214
+New: Option to drop crates on a parachute at mission spawn which adds some randomness to where crates end up. <TODO: Implement this in configs and monitorLoop>
+	blck_spawnCratesTiming = "addMissionSpawnAir";
 Fixed: Don and Hostage missions could not be completed 
 Fixed: Missions tended to spawn all at once 
 Fixed: vehicles are spawned at a safe spot which should reduce unintended explosions 
+Fixed: Missions sometimes spawned on steep hillsides.
+Fixed: Vehicles sometimes blew up on spawn.
 Added: The system has been upgreaded to a state-based system, meaning one scrpt is running once all missions are initialized.
 Changed: a lot of debugging was removed.
 
diff --git a/@GMS/addons/custom_server/init/blck_init_server.sqf b/@GMS/addons/custom_server/init/blck_init_server.sqf
index a43c155..e9286be 100644
--- a/@GMS/addons/custom_server/init/blck_init_server.sqf
+++ b/@GMS/addons/custom_server/init/blck_init_server.sqf
@@ -184,7 +184,10 @@ if (blck_enableBlueMissions > 0) then
 {
 	[_missionListBlue,_pathBlue,"BlueMarker","blue",blck_TMin_Blue,blck_TMax_Blue,blck_enableBlueMissions] call blck_fnc_addMissionToQue;
 };
-
+if (blck_numberUnderwaterDynamicMissions > 0) then 
+{
+	[_missionListUMS,_pathUMS,"UMSMarker","Red",blck_TMin_UMS,blck_TMax_UMS,blck_numberUnderwaterDynamicMissions] call blck_fnc_addMissionToQue;
+};
 
 
 // Setup a group for AI corpses
diff --git a/@GMS/addons/custom_server/init/build.sqf b/@GMS/addons/custom_server/init/build.sqf
index 1a19199..ba3383d 100644
--- a/@GMS/addons/custom_server/init/build.sqf
+++ b/@GMS/addons/custom_server/init/build.sqf
@@ -1,4 +1,4 @@
 
 #define blck_buildNumber 214
 #define blck_versionNumber 7.00
-#define blck_buildDate "8-1-20"
+#define blck_buildDate "8-5-20"
diff --git a/changeLog.sqf b/changeLog.sqf
index d44ab2d..1016d3b 100644
--- a/changeLog.sqf
+++ b/changeLog.sqf
@@ -10,8 +10,9 @@ Many thanks for new Coding and ideas from Grahame.
 Significant Changes:
 
 =====================
-7.00 Build 212
-New: 
+7.00 Build 214
+New: Option to drop crates on a parachute at mission spawn which adds some randomness to where crates end up. <TODO: Implement this in configs and monitorLoop>
+	blck_spawnCratesTiming = "addMissionSpawnAir";
 Fixed: Don and Hostage missions could not be completed 
 Fixed: Missions tended to spawn all at once 
 Fixed: vehicles are spawned at a safe spot which should reduce unintended explosions