diff --git a/addons/tmf_loadouts/CfgLoadouts.hpp b/addons/tmf_loadouts/CfgLoadouts.hpp
index 421b6e0..8800218 100644
--- a/addons/tmf_loadouts/CfgLoadouts.hpp
+++ b/addons/tmf_loadouts/CfgLoadouts.hpp
@@ -69,6 +69,7 @@ class CfgLoadouts {
 		tooltip = "Author: AChesheireCat";
 		#include "loadouts\us_rangers_2020.hpp"
 	};
+
 	// Western Factions
 	class ger_army_2010 {
 		displayName = "Bundeswehr (2010, Flecktarn)";
@@ -118,6 +119,7 @@ class CfgLoadouts {
 		tooltip = "Author: Freddo";
 		#include "loadouts\idf_army_2010.hpp"
 	};
+
 	// Russian/Soviet Factions
 	class ussr_army_1970 {
 		displayName = "Soviet Army (1970, M88)";
@@ -131,12 +133,142 @@ class CfgLoadouts {
 		tooltip = "Author: Freddo";
 		#include "loadouts\ussr_army_1985.hpp"
 	};
+	class ru_mvd_2005 {
+		displayName = "Russian Interior Troops (2005, Partizan Summer)\n\nSemi-fictional";
+		category = "Russia";
+		tooltip = "Author: Freddo";
+		#include "loadouts\ru_mvd_2005.hpp"
+	};
+	class ru_mvd_autumn_2005 {
+		displayName = "Russian Interior Troops (2005, Partizan Autumn)\n\nSemi-fictional";
+		category = "Russia";
+		tooltip = "Author: Freddo";
+		#define AUTUMN true
+		#include "loadouts\ru_mvd_2005.hpp"
+	};
 	class ru_army_2010 {
 		displayName = "Russian Army (2010, VSR-98)";
 		category = "Russia";
 		tooltip = "Author: Freddo";
 		#include "loadouts\ru_army_2010.hpp"
 	};
+	class ru_army_ratnik_2020 {
+		displayName = "Russian Army (2020, Ratnik Summer)";
+		category = "Russia";
+		tooltip = "Author: Freddo, AChesheireCat";
+		#define GHILLIE_CLASS "U_B_T_FullGhillie_tna_F"
+		#include "loadouts\ru_army_template_2020.hpp"
+	};
+	class ru_army_ratnik_autumn_2020 {
+		displayName = "Russian Army (2020, Ratnik Autumn)";
+		category = "Russia";
+		tooltip = "Author: Freddo, AChesheireCat";
+		#define UNI_CAMO Autumn
+		#define HELMET_CAMO Summer
+		#define BACKPACK_CAMO Summer
+		#define GHILLIE_CLASS "U_B_FullGhillie_lsh"
+		#include "loadouts\ru_army_template_2020.hpp"
+	};
+	class ru_army_ratnik_beigedigital_2020 {
+		displayName = "Russian Army (2020, Ratnik Beige Digital)";
+		category = "Russia";
+		tooltip = "Author: Freddo, AChesheireCat";
+		#define UNI_CAMO BeigeDigital
+		#define VEST_CAMO BeigeDigital
+		#define GHILLIE_CLASS "U_B_FullGhillie_ard"
+		#include "loadouts\ru_army_template_2020.hpp"
+	};
+	class ru_army_ratnik_desert_2020 {
+		displayName = "Russian Army (2020, Ratnik Desert)";
+		category = "Russia";
+		tooltip = "Author: Freddo, AChesheireCat";
+		#define UNI_CAMO Desert
+		#define VEST_CAMO Desert
+		#define GHILLIE_CLASS "U_B_FullGhillie_ard"
+		#include "loadouts\ru_army_template_2020.hpp"
+	};
+	class ru_army_ratnik_pink_2020 {
+		displayName = "Russian Army (2020, Ratnik Pink)";
+		category = "Russia";
+		tooltip = "Author: Freddo, AChesheireCat";
+		#define UNI_CAMO Pink
+		#define HELMET_CAMO Desert
+		#define BACKPACK_CAMO Desert
+		#define VEST_CAMO Desert
+		#define GHILLIE_CLASS "U_B_FullGhillie_ard"
+		#include "loadouts\ru_army_template_2020.hpp"
+	};
+	class ru_army_ratnik_winter_2020 {
+		displayName = "Russian Army (2020, Ratnik Winter)";
+		category = "Russia";
+		tooltip = "Author: Freddo, AChesheireCat";
+		#define UNI_CAMO Winter
+		#define IS_WINTER true
+		#define GHILLIE_CLASS "U_B_FullGhillie_ard"
+		#include "loadouts\ru_army_template_2020.hpp"
+	};
+	class ru_army_ratnik_ak12_2020 {
+		displayName = "Russian Army (2020, Ratnik Summer, AK12)";
+		category = "Russia";
+		tooltip = "Author: Freddo, AChesheireCat\n\nNote: Requires Contact DLC for most roles.";
+		#define GHILLIE_CLASS "U_B_T_FullGhillie_tna_F"
+		#define USE_AK12 true
+		#include "loadouts\ru_army_template_2020.hpp"
+	};
+	class ru_army_ratnik_ak12_autumn_2020 {
+		displayName = "Russian Army (2020, Ratnik Autumn, AK12)";
+		category = "Russia";
+		tooltip = "Author: Freddo, AChesheireCat\n\nNote: Requires Contact DLC for most roles.";
+		#define UNI_CAMO Autumn
+		#define HELMET_CAMO Summer
+		#define BACKPACK_CAMO Summer
+		#define GHILLIE_CLASS "U_B_FullGhillie_lsh"
+		#define USE_AK12 true
+		#include "loadouts\ru_army_template_2020.hpp"
+	};
+	class ru_army_ratnik_ak12_beigedigital_2020 {
+		displayName = "Russian Army (2020, Ratnik Beige Digital, AK12)";
+		category = "Russia";
+		tooltip = "Author: Freddo, AChesheireCat\n\nNote: Requires Contact DLC for most roles.";
+		#define UNI_CAMO BeigeDigital
+		#define VEST_CAMO BeigeDigital
+		#define GHILLIE_CLASS "U_B_FullGhillie_ard"
+		#define USE_AK12 true
+		#include "loadouts\ru_army_template_2020.hpp"
+	};
+	class ru_army_ratnik_ak12_desert_2020 {
+		displayName = "Russian Army (2020, Ratnik Desert, AK12)";
+		category = "Russia";
+		tooltip = "Author: Freddo, AChesheireCat\n\nNote: Requires Contact DLC for most roles.";
+		#define UNI_CAMO Desert
+		#define VEST_CAMO Desert
+		#define GHILLIE_CLASS "U_B_FullGhillie_ard"
+		#define USE_AK12 true
+		#include "loadouts\ru_army_template_2020.hpp"
+	};
+	class ru_army_ratnik_ak12_pink_2020 {
+		displayName = "Russian Army (2020, Ratnik Pink, AK12)";
+		category = "Russia";
+		tooltip = "Author: Freddo, AChesheireCat\n\nNote: Requires Contact DLC for most roles.";
+		#define UNI_CAMO Pink
+		#define HELMET_CAMO Desert
+		#define BACKPACK_CAMO Desert
+		#define VEST_CAMO Desert
+		#define GHILLIE_CLASS "U_B_FullGhillie_ard"
+		#define USE_AK12 true
+		#include "loadouts\ru_army_template_2020.hpp"
+	};
+	class ru_army_ratnik_ak12_winter_2020 {
+		displayName = "Russian Army (2020, Ratnik Winter, AK12)";
+		category = "Russia";
+		tooltip = "Author: Freddo, AChesheireCat\n\nNote: Requires Contact DLC for most roles.";
+		#define UNI_CAMO Winter
+		#define IS_WINTER true
+		#define GHILLIE_CLASS "U_B_FullGhillie_ard"
+		#define USE_AK12 true
+		#include "loadouts\ru_army_template_2020.hpp"
+	};
+
 	// Eastern Factions
 	class pla_army_2010 {
 		displayName = "Peoples Liberation Army (2010, Type 07 Universal)";
@@ -144,13 +276,20 @@ class CfgLoadouts {
 		tooltip = "Author: Freddo\n\nUses APEX weapons.";
 		#include "loadouts\pla_army_2010.hpp"
 	};
+
 	// Armaverse Factions
 	class tk_locals {
 		displayName = "Takistani Locals";
 		category = "Armaverse Factions";
-		tooltip = "Author: Freddo\n\nNote: Low ammo count. Make sure resupply is available.";
+		tooltip = "Author: Freddo";
 		#include "loadouts\tk_locals.hpp"
 	};
+	class tk_army {
+		displayName = "Takistani Army";
+		category = "Armaverse Factions";
+		tooltip = "Author: Freddo";
+		#include "loadouts\tk_army.hpp"
+	};
 	class chdkz {
 		displayName = "Chernarussian Movement of the Red Star";
 		category = "Armaverse Factions";
diff --git a/addons/tmf_loadouts/loadouts/ru_army_2010.hpp b/addons/tmf_loadouts/loadouts/ru_army_2010.hpp
index 08b568b..5d58939 100644
--- a/addons/tmf_loadouts/loadouts/ru_army_2010.hpp
+++ b/addons/tmf_loadouts/loadouts/ru_army_2010.hpp
@@ -181,7 +181,12 @@ class aar : r {
 
 class rat : car {
 	displayName = "Rifleman (AT)";
-	secondaryWeapon[] = {"CUP_launch_RPG18"};
+	secondaryWeapon[] = {"CUP_launch_RPG26"};
+};
+
+class lat : car {
+	displayName = "Rifleman (RShG-2)";
+	secondaryWeapon[] = {"CUP_launch_RShG2"};
 };
 
 class dm : r {
@@ -235,16 +240,29 @@ class mmgtl : aar {
 
 class hmgg : car {
 	displayName = "HMG Gunner";
-	backPack[] = {"CUP_B_Kord_Gun_Bag"};
+	secondaryWeapon[] = {"CUP_KORD_carry"};
+	backPack[] = {"B_Carryall_green_F"};
+	backpackItems[] = {
+		LIST_6("ace_csw_50Rnd_127x108_mag")
+	};
 };
 
 class hmgac : r {
 	displayName = "HMG Ammo Carrier";
-	backPack[] = {"CUP_B_Kord_Tripod_Bag"};
+	secondaryWeapon[] = {"ace_csw_kordCarryTripod"};
+	backPack[] = {"B_Carryall_green_F"};
+	backpackItems[] = {
+		LIST_6("ace_csw_50Rnd_127x108_mag")
+	};
 };
 class hmgtl : car {
 	displayName = "HMG Team Leader";
-	backPack[] = {"CUP_B_Kord_Tripod_Bag"};
+	secondaryWeapon[] = {"ace_csw_kordCarryTripodLow"};
+	backPack[] = {"B_Carryall_green_F"};
+	backpackItems[] = {
+		LIST_6("ace_csw_50Rnd_127x108_mag"),
+		"ACE_EntrenchingTool"
+	};
 	linkedItems[] = {
 		"ItemMap",
 		"ItemCompass",
@@ -294,17 +312,17 @@ class mattl : car {
 
 class hatg : car {
 	displayName = "HAT Gunner";
-	backPack[] = {"CUP_B_Metis_Gun_Bag"};
+	backPack[] = {"CUP_B_Kornet_Gun_Bag"};
 };
 
 class hatac : r {
 	displayName = "HAT Ammo Carrier";
-	backPack[] = {"CUP_B_Metis_Tripod_Bag"};
+	backPack[] = {"CUP_B_Kornet_Tripod_Bag"};
 };
 
 class hattl : car {
 	displayName = "HAT Team Leader";
-	backPack[] = {"CUP_B_Metis_Tripod_Bag"};
+	backPack[] = {"CUP_B_Kornet_Tripod_Bag"};
 	linkedItems[] = {
 		"ItemMap",
 		"ItemCompass",
@@ -317,7 +335,7 @@ class hattl : car {
 
 class mtrg : car {
 	displayName = "Mortar Gunner";
-	secondaryWeapon[] = {"ace_csw_staticMortarCarry"};
+	secondaryWeapon[] = {"CUP_2b14_carry"};
 	backPack[] = {"B_Carryall_green_F"};
 	backpackItems[] = {
 		LIST_4("ACE_1Rnd_82mm_Mo_HE"),
@@ -385,14 +403,14 @@ class sn : car {
 	backpackItems[] = {LIST_4("CUP_5Rnd_127x108_KSVK_M")};
 
 	// This adds a sniper rifle to the ACE gunbag
-	code = QUOTE(\
+	code = "															\
 		backpackContainer _this setVariable ['ace_gunbag_gunbagWeapon', \
-		[ \
-			'CUP_srifle_ksvk', \
-			['','','cup_optic_pso_3',''], \
-			[['CUP_5Rnd_127x108_KSVK_M', 5]] \
-		], true]; \
-	);
+		[ 																\
+			'CUP_srifle_ksvk', 											\
+			['','','cup_optic_pso_3',''], 								\
+			[['CUP_5Rnd_127x108_KSVK_M', 5]] 							\
+		], true]; 														\
+	";
 };
 
 class sp : car {
@@ -495,6 +513,10 @@ class eng : car {
 	sidearmWeapon[] = {"ACE_VMM3"};
 	traits[] = {"engineer", "explosiveSpecialist"};
 	backpack[] = {"B_Kitbag_rgr"};
+	items[] += {
+		"ACE_DefusalKit",
+		"ACE_Clacker"
+	};
 	backpackItems[] = {
 		"ToolKit",
 		"ACE_wirecutter",
diff --git a/addons/tmf_loadouts/loadouts/ru_army_template_2020.hpp b/addons/tmf_loadouts/loadouts/ru_army_template_2020.hpp
new file mode 100644
index 0000000..9c7cfb5
--- /dev/null
+++ b/addons/tmf_loadouts/loadouts/ru_army_template_2020.hpp
@@ -0,0 +1,697 @@
+// If you want to base a loadout on an existing one, this repository contains them all:
+// https://github.com/ARCOMM/arc_misc/tree/master/addons/tmf_loadouts
+
+/*
+	Dependencies:
+		* CUP Units
+		* CUP Weapons
+		* Wearable Antennas
+
+	Note:
+		This loadout functions as a template for several different camos.
+		Camos and weapons can be configured through the use of:
+			#define UNI_CAMO
+			#define VEST_CAMO
+			#define HELMET_CAMO
+			#define BACKPACK_CAMO
+			#define IS_WINTER
+			#define GHILLIE_CLASS
+			#define USE_AK12
+
+		For camos, valid options are:
+			* Summer (Leave undefined for vests)
+			* Autumn (Not available for vests)
+			* Winter (Not available for vests)
+			* BeigeDigital
+			* Desert
+			* Pink (Not available for vests)
+			* Green (Only for backpacks)
+
+		IS_WINTER defines whether to use winter balaclavas,
+		and which backpacks to use.
+		Leave undefined when not winter
+
+		GHILLIE_CLASS can be defined as any uniform, such as
+		#define GHILLIE_CLASS "U_B_FullGhillie_lsh"
+
+		Defining USE_AK12 makes changes the rifles to AK12s instead of AK74s,
+		Note that this requires the Contact Expansion
+
+		See CfgLoadouts for usage examples
+*/
+
+// Reference: https://www.battleorder.org/rus-btr-co
+
+//	Created by: Freddo, AChesheireCat
+
+#ifndef UNI_CAMO
+	#define UNI_CAMO Summer
+#endif
+
+#ifdef VEST_CAMO
+	#define VEST_CLASS(var1) DOUBLES(var1,VEST_CAMO)
+#else
+	#define VEST_CLASS(var1) var1
+#endif
+
+#ifndef HELMET_CAMO
+	#define HELMET_CAMO UNI_CAMO
+#endif
+#define HELMET_CLASS(var1) DOUBLES(var1,HELMET_CAMO)
+
+#ifndef BACKPACK_CAMO
+	#define BACKPACK_CAMO UNI_CAMO
+#endif
+#define BACKPACK_CLASS(var1) DOUBLES(var1,BACKPACK_CAMO)
+#ifdef IS_WINTER
+	#define BACKPACK_SHOVEL_CLASS(var1) BACKPACK_CLASS(var1)
+	#define BALACLAVAS CUP_G_RUS_Balaclava_Ratnik_winter, CUP_G_RUS_Balaclava_Ratnik_winter_v2
+#else
+	#define BACKPACK_SHOVEL_CLASS(var1) TRIPLES(var1,BACKPACK_CAMO,Shovel)
+	#define BALACLAVAS CUP_G_RUS_Balaclava_Ratnik, CUP_G_RUS_Balaclava_Ratnik_v2
+#endif
+
+#ifndef GHILLIE_CLASS
+	#define GHILLIE_CLASS "U_B_FullGhillie_lsh"
+#endif
+
+#ifdef USE_AK12
+	#define RIFLE "arc_misc_weapons_ak12"
+	#define RIFLE_GL "arc_misc_weapons_ak12_GL"
+	#define CARBINE "arc_misc_weapons_ak12k"
+	#define RPK "arc_misc_weapons_rpk16"
+	#define SMG "CUP_arifle_SR3M_Vikhr_VFG_top_rail"
+	#define ATTACHMENTS "cup_optic_ac11704_black", "cup_optic_1p87_ris"
+#else
+	// Mixing RIS and non-RIS to mix in some iron sights
+	#define RIFLE "CUP_arifle_AK74M", "CUP_arifle_AK74M_top_rail"
+	#define RIFLE_GL "CUP_arifle_AK74M_GL", "CUP_arifle_AK74M_GL_top_rail"
+	#define CARBINE "CUP_arifle_AK105", "CUP_arifle_AK105_top_rail"
+	#define RPK "CUP_arifle_RPK74M", "CUP_arifle_RPK74M_top_rail"
+	#define SMG "CUP_arifle_SR3M_Vikhr_VFG", "CUP_arifle_SR3M_Vikhr_VFG_top_rail"
+	#define ATTACHMENTS "cup_optic_ekp_8_02", "cup_optic_1p63", "cup_optic_kobra", "cup_optic_ac11704_black", "cup_optic_1p87_ris"
+#endif
+
+#ifndef DOUBLES
+	#define DOUBLES(var1,var2) var1##_##var2
+#endif
+#ifndef TRIPLES
+	#define TRIPLES(var1,var2,var3) var1##_##var2##_##var3
+#endif
+
+class baseMan {
+	displayName = "Unarmed";
+	uniform[] = {DOUBLES(CUP_U_O_RUS_Ratnik,UNI_CAMO)};
+	vest[] = {VEST_CLASS(CUP_Vest_RUS_6B45_Sh117)};
+	backpack[] = {};
+	headgear[] = {};
+	goggles[] = {"default"};
+	hmd[] = {};
+	faces[] = {
+		"default",
+		"faceset:russian"
+	};
+	insignias[] = {};
+
+	primaryWeapon[] = {};
+	scope[] = {};
+	bipod[] = {};
+	attachment[] = {};
+	silencer[] = {};
+
+	secondaryWeapon[] = {};
+	secondaryAttachments[] = {};
+	sidearmWeapon[] = {};
+	sidearmAttachments[] = {};
+
+	magazines[] = {};
+	items[] = {
+		MEDICAL_R ,
+		"ACE_Flashlight_KSF1",
+		"Chemlight_red"
+	};
+	linkedItems[] = {
+		"ItemMap",
+		"ItemCompass",
+		"ItemWatch",
+		"ItemRadio",
+		"ItemGPS"
+	};
+
+	backpackItems[] = {};
+
+	traits[] = {};
+
+	code = "";
+};
+
+class r : baseMan {
+	displayName = "Rifleman";
+	hmd[] = {"CUP_NVG_PVS14"};
+	goggles[] = { BALACLAVAS };
+	vest[] = {VEST_CLASS(CUP_Vest_RUS_6B45_Sh117)};
+	headgear[] = {
+		HELMET_CLASS(CUP_H_RUS_6B47_v2),
+		HELMET_CLASS(CUP_H_RUS_6B47_v2_GogglesClosed),
+		HELMET_CLASS(CUP_H_RUS_6B47_v2_GogglesDown),
+		HELMET_CLASS(CUP_H_RUS_6B47_v2_GogglesUp)
+	};
+	primaryWeapon[] = {
+		RIFLE
+	};
+	scope[] = {
+		ATTACHMENTS
+	};
+	attachment[] = {"cup_acc_flashlight"};
+	magazines[] = {
+		LIST_8("CUP_30Rnd_545x39_AK74_plum_M"),
+		LIST_2("CUP_30Rnd_TE1_Green_Tracer_545x39_AK74_plum_M"),
+		LIST_2("CUP_HandGrenade_RGO"),
+		LIST_2("SmokeShell")
+	};
+};
+
+class g : r {
+	displayName = "Grenadier";
+	vest[] = {VEST_CLASS(CUP_Vest_RUS_6B45_Sh117_VOG)};
+	primaryWeapon[] = {
+		RIFLE_GL
+	};
+	magazines[] += {
+		LIST_10("CUP_1Rnd_HE_GP25_M"),
+		LIST_2("CUP_1Rnd_SMOKE_GP25_M"),
+		LIST_2("CUP_IlumFlareRed_GP25_M")
+	};
+};
+
+class car : r {
+	displayName = "Carabinier";
+	primaryWeapon[] = { CARBINE };
+};
+
+class cls : car {
+	displayName = "Combat Life Saver";
+	backpack[] = {BACKPACK_CLASS(CUP_O_RUS_Patrol_bag)};
+	traits[] = {"medic"};
+	backpackItems[] = { MEDICAL_CLS };
+};
+
+class m : cls {
+	displayName = "Medic";
+	backpackItems[] = { MEDICAL_M };
+};
+
+class smg : r {
+	displayName = "Submachinegunner";
+	primaryWeapon[] = { SMG };
+	magazines[] = {
+		LIST_8("CUP_30Rnd_9x39_SP5_VIKHR_M"),
+		"CUP_HandGrenade_RGO",
+		"SmokeShell"
+	};
+};
+
+class ftl : g {
+	displayName = "Fireteam Leader";
+	backPack[] = {"CUP_B_SLA_Medicbag"};
+	magazines[] += {
+		LIST_2("CUP_1Rnd_SmokeGreen_GP25_M"),
+		LIST_2("CUP_1Rnd_SmokeRed_GP25_M"),
+		LIST_2("CUP_1Rnd_SMOKE_GP25_M")
+	};
+	items[] += {"ACE_MapTools"};
+	linkedItems[] += {"Binocular"};
+};
+
+class sl : r {
+	displayName = "Squad Leader";
+	backPack[] = {"CUP_B_SLA_Medicbag"};
+	sidearmWeapon[] = {"hgun_Rook40_F"};
+	magazines[] += {
+		LIST_3("16Rnd_9x21_Mag"),
+		LIST_2("SmokeShellRed"),
+		LIST_2("SmokeShellGreen"),
+		LIST_5("ACE_Chemlight_HiRed")
+	};
+	items[] += {"ACE_MapTools", "ACE_microDAGR"};
+	linkedItems[] += {
+		"ACE_Yardage450"
+	};
+};
+
+class co : sl {
+	displayName = "Platoon Leader";
+	headgear[] = {"CUP_H_RUS_Bandana_GSSh_Headphones"};
+	goggles[] = {"default"};
+};
+
+class fac : ftl {
+	displayName = "Forward Air Controller";
+	headgear[] = {"CUP_H_RUS_Bandana_GSSh_Headphones"};
+	goggles[] = {"antenna_long_two_face"};
+	backpack[] = {BACKPACK_SHOVEL_CLASS(CUP_O_RUS_Patrol_bag)};
+	backpackItems[] = {
+		FAC_GEAR
+	};
+	magazines[] += {
+		"Laserbatteries"
+	};
+	linkedItems[] = {
+		"ItemMap",
+		"ItemCompass",
+		"ItemWatch",
+		"CUP_SOFLAM",
+		"ItemRadio",
+		"ItemGPS"
+	};
+};
+
+class ar : r {
+	displayName = "Automatic Rifleman";
+	backpack[] = {BACKPACK_CLASS(CUP_O_RUS_Patrol_bag)};
+	primaryWeapon[] = {
+		RPK
+	};
+	magazines[] = {
+		LIST_8("CUP_60Rnd_545x39_AK74M_M"),
+		LIST_2("CUP_60Rnd_TE1_Green_Tracer_545x39_AK74M_M"),
+		"CUP_HandGrenade_RGO",
+		"SmokeShell"
+	};
+};
+
+class aar : r {
+	displayName = "Assistant Automatic Rifleman";
+	backpack[] = {BACKPACK_SHOVEL_CLASS(CUP_O_RUS_Patrol_bag)};
+	backpackItems[] = {
+		LIST_8("CUP_60Rnd_545x39_AK74M_M"),
+		LIST_2("CUP_60Rnd_TE1_Green_Tracer_545x39_AK74M_M"),
+		"ACE_EntrenchingTool"
+	};
+	linkedItems[] += {"Binocular"};
+};
+
+class rat : r {
+	displayName = "Rifleman (AT)";
+	secondaryWeapon[] = {"CUP_launch_RPG26"};
+};
+
+class dm : r {
+	displayName = "Designated Marksman";
+	primaryWeapon[] = {"CUP_srifle_SVD"};
+	scope[] = {"cup_optic_pso_1_open"};
+	magazines[] = {
+		LIST_10("10Rnd_762x54_Mag"),
+		LIST_4("ACE_10Rnd_762x54_Tracer_mag"),
+		"CUP_HandGrenade_RGO",
+		"SmokeShell"
+	};
+};
+
+class mmgg : ar {
+	displayName = "MMG Gunner";
+	vest[] = {VEST_CLASS(CUP_Vest_RUS_6B45_Sh117_PKP)};
+	primaryWeapon[] = {
+		"CUP_lmg_Pecheneg_B50_vfg"
+	};
+	scope[] = {"cup_optic_pechenegscope"};
+	sidearmWeapon[] = {"hgun_Rook40_F"};
+	magazines[] = {
+		LIST_7("CUP_100Rnd_TE4_LRT4_762x54_PK_Tracer_Green_M"),
+		LIST_3("16Rnd_9x21_green_Mag"),
+		"CUP_HandGrenade_RGO",
+		"SmokeShell"
+	};
+};
+
+class mmgac : r {
+	displayName = "MMG Ammo Carrier";
+	backpack[] = {BACKPACK_CLASS(CUP_O_RUS_Patrol_bag)};
+	backpackItems[] = {
+		LIST_6("CUP_100Rnd_TE4_LRT4_762x54_PK_Tracer_Green_M")
+	};
+};
+
+class mmgtl : aar {
+	displayName = "MMG Team Leader";
+	backpackItems[] = {
+		LIST_6("CUP_100Rnd_TE4_LRT4_762x54_PK_Tracer_Green_M"),
+		"ACE_EntrenchingTool"
+	};
+	items[] += {"ACE_MapTools"};
+	linkedItems[] = {
+		"ItemMap",
+		"ItemCompass",
+		"ItemWatch",
+		"ACE_Yardage450",
+		"ItemRadio",
+		"ItemGPS"
+	};
+};
+
+class hmgg : car {
+	displayName = "HMG Gunner";
+	backPack[] = {BACKPACK_CLASS(CUP_O_RUS_Patrol_bag)};
+	secondaryWeapon[] = {"CUP_KORD_carry"};
+	backpackItems[] = {
+		LIST_5("ace_csw_50Rnd_127x108_mag")
+	};
+};
+
+class hmgac : r {
+	displayName = "HMG Ammo Carrier";
+	backPack[] = {BACKPACK_CLASS(CUP_O_RUS_Patrol_bag)};
+	secondaryWeapon[] = {"ace_csw_kordCarryTripodLow"};
+	backpackItems[] = {
+		LIST_4("ace_csw_50Rnd_127x108_mag")
+	};
+};
+
+class hmgtl : car {
+	displayName = "HMG Team Leader";
+	backPack[] = {BACKPACK_SHOVEL_CLASS(CUP_O_RUS_Patrol_bag)};
+	secondaryWeapon[] = {"ace_csw_kordCarryTripod"};
+	backpackItems[] = {
+		LIST_4("ace_csw_50Rnd_127x108_mag"),
+		"ACE_EntrenchingTool"
+	};
+	items[] += {"ACE_MapTools"};
+	linkedItems[] += {
+		"ACE_Vector"
+	};
+};
+
+class gmgg : car {
+	displayName = "GMG Gunner";
+	backPack[] = {BACKPACK_CLASS(CUP_O_RUS_Patrol_bag)};
+	secondaryWeapon[] = {"CUP_AGS30_carry"};
+	backpackItems[] = {
+		LIST_7("CUP_compats_29Rnd_30mm_AGS30_M")
+	};
+};
+
+class gmgac : r {
+	displayName = "GMG Ammo Carrier";
+	backPack[] = {BACKPACK_CLASS(CUP_O_RUS_Patrol_bag)};
+	secondaryWeapon[] = {"ace_csw_sag30CarryTripod"};
+	backpackItems[] = {
+		LIST_7("CUP_compats_29Rnd_30mm_AGS30_M")
+	};
+};
+
+class gmgtl : car {
+	displayName = "GMG Team Leader";
+	backPack[] = {BACKPACK_SHOVEL_CLASS(CUP_O_RUS_Patrol_bag)};
+	secondaryWeapon[] = {"ace_csw_sag30CarryTripod"};
+	backpackItems[] = {
+		LIST_7("CUP_compats_29Rnd_30mm_AGS30_M"),
+		"ACE_EntrenchingTool"
+	};
+	items[] += {"ACE_MapTools"};
+	linkedItems[] += {
+		"ACE_Vector"
+	};
+};
+
+class matg : car {
+	displayName = "MAT Gunner";
+	backpack[] = {"CUP_B_RPGPack_Khaki"};
+	secondaryWeapon[] = {"CUP_launch_RPG7V"};
+	secondaryAttachments[] = {"cup_optic_pgo7v3"};
+	magazines[] += {
+		"CUP_PG7VR_M",
+		"CUP_PG7VL_M"
+	};
+};
+
+class matac : r {
+	displayName = "MAT Ammo Carrier";
+	backpack[] = {"CUP_B_RPGPack_Khaki"};
+	backpackItems[] = {
+		"CUP_PG7VR_M",
+		"CUP_PG7VL_M"
+	};
+};
+
+class mattl : car {
+	displayName = "MAT Team Leader";
+	backpack[] = {"CUP_B_RPGPack_Khaki"};
+	items[] += {"ACE_MapTools"};
+	linkedItems[] += {
+		"ACE_Yardage450"
+	};
+	backpackItems[] = {
+		"CUP_PG7VL_M",
+		LIST_2("CUP_OG7_M")
+	};
+};
+
+class hatg : car {
+	displayName = "HAT Gunner";
+	backPack[] = {"CUP_B_Kornet_Gun_Bag"};
+};
+
+class hatac : r {
+	displayName = "HAT Ammo Carrier";
+	backPack[] = {"CUP_B_Kornet_Tripod_Bag"};
+};
+
+class hattl : car {
+	displayName = "HAT Team Leader";
+	backPack[] = {"CUP_B_Kornet_Tripod_Bag"};
+	items[] += {"ACE_MapTools"};
+	linkedItems[] += {"ACE_Vector"};
+};
+
+class mtrg : car {
+	displayName = "Mortar Gunner";
+	secondaryWeapon[] = {"CUP_2b14_carry"};
+	backPack[] = {BACKPACK_CLASS(CUP_O_RUS_Patrol_bag)};
+	backpackItems[] = {
+		LIST_3("ACE_1Rnd_82mm_Mo_HE"),
+		"ACE_1Rnd_82mm_Mo_Illum",
+		"ACE_1Rnd_82mm_Mo_Smoke"
+	};
+};
+
+class mtrac : r {
+	displayName = "Mortar Ammo Carrier";
+	backPack[] = {BACKPACK_CLASS(CUP_O_RUS_Patrol_bag)};
+	backpackItems[] = {
+		LIST_5("ACE_1Rnd_82mm_Mo_HE")
+	};
+};
+
+class mtrtl : car {
+	displayName = "Mortar Team Leader";
+	secondaryWeapon[] = {"ace_csw_carryMortarBaseplate"};
+	items[] = { MTR_GEAR };
+	backPack[] = {BACKPACK_CLASS(CUP_O_RUS_Patrol_bag)};
+	backpackItems[] = {
+		LIST_3("ACE_1Rnd_82mm_Mo_HE"),
+		"ACE_1Rnd_82mm_Mo_Illum",
+		"ACE_1Rnd_82mm_Mo_Smoke"
+	};
+	linkedItems[] += {"ACE_Vector"};
+};
+
+class samg : car {
+	displayName = "AA Missile Specialist";
+	secondaryWeapon[] = {"CUP_launch_Igla"};
+};
+
+class samag : car {
+	displayName = "AA Assistant Missile Specialist";
+	secondaryWeapon[] = {"CUP_launch_Igla"};
+	linkedItems[] += {"Binocular"};
+};
+
+class sn : r {
+	displayName = "Sniper";
+	uniform[] = {GHILLIE_CLASS};
+	vest[] = {"CUP_V_O_Ins_Carrier_Rig_Com"};
+	headgear[] = {"CUP_H_RUS_Bandana_GSSh_Headphones"};
+	primaryWeapon[] = {"CUP_srifle_ksvk"};
+	scope[] = {"cup_optic_pso_3_open"};
+	sidearmWeapon[] = {"hgun_Rook40_F"};
+	sidearmAttachments[] = {"muzzle_snds_l"};
+	magazines[] = {
+		LIST_6("CUP_5Rnd_127x108_KSVK_M"),
+		"SmokeShellGreen",
+		"SmokeShell",
+		LIST_3("16Rnd_9x21_green_Mag")
+	};
+};
+
+class sp : g {
+	displayName = "Spotter";
+	uniform[] = {GHILLIE_CLASS};
+	vest[] = {"CUP_V_O_Ins_Carrier_Rig_Com"};
+	headgear[] = {"CUP_H_RUS_Bandana_GSSh_Headphones"};
+	backpack[] = {BACKPACK_CLASS(CUP_O_RUS_Patrol_bag)};
+	silencer[] = {
+		#ifndef USE_AK12
+			"cup_muzzle_snds_kzrzp_ak545"
+		#else
+			"muzzle_snds_b"
+		#endif
+	};
+	items[] += {"ACE_MapTools"};
+	backpackItems[] = {
+		LIST_4("CUP_5Rnd_127x108_KSVK_M"),
+		"ACE_SpottingScope",
+		"ACRE_VHF30108SPIKE",
+		"Laserbatteries",
+		"ACE_ATragMX",
+		"ACE_Tripod"
+	};
+	linkedItems[] = {
+		"ItemMap",
+		"ItemCompass",
+		"ItemWatch",
+		"ItemRadio",
+		"CUP_SOFLAM",
+		"O_UavTerminal"
+	};
+};
+
+class vg : smg {
+	displayName = "Vehicle Gunner";
+	goggles[] = {"default"};
+	vest[] = {"CUP_V_RUS_6B45_1"};
+	headgear[] = {"H_Tank_black_F"};
+	magazines[] = {
+		LIST_3("CUP_20Rnd_9x39_SP5_VSS_M"),
+		"SmokeShellPurple"
+	};
+};
+
+class vc : vg {
+	displayName = "Vehicle Commander";
+	items[] += {"ACE_microDAGR"};
+	linkedItems[] += {
+		"Binocular"
+	};
+};
+
+class vd : vg {
+	displayName = "Vehicle Driver";
+	traits[] = {"engineer"};
+	backpack[] = {"CUP_B_SLA_Medicbag"};
+	backpackItems[] = {"ToolKit"};
+};
+
+class hc : smg {
+	displayName = "Helicopter Crew";
+	goggles[] = {"default"};
+	headgear[] = {
+		"CUP_H_RUS_ZSH_Shield_Down",
+		"CUP_H_RUS_ZSH_Shield_Up"
+	};
+	uniform[] = {"CUP_U_O_SLA_Overalls_Pilot"};
+	vest[] = {"CUP_V_RUS_6B45_1"};
+	backPack[] = {};
+	magazines[] = {
+		LIST_3("CUP_20Rnd_9x39_SP5_VSS_M"),
+		"SmokeShellPurple"
+	};
+	items[] += {"ACE_MapTools"};
+};
+
+class hp : hc {
+	displayName = "Helicopter Pilot";
+	backPack[] = {};
+	backpackItems[] = {};
+};
+
+class hcc : hc {
+	displayName = "Helicopter Crew Chief";
+	backpack[] = {"CUP_B_SLA_Medicbag"};
+	traits[] = {"engineer"};
+	backpackItems[] = {"ToolKit"};
+};
+
+class jp : baseMan {
+	displayName = "Jet pilot";
+	hmd[] = {};
+	goggles[] = {"default"};
+	headgear[] = {"CUP_H_RUS_ZSH_Shield_Down"};
+	uniform[] = {"CUP_U_B_USMC_PilotOverall"};
+	vest[] = {"CUP_V_RUS_6B45_1"};
+	backpack[] = {"ACE_NonSteerableParachute"};
+	sidearmWeapon[] = {"hgun_Rook40_F"};
+	magazines[] += {
+		"SmokeShellPurple",
+		LIST_3("16Rnd_9x21_green_Mag")
+	};
+	traits[] = {"engineer"};
+};
+
+class eng : car {
+	displayName = "Combat Engineer (Explosives)";
+	traits[] = {"engineer", "explosiveSpecialist"};
+	vest[] = {VEST_CLASS(CUP_Vest_RUS_6B45_Sh117)};
+	backpack[] = {BACKPACK_SHOVEL_CLASS(CUP_O_RUS_Patrol_bag)};
+	sidearmWeapon[] = {"ACE_VMH3"};
+	items[] += {"ACE_Clacker"};
+	backpackItems[] = {
+		"ToolKit",
+		LIST_3("DemoCharge_Remote_Mag"),
+		LIST_2("SLAMDirectionalMine_Wire_Mag"),
+		"SatchelCharge_Remote_Mag",
+		"ACE_DefusalKit",
+		"ACE_EntrenchingTool"
+	};
+};
+
+class engm : car {
+	displayName = "Combat Engineer (Mines)";
+	traits[] = {"engineer", "explosiveSpecialist"};
+	vest[] = {VEST_CLASS(CUP_Vest_RUS_6B45_Sh117)};
+	backpack[] = {BACKPACK_SHOVEL_CLASS(CUP_O_RUS_Patrol_bag)};
+	sidearmWeapon[] = {"ACE_VMM3"};
+	items[] += {
+		"ACE_DefusalKit",
+		"ACE_EntrenchingTool",
+		"ACE_Clacker"
+	};
+	backpackItems[] = {
+		"ToolKit",
+		LIST_4("APERSBoundingMine_Range_Mag"),
+		LIST_2("APERSTripMine_Wire_Mag"),
+		LIST_2("ACE_FlareTripMine_Mag"),
+		LIST_2("ClaymoreDirectionalMine_Remote_Mag")
+	};
+};
+
+class UAV : car {
+	displayName = "UAV Operator";
+	traits[] = {"UAVHacker"};
+	backpack[] = {"O_UAV_01_backpack_F"};
+	linkedItems[] += {"O_UavTerminal"};
+};
+
+#undef UNI_CAMO
+#ifdef VEST_CAMO
+	#undef VEST_CAMO
+#endif
+#undef VEST_CLASS
+#undef HELMET_CAMO
+#undef HELMET_CLASS
+#undef BACKPACK_CAMO
+#undef BACKPACK_CLASS
+#undef BACKPACK_SHOVEL_CLASS
+#ifdef IS_WINTER
+	#undef IS_WINTER
+#endif
+#undef BALACLAVAS
+#undef GHILLIE_CLASS
+#ifdef USE_AK12
+	#undef USE_AK12
+#endif
+#undef RIFLE
+#undef RIFLE_GL
+#undef CARBINE
+#undef RPK
+#undef SMG
+#undef ATTACHMENTS
diff --git a/addons/tmf_loadouts/loadouts/ru_mvd_2005.hpp b/addons/tmf_loadouts/loadouts/ru_mvd_2005.hpp
new file mode 100644
index 0000000..d67c945
--- /dev/null
+++ b/addons/tmf_loadouts/loadouts/ru_mvd_2005.hpp
@@ -0,0 +1,600 @@
+// If you want to base a loadout on an existing one, this repository contains them all:
+// https://github.com/ARCOMM/arc_misc/tree/master/addons/tmf_loadouts
+
+/*
+	Dependencies:
+	* CUP Units
+	* CUP Weapons
+	* Wearable Antennas
+*/
+
+class baseMan {// Weaponless baseclass
+	displayName = "Unarmed";
+	// All randomized.
+	uniform[] = {
+		#ifdef AUTUMN
+			"CUP_U_O_RUS_Gorka_Partizan_A",
+			"CUP_U_O_RUS_Gorka_Partizan_A_gloves2",
+			"CUP_U_O_RUS_Gorka_Partizan_A_gloves_kneepads"
+		#else
+			"CUP_U_O_RUS_Gorka_Partizan",
+			"CUP_U_O_RUS_Gorka_Partizan_gloves2",
+			"CUP_U_O_RUS_Gorka_Partizan_gloves_kneepads"
+		#endif
+	};
+	vest[] = {
+		"CUP_V_B_MTV_Pouches",
+		"CUP_V_B_MTV_LegPouch",
+		"CUP_V_B_MTV_Patrol"
+	};
+	backpack[] = {};
+	headgear[] = {"CUP_H_RUS_Beret_Spetsnaz"};
+	goggles[] = {"default"};
+	hmd[] = {};
+	// Leave empty to remove all. "Default" > leave original item.
+	faces[] = {"faceset:russian", "default"};
+	// Leave empty to not change faces.
+	insignias[] = {};
+	// Leave empty to not change insignias
+
+	// All randomized
+	primaryWeapon[] = {};
+	scope[] = {};
+	bipod[] = {};
+	attachment[] = {};
+	silencer[] = {};
+	// Leave empty to remove all. "Default" for primaryWeapon > leave original weapon.
+
+	// Only *Weapons[] arrays are randomized
+	secondaryWeapon[] = {};
+	secondaryAttachments[] = {};
+	sidearmWeapon[] = {};
+	sidearmAttachments[] = {};
+	// Leave empty to remove all. "Default" for secondaryWeapon or sidearmWeapon > leave original weapon.
+
+	// These are added to the uniform or vest
+	magazines[] = {};
+	items[] = {
+		MEDICAL_R,
+		"ACE_Flashlight_KSF1",
+		"ACE_CableTie"
+	};
+	// These are added directly into their respective slots
+	linkedItems[] = {
+		"ItemMap",
+		"ItemCompass",
+		"ItemRadio",
+		"ItemWatch"
+	};
+
+	// These are put into the backpack
+	backpackItems[] = {};
+
+	// Unit traits, see https://community.bistudio.com/wiki/setUnitTrait
+	traits[] = {};
+
+	// This is executed after unit init is complete. argument: _this = _unit.
+	code = "";
+};
+
+class r : baseMan {
+	displayName = "Rifleman";
+	goggles[] = {
+		"CUP_RUS_Balaclava_grn",
+		"CUP_RUS_Balaclava_blk"
+	};
+	headgear[] = {
+		#ifdef AUTUMN
+			"CUP_H_RUS_Altyn_khaki",
+			"CUP_H_RUS_Altyn_Goggles_khaki",
+			"CUP_H_RUS_Altyn_Shield_Down_khaki",
+			"CUP_H_RUS_Altyn_Shield_Up_khaki"
+		#else
+			"CUP_H_RUS_Altyn",
+			"CUP_H_RUS_Altyn_Goggles",
+			"CUP_H_RUS_Altyn_Shield_Down",
+			"CUP_H_RUS_Altyn_Shield_Up"
+		#endif
+	};
+	primaryWeapon[] = {"CUP_arifle_OTS14_GROZA_Grip"};
+	magazines[] = {
+		LIST_8("CUP_20Rnd_9x39_SP5_GROZA_M"),
+		LIST_2("CUP_HandGrenade_RGO"),
+		LIST_2("SmokeShell")
+	};
+};
+
+class g : r {
+	displayName = "Grenadier";
+	backpack[] = {"B_AssaultPack_cbr"};
+	primaryWeapon[] = {"CUP_arifle_OTS14_GROZA_GL"};
+	magazines[] += {
+		LIST_8("CUP_1Rnd_HE_GP25_M"),
+		LIST_4("CUP_1Rnd_SMOKE_GP25_M")
+	};
+};
+
+class car : r {
+	displayName = "Carabinier";
+	primaryWeapon[] = {"CUP_arifle_OTS14_GROZA"};
+};
+
+class cls : car {
+	displayName = "Combat Life Saver";
+	traits[] = {"medic"};
+	backpack[] = {"B_FieldPack_cbr"};
+	backpackItems[] = { MEDICAL_CLS };
+};
+
+class m : cls {
+	displayName = "Medic";
+	backpack[] = {"B_Carryall_cbr"};
+	backpackItems[] = { MEDICAL_M };
+};
+
+class smg : r {
+	displayName = "Submachinegunner";
+	primaryWeapon[] = {"CUP_smg_bizon"};
+	magazines[] = {
+		LIST_4("CUP_64Rnd_9x19_Bizon_M"),
+		LIST_2("CUP_HandGrenade_RGO"),
+		LIST_2("SmokeShell")
+	};
+};
+
+class ftl : g {
+	displayName = "Fireteam Leader";
+	vest[] = {"CUP_V_B_MTV_TL"};
+	items[] += {"ACE_MapTools"};
+	magazines[] += {
+		LIST_2("CUP_1Rnd_SmokeRed_GP25_M"),
+		LIST_2("CUP_IlumFlareRed_GP25_M")
+	};
+	linkedItems[] += {"Binocular","ItemGPS"};
+};
+
+class sl : ftl {
+	displayName = "Squad Leader";
+	vest[] = {
+		"CUP_V_B_MTV_noCB",
+		"CUP_V_B_MTV_PistolBlack"
+	};
+	sidearmWeapon[] = {"CUP_hgun_Makarov"};
+	magazines[] += {
+		LIST_3("CUP_8Rnd_9x18_Makarov_M")
+	};
+	items[] += {"ACE_DAGR"};
+	linkedItems[] = {
+		"ItemMap",
+		"ItemCompass",
+		"ItemRadio",
+		"ItemWatch",
+		"Binocular",
+		"ItemGPS"
+	};
+};
+
+class co : sl {
+	displayName = "Platoon Leader";
+	headgear[] = {"CUP_H_RUS_Beret_Spetsnaz"};
+};
+
+class fac : co {
+	displayName = "Forward Air Controller";
+	headgear[] = {"CUP_H_RUS_Bandana_HS"};
+	goggles[] = {"antenna_long_two_face"};
+	backpack[] = {"B_Kitbag_cbr"};
+	backpackItems[] = { FAC_GEAR };
+	linkedItems[] = {
+		"ItemMap",
+		"ItemCompass",
+		"ItemRadio",
+		"ItemWatch",
+		"CUP_SOFLAM",
+		"ItemGPS"
+	};
+};
+
+class ar : r {
+	displayName = "Automatic Rifleman";
+	primaryWeapon[] = {"CUP_arifle_RPK74M"};
+	magazines[] = {
+		LIST_8("CUP_45Rnd_TE4_LRT4_Green_Tracer_545x39_RPK74M_M"),
+		"CUP_HandGrenade_RGO",
+		"SmokeShell"
+	};
+};
+
+class aar : r {
+	displayName = "Assistant Automatic Rifleman";
+	backpack[] = {"B_FieldPack_cbr"};
+	backpackItems[] = {
+		LIST_8("CUP_45Rnd_TE4_LRT4_Green_Tracer_545x39_RPK74M_M"),
+		"ACE_EntrenchingTool"
+	};
+	linkedItems[] += {"Binocular"};
+};
+
+class rat : car {
+	displayName = "Rifleman (AT)";
+	secondaryWeapon[] = {"CUP_launch_RPG26"};
+};
+class lat : car {
+	displayName = "Rifleman (RShG-2)";
+	secondaryWeapon[] = {"CUP_launch_RShG2"};
+};
+
+class dm : r {
+	displayName = "Designated Marksman";
+	vest[] = {"CUP_V_B_MTV_Marksman"};
+	primaryWeapon[] = {"CUP_srifle_VSSVintorez_VFG"};
+	scope[] = {"cup_optic_pso_1"};
+	bipod[] = {"cup_bipod_harris_1a2_l_blk"};
+	magazines[] = {
+		LIST_11("CUP_10Rnd_9x39_SP5_VSS_M"),
+		LIST_2("CUP_HandGrenade_RGO"),
+		LIST_2("SmokeShell")
+	};
+};
+
+class mmgg : ar {
+	displayName = "MMG Gunner";
+	primaryWeapon[] = {"CUP_lmg_Pecheneg"};
+	backpack[] = {"B_Kitbag_cbr"};
+	scope[] = {"cup_optic_pechenegscope"};
+	magazines[] = {
+		LIST_4("CUP_100Rnd_TE4_LRT4_762x54_PK_Tracer_Green_M"),
+		"CUP_HandGrenade_RGO",
+		"SmokeShell"
+	};
+};
+
+class mmgac : r {
+	displayName = "MMG Ammo Carrier";
+	backpack[] = {"B_Carryall_cbr"};
+	backpackItems[] = {
+		LIST_6("CUP_100Rnd_TE4_LRT4_762x54_PK_Tracer_Green_M")
+	};
+};
+
+class mmgtl : aar {
+	displayName = "MMG Team Leader";
+	items[] += {"ACE_MapTools"};
+	linkedItems[] = {
+		"ItemMap",
+		"ItemCompass",
+		"ItemRadio",
+		"ItemWatch",
+		"Binocular",
+		"ItemGPS"
+	};
+	backpackItems[] = {
+		LIST_4("CUP_100Rnd_TE4_LRT4_762x54_PK_Tracer_Green_M"),
+		"ACE_EntrenchingTool"
+	};
+};
+
+class hmgg : car {
+	displayName = "GMG Gunner";
+	secondaryWeapon[] = {"CUP_AGS30_carry"};
+	backPack[] = {"B_Carryall_CBR"};
+	backpackItems[] = {
+		LIST_7("CUP_compats_29Rnd_30mm_AGS30_M")
+	};
+};
+
+class hmgac : r {
+	displayName = "HMG Ammo Carrier";
+	backPack[] = {"B_Carryall_CBR"};
+	backpackItems[] = {
+		LIST_7("CUP_compats_29Rnd_30mm_AGS30_M")
+	};
+};
+
+class hmgtl : car {
+	displayName = "HMG Team Leader";
+	secondaryWeapon[] = {"ace_csw_sag30CarryTripod"};
+	backPack[] = {"B_Carryall_CBR"};
+	backpackItems[] = {
+		LIST_7("CUP_compats_29Rnd_30mm_AGS30_M"),
+		"ACE_EntrenchingTool"
+	};
+	items[] += {"ACE_MapTools"};
+	linkedItems[] = {
+		"ItemMap",
+		"ItemCompass",
+		"ItemRadio",
+		"ItemWatch",
+		"ACE_Vector",
+		"ItemGPS"
+	};
+};
+
+class matg : car {
+	displayName = "MAT Gunner";
+	backpack[] = {"B_Kitbag_cbr"};
+	secondaryWeapon[] = {"launch_RPG32_green_F"};
+	magazines[] += {
+		LIST_3("RPG32_F"),
+		LIST_2("RPG32_HE_F")
+	};
+};
+
+class matac : r {
+	displayName = "MAT Ammo Carrier";
+	backpack[] = {"B_Kitbag_cbr"};
+	backpackItems[] = {
+		LIST_3("RPG32_F"),
+		LIST_2("RPG32_HE_F")
+	};
+};
+
+class mattl : car {
+	displayName = "MAT Team Leader";
+	backpack[] = {"B_FieldPack_khk"};
+	items[] += {"ACE_MapTools"};
+	linkedItems[] = {
+		"ItemMap",
+		"ItemCompass",
+		"ItemRadio",
+		"ItemWatch",
+		"Binocular",
+		"ItemGPS"
+	};
+	backpackItems[] = {
+		LIST_2("RPG32_F"),
+		"RPG32_HE_F"
+	};
+};
+
+class hatg : car {
+	displayName = "HAT Gunner";
+	backPack[] = {"CUP_B_Kornet_Gun_Bag"};
+};
+
+class hatac : r {
+	displayName = "HAT Ammo Carrier";
+	backPack[] = {"CUP_B_Kornet_Tripod_Bag"};
+};
+
+class hattl : car {
+	displayName = "HAT Team Leader";
+	backPack[] = {"CUP_B_Kornet_Tripod_Bag"};
+	items[] += {"ACE_MapTools"};
+	linkedItems[] = {
+		"ItemMap",
+		"ItemCompass",
+		"ItemRadio",
+		"ItemWatch",
+		"ACE_Vector",
+		"ItemGPS"
+	};
+};
+
+class mtrg : car {
+	displayName = "Mortar Gunner";
+	secondaryWeapon[] = {"CUP_2b14_carry"};
+	backPack[] = {"B_Carryall_cbr"};
+	backpackItems[] = {
+		LIST_4("ACE_1Rnd_82mm_Mo_HE"),
+		"ACE_1Rnd_82mm_Mo_Illum",
+		"ACE_1Rnd_82mm_Mo_Smoke"
+	};
+};
+
+class mtrac : r {
+	displayName = "Mortar Ammo Carrier";
+	backPack[] = {"B_Carryall_cbr"};
+	backpackItems[] = {
+		LIST_4("ACE_1Rnd_82mm_Mo_HE"),
+		"ACE_1Rnd_82mm_Mo_Illum",
+		"ACE_1Rnd_82mm_Mo_Smoke"
+	};
+};
+
+class mtrtl : car {
+	displayName = "Mortar Team Leader";
+	secondaryWeapon[] = {"ace_csw_carryMortarBaseplate"};
+	items[] = { MTR_GEAR };
+	backPack[] = {"B_Carryall_mcamo"};
+	backpackItems[] = {
+		LIST_4("ACE_1Rnd_82mm_Mo_HE"),
+		"ACE_1Rnd_82mm_Mo_Illum",
+		"ACE_1Rnd_82mm_Mo_Smoke"
+	};
+
+	linkedItems[] = {
+		"ItemMap",
+		"ItemCompass",
+		"ItemRadio",
+		"ItemWatch",
+		"ACE_Vector",
+		"ItemGPS"
+	};
+};
+
+class samg : car {
+	displayName = "AA Missile Specialist";
+	secondaryWeapon[] = {"CUP_launch_Igla"};
+};
+
+class samag : car {
+	displayName = "AA Assistant Missile Specialist";
+	secondaryWeapon[] = {"CUP_launch_Igla"};
+	linkedItems[] = {
+		"ItemMap",
+		"ItemCompass",
+		"ItemRadio",
+		"ItemWatch",
+		"Binocular",
+		"ItemGPS"
+	};
+};
+
+class sn : r {
+	displayName = "Sniper";
+	uniform[] = {"CUP_U_O_RUS_Ghillie"};
+	vest[] = {"CUP_V_O_Ins_Carrier_Rig_Com"};
+	backpack[] = {"CUP_B_SLA_Medicbag"};
+	headgear[] = {};
+	goggles[] = {"default"};
+	primaryWeapon[] = {"CUP_srifle_ksvk"};
+	scope[] = {"cup_optic_pso_3"};
+	sidearmWeapon[] = {"CUP_hgun_PB6P9"};
+	sidearmAttachments[] = {"cup_muzzle_pb6p9"};
+	magazines[] = {
+		LIST_7("CUP_5Rnd_127x108_KSVK_M"),
+		LIST_2("CUP_HandGrenade_RGO"),
+		LIST_4("CUP_8Rnd_9x18_MakarovSD_M")
+	};
+};
+
+class sp : g {
+	displayName = "Spotter";
+	uniform[] = {"CUP_U_O_RUS_Ghillie"};
+	vest[] = {"CUP_V_O_Ins_Carrier_Rig_Com"};
+	backpack[] = {"CUP_B_SLA_Medicbag"};
+	headgear[] = {};
+	goggles[] = {"default"};
+	scope[] = {"cup_optic_grozascope"};
+	items[] += {
+		"ACE_MapTools",
+		"ACE_RangeCard",
+		"ACE_Kestrel4500",
+		"ACE_ATragMX",
+		"LaserBatteries"
+	};
+	linkedItems[] = {
+		"ItemMap",
+		"ItemCompass",
+		"ItemRadio",
+		"ItemWatch",
+		"CUP_SOFLAM",
+		"ItemGPS"
+	};
+};
+
+class vg : smg {
+	displayName = "Vehicle Gunner";
+	uniform[] = {
+		"CUP_U_O_RUS_Gorka_Green",
+		"CUP_U_O_RUS_Gorka_Green_gloves2",
+		"CUP_U_O_RUS_Gorka_Green_gloves_kneepads"
+	};
+	vest[] = {"CUP_V_B_MTV"};
+	backpack[] = {};
+	headgear[] = {"CUP_H_TK_TankerHelmet"};
+	magazines[] = {
+		LIST_3("CUP_64Rnd_9x19_Bizon_M"),
+		"SmokeShellPurple"
+	};
+};
+
+class vc : vg {
+	displayName = "Vehicle Commander";
+	goggles[] = {"default"};
+	linkedItems[] += {"Binocular","ItemGPS"};
+};
+
+class vd : vg {
+	displayName = "Vehicle Driver";
+	traits[] = {"engineer"};
+	backpack[] = {"B_AssaultPack_cbr"};
+	linkedItems[] += {"ItemGPS"};
+	backpackItems[] = {"ToolKit"};
+};
+
+class hc : smg {
+	displayName = "Helicopter Crew";
+	goggles[] = {"default"};
+	uniform[] = {"CUP_U_O_SLA_Overalls_Pilot"};
+	vest[] = {"V_Rangemaster_belt"};
+	backpack[] = {};
+	headgear[] = {
+		"CUP_H_RUS_ZSH_Shield_Up",
+		"CUP_H_RUS_ZSH_Shield_Down"
+	};
+	items[] += {"ACE_MapTools"};
+	magazines[] = {
+		LIST_2("CUP_64Rnd_9x19_Bizon_M"),
+		"SmokeShellPurple"
+	};
+};
+
+class hp : hc {
+	displayName = "Helicopter Pilot";
+	linkedItems[] += {"ItemGPS"};
+};
+
+class hcc : hc {
+	displayName = "Helicopter Crew Chief";
+	traits[] = {"engineer"};
+	backpack[] = {"B_AssaultPack_cbr"};
+	linkedItems[] += {"ItemGPS"};
+	backpackItems[] = {"ToolKit"};
+};
+
+class jp : baseMan {
+	displayName = "Jet pilot";
+	traits[] = {"engineer"};
+	uniform[] = {"CUP_U_O_SLA_Overalls_Pilot"};
+	vest[] = {"CUP_V_CDF_CrewBelt"};
+	backpack[] = {};
+	headgear[] = {"CUP_H_RUS_ZSH_Shield_Down"};
+	goggles[] = {"default"};
+	linkedItems[] += {"ItemGPS"};
+	sidearmWeapon[] = {"CUP_hgun_Makarov"};
+	magazines[] = {
+		LIST_3("CUP_8Rnd_9x18_Makarov_M"),
+		"SmokeShellPurple"
+	};
+};
+
+class eng : car {
+	displayName = "Combat Engineer (Explosives)";
+	traits[] = {"engineer", "explosiveSpecialist"};
+	backpack[] = {"B_Kitbag_cbr"};
+	vest[] = {"CUP_V_B_MTV_Mine"};
+	sidearmWeapon[] = {"ACE_VMM3"};
+	items[] += {
+		"ACE_wirecutter",
+		"ACE_Clacker",
+		"ACE_DefusalKit",
+		"ACE_EntrenchingTool"
+	};
+	backpackItems[] = {
+		"ToolKit",
+		LIST_2("DemoCharge_Remote_Mag"),
+		LIST_2("ClaymoreDirectionalMine_Remote_Mag"),
+		"SatchelCharge_Remote_Mag"
+	};
+};
+
+class engm : car {
+	displayName = "Combat Engineer (Mines)";
+	traits[] = {"engineer", "explosiveSpecialist"};
+	backpack[] = {"B_Kitbag_cbr"};
+	vest[] = {"CUP_V_B_MTV_Mine"};
+	sidearmWeapon[] = {"ACE_VMM3"};
+	items[] += {
+		"ACE_wirecutter",
+		"ACE_DefusalKit",
+		"ACE_EntrenchingTool"
+	};
+	backpackItems[] = {
+		"ToolKit",
+		LIST_8("APERSMine_Range_Mag"),
+		"ATMine_Range_Mag"
+	};
+};
+
+class UAV : car {
+	displayName = "UAV Operator";
+	traits[] = {"UAVHacker"};
+	backpack[] = {"O_UAV_01_backpack_F"};
+	linkedItems[] += {"O_UavTerminal"};
+};
+
+#ifdef AUTUMN
+	#undef AUTUMN
+#endif
diff --git a/addons/tmf_loadouts/loadouts/tk_army.hpp b/addons/tmf_loadouts/loadouts/tk_army.hpp
new file mode 100644
index 0000000..e832342
--- /dev/null
+++ b/addons/tmf_loadouts/loadouts/tk_army.hpp
@@ -0,0 +1,532 @@
+// If you want to base a loadout on an existing one, this repository contains them all:
+// https://github.com/ARCOMM/arc_misc/tree/master/addons/tmf_loadouts
+
+/*
+	Dependencies:
+	* CUP Weapons
+	* CUP Units
+	* Wearable Antennas
+*/
+
+class baseMan {// Weaponless baseclass
+	displayName = "Unarmed";
+	// All randomized.
+	uniform[] = {"CUP_U_O_TK_Green","CUP_U_O_TK_MixedCamo"};
+	vest[] = {"CUP_V_O_TK_Vest_1"};
+	backpack[] = {};
+	headgear[] = {};
+	goggles[] = {
+		LIST_5("None"),
+		"default",
+		"CUP_TK_NeckScarf",
+		"CUP_G_TK_RoundGlasses",
+		"CUP_G_TK_RoundGlasses_blk",
+		"CUP_G_TK_RoundGlasses_gold"
+	};
+	hmd[] = {};
+	// Leave empty to remove all. "Default" > leave original item.
+	faces[] = {"faceset:persian"};
+	// Leave empty to not change faces.
+	insignias[] = {};
+	// Leave empty to not change insignias
+
+	// All randomized
+	primaryWeapon[] = {};
+	scope[] = {};
+	bipod[] = {};
+	attachment[] = {};
+	silencer[] = {};
+	// Leave empty to remove all. "Default" for primaryWeapon > leave original weapon.
+
+	// Only *Weapons[] arrays are randomized
+	secondaryWeapon[] = {};
+	secondaryAttachments[] = {};
+	sidearmWeapon[] = {};
+	sidearmAttachments[] = {};
+	// Leave empty to remove all. "Default" for secondaryWeapon or sidearmWeapon > leave original weapon.
+
+	// These are added to the uniform or vest
+	magazines[] = {};
+	items[] = {
+		MEDICAL_R,
+		"ACE_Flashlight_KSF1",
+		"ACE_HandFlare_Red"
+	};
+	// These are added directly into their respective slots
+	linkedItems[] = {
+		"ItemMap",
+		"ItemCompass",
+		"ItemWatch"
+	};
+
+	// These are put into the backpack
+	backpackItems[] = {};
+
+	// Unit traits, see https://community.bistudio.com/wiki/setUnitTrait
+	traits[] = {};
+
+	// This is executed after unit init is complete. argument: _this = _unit.
+	code = "";
+};
+
+class r : baseMan {
+	displayName = "Rifleman";
+	headgear[] = {
+		"CUP_H_TK_Helmet",
+		"CUP_H_SLA_Helmet_OD_worn",
+		"CUP_H_SLA_Helmet_DES_worn",
+		"CUP_H_SLA_Helmet_URB_worn"
+	};
+	primaryWeapon[] = {"CUP_arifle_FNFAL"};
+	magazines[] = {
+		LIST_7("CUP_20Rnd_762x51_FNFAL_M"),
+		LIST_2("CUP_20Rnd_TE1_Green_Tracer_762x51_FNFAL_M"),
+		LIST_2("CUP_HandGrenade_RGD5"),
+		LIST_2("SmokeShell")
+	};
+};
+
+
+class car : r {
+	displayName = "Carabinier";
+	primaryWeapon[] = {
+		"CUP_arifle_AK74",
+		"CUP_arifle_AKS74"
+	};
+	magazines[] = {
+		LIST_7("CUP_30Rnd_545x39_AK_M"),
+		LIST_2("CUP_30Rnd_TE1_Green_Tracer_545x39_AK_M"),
+		"CUP_HandGrenade_RGD5",
+		"SmokeShell"
+	};
+};
+
+class g : car {
+	displayName = "Grenadier";
+	primaryWeapon[] = {
+		"CUP_arifle_AK74_GL",
+		"CUP_arifle_AKS74_GL"
+	};
+	magazines[] += {
+		LIST_8("CUP_1Rnd_HE_GP25_M"),
+		LIST_4("CUP_1Rnd_SMOKE_GP25_M")
+	};
+};
+
+class cls : car {
+	displayName = "Combat Life Saver";
+	traits[] = {"medic"};
+	backpack[] = {"CUP_B_TK_Medic_Desert"};
+	backpackItems[] = { MEDICAL_CLS };
+};
+
+class m : cls {
+	displayName = "Medic";
+	vest[] = {"CUP_V_O_TK_Vest_2"};
+	backpack[] = {"CUP_B_AlicePack_Bedroll"};
+	backpackItems[] = { MEDICAL_M };
+};
+
+class smg : car {
+	displayName = "Submachinegunner";
+	primaryWeapon[] = {"CUP_arifle_AKS74U"};
+};
+
+class ftl : g {
+	displayName = "Fireteam Leader";
+	items[] += {"ACE_MapTools"};
+	magazines[] += {
+		LIST_2("CUP_1Rnd_SmokeGreen_GP25_M"),
+		LIST_2("CUP_IlumFlareRed_GP25_M")
+	};
+	linkedItems[] += {"Binocular","ItemRadio"};
+};
+
+class sl : r {
+	displayName = "Squad Leader";
+	items[] += {"ACE_MapTools"};
+	sidearmWeapon[] = {"CUP_hgun_Makarov"};
+	magazines[] += {
+		LIST_3("CUP_8Rnd_9x18_Makarov_M")
+	};
+	linkedItems[] += {"Binocular","ItemRadio"};
+};
+
+class co : sl {
+	displayName = "Platoon Leader";
+	goggles[] = {"G_Aviator"};
+	headgear[] = {"CUP_H_TK_Beret"};
+};
+
+class fac : ftl {
+	primaryWeapon[] = {
+		"CUP_arifle_M16A2_GL"
+	};
+	magazines[] = {
+		LIST_7("CUP_30Rnd_556x45_Stanag"),
+		LIST_2("CUP_30Rnd_556x45_Stanag_Tracer_Green"),
+		"CUP_HandGrenade_RGD5",
+		"SmokeShell"
+	};
+	displayName = "Forward Air Controller";
+	hmd[] = {"antenna_long_two_nvg"};
+	backpack[] = {"CUP_B_AlicePack_Khaki"};
+	backpackItems[] = {
+		FAC_GEAR,
+		LIST_4("CUP_1Rnd_SmokeGreen_M203"),
+		LIST_4("CUP_1Rnd_SmokeRed_M203"),
+		LIST_4("CUP_1Rnd_SmokeYellow_M203"),
+		"ACE_DAGR"
+	};
+	linkedItems[] = {
+		"ItemMap",
+		"ItemCompass",
+		"ItemRadio",
+		"ItemWatch",
+		"CUP_SOFLAM"
+	};
+};
+
+class ar : r {
+	displayName = "Automatic Rifleman";
+	primaryWeapon[] = {"CUP_arifle_RPK74_45"};
+	magazines[] = {
+		LIST_8("CUP_45Rnd_TE4_LRT4_Green_Tracer_545x39_RPK_M"),
+		"CUP_HandGrenade_RGD5",
+		"SmokeShell"
+	};
+};
+
+class aar : r {
+	displayName = "Assistant Automatic Rifleman";
+	backpack[] = {"CUP_B_AlicePack_Khaki"};
+	backpackItems[] = {
+		LIST_8("CUP_45Rnd_TE4_LRT4_Green_Tracer_545x39_RPK_M"),
+		"ACE_EntrenchingTool"
+	};
+	linkedItems[] += {"Binocular"};
+};
+
+class rat : r {
+	displayName = "Rifleman (AT)";
+	secondaryWeapon[] = {"CUP_launch_RPG26","CUP_launch_RPG18"};
+};
+
+class lat : r {
+	displayName = "Rifleman (RShG-2)";
+	secondaryWeapon[] = {"CUP_launch_RShG2"};
+};
+
+class dm : r {
+	displayName = "Designated Marksman";
+	headgear[] = {"H_Booniehat_oli"};
+	primaryWeapon[] = {"CUP_srifle_SVD"};
+	scope[] = {"cup_optic_pso_1_open"};
+	magazines[] = {
+		LIST_11("CUP_10Rnd_762x54_SVD_M"),
+		LIST_2("CUP_HandGrenade_RGD5"),
+		LIST_2("SmokeShell")
+	};
+};
+
+class mmgg : ar {
+	displayName = "MMG Gunner";
+	backpack[] = {"CUP_B_AlicePack_Khaki"};
+	primaryWeapon[] = {"CUP_lmg_PKMN"};
+	scope[] = {"cup_optic_pso_1"};
+	magazines[] = {
+		LIST_6("CUP_100Rnd_TE4_LRT4_762x54_PK_Tracer_Green_M"),
+		"CUP_HandGrenade_RGD5",
+		"SmokeShell"
+	};
+};
+
+class mmgac : r {
+	displayName = "MMG Ammo Carrier";
+	backpack[] = {"CUP_B_AlicePack_Khaki"};
+	backpackItems[] = {
+		LIST_6("CUP_100Rnd_TE4_LRT4_762x54_PK_Tracer_Green_M")
+	};
+};
+
+class mmgtl : aar {
+	displayName = "MMG Team Leader";
+	hmd[] = {"antenna_long_one_nvg"};
+	items[] += {"ACE_MapTools"};
+	linkedItems[] += {"ItemRadio"};
+	backpackItems[] = {
+		LIST_6("CUP_100Rnd_TE4_LRT4_762x54_PK_Tracer_Green_M"),
+		"ACE_EntrenchingTool"
+	};
+};
+
+class hmgg : car {
+	displayName = "HMG Gunner";
+	backpack[] = {"CUP_B_AlicePack_Khaki"};
+	secondaryWeapon[] = {"CUP_DSHKM_carry"};
+	backpackItems[] = {LIST_5("ace_csw_50Rnd_127x108_mag")};
+};
+
+class hmgac : r {
+	displayName = "HMG Ammo Carrier";
+	backpack[] = {"CUP_B_AlicePack_Khaki"};
+	secondaryWeapon[] = {"ace_csw_kordCarryTripod"};
+	backpackItems[] = {LIST_5("ace_csw_50Rnd_127x108_mag")};
+};
+
+class hmgtl : mmgtl {
+	displayName = "HMG Team Leader";
+	secondaryWeapon[] = {"ace_csw_kordCarryTripodLow"};
+	backpack[] = {"CUP_B_AlicePack_Khaki"};
+	backpackItems[] = {
+		LIST_5("ace_csw_50Rnd_127x108_mag"),
+		"ACE_EntrenchingTool"
+	};
+};
+
+class matg : car {
+	displayName = "MAT Gunner";
+	backpack[] = {"CUP_B_RPGPack_Khaki"};
+	secondaryWeapon[] = {"CUP_launch_RPG7V"};
+	secondaryAttachments[] = {"cup_optic_pgo7v2"};
+	magazines[] += {
+		LIST_2("CUP_PG7VL_M")
+	};
+};
+
+class matac : r {
+	displayName = "MAT Ammo Carrier";
+	backpack[] = {"CUP_B_RPGPack_Khaki"};
+	backpackItems[] = {
+		LIST_2("CUP_PG7VL_M")
+	};
+};
+
+class mattl : car {
+	displayName = "MAT Team Leader";
+	backpack[] = {"CUP_B_RPGPack_Khaki"};
+	items[] += {"ACE_MapTools"};
+	linkedItems[] += {
+		"ItemRadio",
+		"Binocular"
+	};
+	backpackItems[] = {
+		LIST_2("CUP_PG7VL_M")
+	};
+};
+
+class hatg : car {
+	displayName = "HAT Gunner";
+	secondaryWeapon[] = {"ace_dragon_super"};
+	linkedItems[] = {"ace_dragon_sight"};
+};
+
+class hatac : r {
+	displayName = "HAT Ammo Carrier";
+	secondaryWeapon[] = {"ace_dragon_super"};
+};
+
+class hattl : car {
+	displayName = "HAT Team Leader";
+	secondaryWeapon[] = {"ace_dragon_super"};
+	items[] += {"ACE_MapTools"};
+	linkedItems[] = {
+		"ItemRadio",
+		"Binocular"
+	};
+};
+
+class mtrg : car {
+	displayName = "Mortar Gunner";
+	secondaryWeapon[] = {"CUP_2b14_carry"};
+	backPack[] = {"B_Carryall_oli", "B_Carryall_khk", "B_Carryall_cbr"};
+	backpackItems[] = {
+		LIST_4("ACE_1Rnd_82mm_Mo_HE"),
+		"ACE_1Rnd_82mm_Mo_Illum",
+		"ACE_1Rnd_82mm_Mo_Smoke"
+	};
+};
+
+class mtrac : r {
+	displayName = "Mortar Ammo Carrier";
+	backPack[] = {"B_Carryall_oli", "B_Carryall_khk", "B_Carryall_cbr"};
+	backpackItems[] = {
+		LIST_4("ACE_1Rnd_82mm_Mo_HE"),
+		"ACE_1Rnd_82mm_Mo_Illum",
+		"ACE_1Rnd_82mm_Mo_Smoke"
+	};
+};
+
+class mtrtl : car {
+	displayName = "Mortar Team Leader";
+	secondaryWeapon[] = {"ace_csw_carryMortarBaseplate"};
+	items[] = { MTR_GEAR };
+	backPack[] = {"B_Carryall_oli", "B_Carryall_khk", "B_Carryall_cbr"};
+	backpackItems[] = {
+		LIST_4("ACE_1Rnd_82mm_Mo_HE"),
+		"ACE_1Rnd_82mm_Mo_Illum",
+		"ACE_1Rnd_82mm_Mo_Smoke",
+		"ACE_DAGR"
+	};
+
+	linkedItems[] += {
+		"ItemRadio",
+		"ACE_Vector"
+	};
+};
+
+class samg : car {
+	displayName = "AA Missile Specialist";
+	secondaryWeapon[] = {"CUP_launch_Igla"};
+};
+
+class samag : car {
+	displayName = "AA Assistant Missile Specialist";
+	secondaryWeapon[] = {"CUP_launch_Igla"};
+	linkedItems[] = {
+		"ItemRadio",
+		"Binocular"
+	};
+};
+
+class sn : r {
+	displayName = "Sniper";
+	uniform[] = {"U_B_FullGhillie_sard"};
+	headgear[] = {};
+	goggles[] = {"default"};
+	primaryWeapon[] = {"CUP_srifle_ksvk"};
+	scope[] = {"cup_optic_pso_3"};
+	sidearmWeapon[] = {"CUP_hgun_PB6P9"};
+	sidearmAttachments[] = {"cup_muzzle_pb6p9"};
+	magazines[] = {
+		LIST_7("CUP_5Rnd_127x108_KSVK_M"),
+		LIST_2("CUP_HandGrenade_RGD5"),
+		LIST_4("CUP_8Rnd_9x18_MakarovSD_M")
+	};
+};
+
+class sp : g {
+	displayName = "Spotter";
+	uniform[] = {"U_B_FullGhillie_sard"};
+	headgear[] = {};
+	scope[] = {"cup_optic_kobra"};
+	silencer[] = {"cup_muzzle_pbs4"};
+	items[] += {
+		"ACE_MapTools",
+		"ACE_RangeCard",
+		"ACE_Kestrel4500",
+		"ACE_ATragMX",
+		"Laserbatteries"
+	};
+	linkedItems[] += {
+		"ItemRadio",
+		"CUP_SOFLAM"
+	};
+};
+
+class vg : smg {
+	displayName = "Vehicle Gunner";
+	vest[] = {"CUP_V_O_TK_CrewBelt"};
+	backpack[] = {};
+	headgear[] = {"CUP_H_TK_TankerHelmet"};
+	magazines[] = {
+		LIST_3("CUP_20Rnd_545x39_AKSU_M"),
+		"SmokeShellPurple"
+	};
+};
+
+class vc : vg {
+	displayName = "Vehicle Commander";
+	linkedItems[] += {"Binocular","ItemRadio"};
+};
+
+class vd : vg {
+	displayName = "Vehicle Driver";
+	traits[] = {"engineer"};
+	backpack[] = {"CUP_B_SLA_Medicbag"};
+	linkedItems[] += {"ItemGPS"};
+	backpackItems[] = {"ToolKit"};
+};
+
+class hc : vg {
+	displayName = "Helicopter Crew";
+	headgear[] = {"CUP_H_SPH4_khaki", "CUP_H_SPH4_khaki_visor"};
+	vest[] = {"V_BandollierB_oli"};
+	items[] += {"ACE_MapTools"};
+};
+
+class hp : hc {
+	displayName = "Helicopter Pilot";
+	linkedItems[] += {"ItemGPS"};
+};
+
+class hcc : hc {
+	displayName = "Helicopter Crew Chief";
+	traits[] = {"engineer"};
+	backpack[] = {"CUP_B_SLA_Medicbag"};
+	linkedItems[] += {"ItemGPS"};
+	backpackItems[] = {"ToolKit"};
+};
+
+class jp : smg {
+	displayName = "Jet pilot";
+	traits[] = {"engineer"};
+	uniform[] = {"CUP_U_B_USArmy_PilotOverall"};
+	vest[] = {"V_TacVest_oli"};
+	backpack[] = {};
+	headgear[] = {
+		"CUP_H_RUS_ZSH_Shield_Down",
+		"CUP_H_RUS_ZSH_Shield_Up"
+	};
+	goggles[] = {"default"};
+	linkedItems[] += {"ItemRadio"};
+	items[] += {"ACE_DAGR"};
+	magazines[] = {
+		LIST_3("CUP_20Rnd_545x39_AKSU_M"),
+		"SmokeShellPurple"
+	};
+};
+
+class eng : car {
+	displayName = "Combat Engineer (Explosives)";
+	traits[] = {"engineer", "explosiveSpecialist"};
+	backpack[] = {"B_Kitbag_rgr"};
+	sidearmWeapon[] = {"ACE_VMM3"};
+	items[] += {
+		"ACE_wirecutter",
+		"ACE_Clacker",
+		"ACE_DefusalKit",
+		"ACE_EntrenchingTool"
+	};
+	backpackItems[] = {
+		"ToolKit",
+		LIST_2("DemoCharge_Remote_Mag"),
+		LIST_2("ClaymoreDirectionalMine_Remote_Mag"),
+		"SatchelCharge_Remote_Mag"
+	};
+};
+
+class engm : car {
+	displayName = "Combat Engineer (Mines)";
+	traits[] = {"engineer", "explosiveSpecialist"};
+	backpack[] = {"B_Kitbag_rgr"};
+	sidearmWeapon[] = {"ACE_VMM3"};
+	items[] += {
+		"ACE_wirecutter",
+		"ACE_DefusalKit",
+		"ACE_EntrenchingTool"
+	};
+	backpackItems[] = {
+		"ToolKit",
+		LIST_8("APERSMine_Range_Mag"),
+		"ATMine_Range_Mag"
+	};
+};
+
+class UAV : car {
+	displayName = "UAV Operator";
+	traits[] = {"UAVHacker"};
+	backpack[] = {"O_UAV_01_backpack_F"};
+	linkedItems[] += {"B_UavTerminal", "ItemRadio"};
+	items[] += {LIST_2("ACE_UAVBattery")};
+};
diff --git a/addons/tmf_loadouts/loadouts/tk_locals.hpp b/addons/tmf_loadouts/loadouts/tk_locals.hpp
index 40829d0..4ba9b60 100644
--- a/addons/tmf_loadouts/loadouts/tk_locals.hpp
+++ b/addons/tmf_loadouts/loadouts/tk_locals.hpp
@@ -125,6 +125,7 @@ class baseMan {// Weaponless baseclass
 
 class r : baseMan {
 	displayName = "Rifleman";
+	backpack[] = {"CUP_B_AlicePack_Khaki", "CUP_B_AlicePack_Bedroll"};
 	headgear[] += {
 		LIST_4("CUP_H_SLA_Helmet_OD_worn"),
 		LIST_4("CUP_H_SLA_Helmet_DES_worn")
@@ -136,7 +137,7 @@ class r : baseMan {
 		"CUP_arifle_AKS"
 	};
 	magazines[] = {
-		LIST_3("CUP_30Rnd_762x39_AK47_M"),
+		LIST_6("CUP_30Rnd_762x39_AK47_M"),
 		"CUP_HandGrenade_RGD5",
 		"SmokeShell"
 	};
@@ -145,9 +146,9 @@ class r : baseMan {
 class g : r {
 	displayName = "Grenadier";
 	primaryWeapon[] = {"CUP_glaunch_M79"};
-	sidearmWeapon[] = {"CUP_hgun_TaurusTracker455"};
+	sidearmWeapon[] = {"CUP_hgun_TT"};
 	magazines[] = {
-		LIST_4("CUP_6Rnd_45ACP_M"),
+		LIST_4("CUP_8Rnd_762x25_TT"),
 		LIST_8("CUP_1Rnd_HEDP_M203"),
 		LIST_4("CUP_1Rnd_Smoke_M203"),
 		LIST_4("ACE_40mm_Flare_white")
@@ -156,9 +157,9 @@ class g : r {
 
 class car : r {
 	displayName = "Carabinier";
-	primaryWeapon[] = {"CUP_srifle_LeeEnfield"};
+	primaryWeapon[] = {"CUP_SKS"};
 	magazines[] = {
-		LIST_8("CUP_10x_303_M"),
+		LIST_8("CUP_10Rnd_762x39_SKS_M"),
 		"CUP_HandGrenade_RGD5",
 		"SmokeShell"
 	};
@@ -166,6 +167,12 @@ class car : r {
 
 class cls : car {
 	displayName = "Combat Life Saver";
+	primaryWeapon[] = {"CUP_srifle_Mosin_Nagant"};
+	magazines[] = {
+		LIST_14("CUP_5Rnd_762x54_Mosin_M"),
+		"CUP_HandGrenade_RGD5",
+		"SmokeShell"
+	};
 	traits[] = {"medic"};
 	backpack[] = {"CUP_B_SLA_Medicbag"};
 	backpackItems[] = { MEDICAL_CLS };
@@ -173,6 +180,12 @@ class cls : car {
 
 class m : cls {
 	displayName = "Medic";
+	primaryWeapon[] = {"CUP_srifle_LeeEnfield"};
+	magazines[] = {
+		LIST_12("CUP_10x_303_M"),
+		"CUP_HandGrenade_RGD5",
+		"SmokeShell"
+	};
 	backpack[] = {"CUP_B_AlicePack_Bedroll"};
 	backpackItems[] = { MEDICAL_M };
 };
@@ -196,15 +209,16 @@ class ftl : r {
 class sl : ftl {
 	displayName = "Squad Leader";
 	backpack[] = {"usm_pack_st138_prc77"};
-	sidearmWeapon[] = {"CUP_hgun_PMM"};
+	sidearmWeapon[] = {"CUP_hgun_TT"};
 	magazines[] += {
-		LIST_2("CUP_12Rnd_9x18_PMM_M")
+		LIST_2("CUP_8Rnd_762x25_TT")
 	};
 };
 
 class co : sl {
 	displayName = "Platoon Leader";
 	primaryWeapon[] = {"CUP_arifle_AKS_Gold"};
+	sidearmWeapon[] = {"CUP_hgun_PMM"};
 	goggles[] = {"G_Aviator"};
 	magazines[] = {
 		LIST_3("CUP_30Rnd_762x39_AK47_TK_M"),
@@ -225,34 +239,36 @@ class fac : car {
 
 class ar : r {
 	displayName = "Automatic Rifleman";
-	backpack[] = {"CUP_B_AlicePack_Khaki"};
 	primaryWeapon[] = {"CUP_arifle_RPK74"};
 	magazines[] = {
-		LIST_6("CUP_75Rnd_TE4_LRT4_Green_Tracer_762x39_RPK_M")
+		LIST_8("CUP_75Rnd_TE4_LRT4_Green_Tracer_762x39_RPK_M")
 	};
 };
 
 class aar : r {
 	displayName = "Assistant Automatic Rifleman";
-	backpack[] = {"B_FieldPack_cbr"};
 	backpackItems[] = {
-		LIST_4("CUP_75Rnd_TE4_LRT4_Green_Tracer_762x39_RPK_M")
+		LIST_6("CUP_75Rnd_TE4_LRT4_Green_Tracer_762x39_RPK_M")
 	};
 	linkedItems[] += {"Binocular"};
 };
 
-class rat : r {
+class rat : car {
 	displayName = "Rifleman (AT)";
 	secondaryWeapon[] = {"CUP_launch_RPG18"};
 };
 
+class lat : car {
+	displayName = "Rifleman (RShG-2)";
+	secondaryWeapon[] = {"CUP_launch_RShG2"};
+};
+
 class dm : r {
 	displayName = "Designated Marksman";
-	primaryWeapon[] = {"CUP_srifle_SVD"};
-	scope[] = {"cup_optic_pso_1"};
-	attachment[] = {"cup_svd_camo_d"};
+	primaryWeapon[] = {"CUP_srifle_Mosin_Nagant"};
+	scope[] = {"cup_optic_pem"};
 	magazines[] = {
-		LIST_6("CUP_10Rnd_762x54_SVD_M"),
+		LIST_14("CUP_5Rnd_762x54_Mosin_M"),
 		"CUP_HandGrenade_RGD5",
 		"SmokeShell"
 	};
@@ -262,13 +278,12 @@ class mmgg : ar {
 	displayName = "MMG Gunner";
 	primaryWeapon[] = {"CUP_lmg_PKM"};
 	magazines[] = {
-		LIST_3("CUP_100Rnd_TE4_LRT4_762x54_PK_Tracer_Green_M")
+		LIST_6("CUP_100Rnd_TE4_LRT4_762x54_PK_Tracer_Green_M")
 	};
 };
 
 class mmgac : r {
 	displayName = "MMG Ammo Carrier";
-	backpack[] = {"CUP_B_AlicePack_Khaki"};
 	backpackItems[] = {
 		LIST_4("CUP_100Rnd_TE4_LRT4_762x54_PK_Tracer_Green_M")
 	};
@@ -278,23 +293,30 @@ class mmgtl : aar {
 	displayName = "MMG Team Leader";
 	items[] += {"ACE_MapTools"};
 	backpackItems[] = {
-		LIST_2("CUP_100Rnd_TE4_LRT4_762x54_PK_Tracer_Green_M")
+		LIST_4("CUP_100Rnd_TE4_LRT4_762x54_PK_Tracer_Green_M")
 	};
 };
 
 class hmgg : car {
 	displayName = "HMG Gunner";
-	backPack[] = {"CUP_B_DShkM_Gun_Bag"};
+	secondaryWeapon[] = {"CUP_DSHKM_carry"};
+	backpackItems[] = {LIST_6("ace_csw_50Rnd_127x108_mag")};
 };
 
 class hmgac : r {
 	displayName = "HMG Ammo Carrier";
-	backPack[] = {"CUP_B_DShkM_TripodHigh_Bag"};
+	secondaryWeapon[] = {"ace_csw_kordCarryTripod"};
+	backpackItems[] = {LIST_6("ace_csw_50Rnd_127x108_mag")};
 };
 
 class hmgtl : car {
 	displayName = "HMG Team Leader";
-	backPack[] = {"CUP_B_DShkM_TripodLow_Bag"};
+	secondaryWeapon[] = {"ace_csw_kordCarryTripodLow"};
+	backpack[] = {"B_Carryall_oli"};
+	backpackItems[] = {
+		LIST_6("ace_csw_50Rnd_127x108_mag"),
+		"ACE_EntrenchingTool"
+	};
 	items[] += {"ACE_MapTools"};
 	linkedItems[] += {"Binocular"};
 };
@@ -332,17 +354,32 @@ class mattl : car {
 
 class hatg : car {
 	displayName = "HAT Gunner";
-	backPack[] = {"CUP_B_SPG9_Gun_Bag"};
+	secondaryWeapon[] = {"CUP_SPG9_carry"};
+	backpack[] = {"B_Carryall_cbr"};
+	backpackItems[] = {
+		LIST_2("CUP_compats_PG9_M"),
+		"CUP_compats_OG9_M"
+	};
 };
 
 class hatac : r {
 	displayName = "HAT Ammo Carrier";
-	backPack[] = {"CUP_B_SPG9_Tripod_Bag"};
+	backpack[] = {"B_Carryall_cbr"};
+	backpackItems[] = {
+		LIST_2("CUP_compats_PG9_M"),
+		"CUP_compats_OG9_M"
+	};
 };
 
 class hattl : car {
 	displayName = "HAT Team Leader";
-	backPack[] = {"CUP_B_SPG9_Tripod_Bag"};
+	secondaryWeapon[] = {"ace_csw_spg9CarryTripod"};
+	backpack[] = {"B_Carryall_cbr"};
+	backpackItems[] = {
+		LIST_2("CUP_compats_PG9_M"),
+		"CUP_compats_OG9_M",
+		"ACE_EntrenchingTool"
+	};
 	linkedItems[] += {"Binocular"};
 	items[] += {"ACE_MapTools"};
 };
@@ -396,11 +433,19 @@ class samag : car {
 	secondaryWeapon[] = {"CUP_launch_9K32Strela"};
 };
 
-class sn : dm {
+class sn : r {
 	displayName = "Sniper";
 	uniform[] = {"CUP_U_O_TK_Ghillie_Top"};
 	vest[] = {"V_Chestrig_rgr"};
 	headgear[] = {};
+
+	primaryWeapon[] = {"CUP_srifle_SVD"};
+	scope[] = {"cup_optic_pso_1"};
+	magazines[] = {
+		LIST_14("CUP_10Rnd_762x54_SVD_M"),
+		"CUP_HandGrenade_RGD5",
+		"SmokeShell"
+	};
 };
 
 class sp : r {
@@ -466,27 +511,51 @@ class jp : vg {
 	headgear[] = {"CUP_H_TK_PilotHelmet"};
 };
 
-class eng : smg {
+class eng : r {
 	displayName = "Combat Engineer (Explosives)";
 	sidearmWeapon[] = {"ACE_VMM3"};
 	traits[] = {"engineer", "explosiveSpecialist"};
-	backpack[] = {"CUP_B_AlicePack_Khaki"};
 	vest[] = {"CUP_V_O_SLA_Flak_Vest03"};
-	items[] += {"ACE_DefusalKit", "ACE_wirecutter", "ACE_DeadManSwitch", "ACE_Cellphone"};
+
+	primaryWeapon[] = {"CUP_sgun_CZ584"};
+	magazines[] = {
+		LIST_20("CUP_1Rnd_12Gauge_Pellets_No00_Buck"),
+		LIST_20("CUP_1Rnd_762x51_CZ584"),
+		LIST_2("ACE_M14")
+	};
+
+	items[] += {
+		"ACE_DefusalKit",
+		"ACE_wirecutter",
+		"ACE_DeadManSwitch",
+		"ACE_Cellphone"
+	};
 
 	backpackItems[] = {
 		"ToolKit",
-		LIST_5("CUP_PipeBomb_M")
+		LIST_4("CUP_PipeBomb_M")
 	};
 };
 
-class engm : smg {
+class engm : r {
 	displayName = "Combat Engineer (Mines)";
 	sidearmWeapon[] = {"ACE_VMM3"};
 	traits[] = {"engineer", "explosiveSpecialist"};
-	backpack[] = {"CUP_B_AlicePack_Khaki"};
 	vest[] = {"CUP_V_O_SLA_Flak_Vest03"};
-	items[] += {"ACE_DefusalKit", "ACE_wirecutter", "ACE_DeadManSwitch", "ACE_Cellphone"};
+
+	primaryWeapon[] = {"CUP_sgun_CZ584"};
+	magazines[] = {
+		LIST_20("CUP_1Rnd_12Gauge_Pellets_No00_Buck"),
+		LIST_20("CUP_1Rnd_762x51_CZ584"),
+		LIST_2("ACE_M14")
+	};
+
+	items[] += {
+		"ACE_DefusalKit",
+		"ACE_wirecutter",
+		"ACE_DeadManSwitch",
+		"ACE_Cellphone"
+	};
 
 	backpackItems[] = {
 		"ToolKit",
diff --git a/addons/tmf_loadouts/loadouts/ussr_army_1970.hpp b/addons/tmf_loadouts/loadouts/ussr_army_1970.hpp
index 257fee0..75a0f72 100644
--- a/addons/tmf_loadouts/loadouts/ussr_army_1970.hpp
+++ b/addons/tmf_loadouts/loadouts/ussr_army_1970.hpp
@@ -231,17 +231,26 @@ class mmgtl : aar {
 
 class hmgg : car {
 	displayName = "HMG Gunner";
-	backPack[] = {"CUP_B_DShkM_Gun_Bag"};
+	secondaryWeapon[] = {"CUP_DSHKM_carry"};
+	backpack[] = {"B_Carryall_cbr"};
+	backpackItems[] = {LIST_6("ace_csw_50Rnd_127x108_mag")};
 };
 
 class hmgac : r {
 	displayName = "HMG Ammo Carrier";
-	backPack[] = {"CUP_B_DShkM_TripodHigh_Bag"};
+	secondaryWeapon[] = {"ace_csw_kordCarryTripod"};
+	backpack[] = {"B_Carryall_cbr"};
+	backpackItems[] = {LIST_6("ace_csw_50Rnd_127x108_mag")};
 };
 
 class hmgtl : car {
 	displayName = "HMG Team Leader";
-	backPack[] = {"CUP_B_DShkM_TripodLow_Bag"};
+	secondaryWeapon[] = {"ace_csw_kordCarryTripodLow"};
+	backpack[] = {"B_Carryall_oli"};
+	backpackItems[] = {
+		LIST_6("ace_csw_50Rnd_127x108_mag"),
+		"ACE_EntrenchingTool"
+	};
 	items[] += {"ACE_MapTools"};
 	linkedItems[] += {"Binocular"};
 };
@@ -276,17 +285,32 @@ class mattl : car {
 
 class hatg : car {
 	displayName = "HAT Gunner";
-	backPack[] = {"CUP_B_SPG9_Gun_Bag"};
+	secondaryWeapon[] = {"CUP_SPG9_carry"};
+	backpack[] = {"B_Carryall_cbr"};
+	backpackItems[] = {
+		LIST_2("CUP_compats_PG9_M"),
+		"CUP_compats_OG9_M"
+	};
 };
 
 class hatac : r {
 	displayName = "HAT Ammo Carrier";
-	backPack[] = {"CUP_B_SPG9_Gun_Bag"};
+	backpack[] = {"B_Carryall_cbr"};
+	backpackItems[] = {
+		LIST_2("CUP_compats_PG9_M"),
+		"CUP_compats_OG9_M"
+	};
 };
 
 class hattl : car {
 	displayName = "HAT Team Leader";
-	backPack[] = {"CUP_B_SPG9_Tripod_Bag"};
+	secondaryWeapon[] = {"ace_csw_spg9CarryTripod"};
+	backpack[] = {"B_Carryall_cbr"};
+	backpackItems[] = {
+		LIST_2("CUP_compats_PG9_M"),
+		"CUP_compats_OG9_M",
+		"ACE_EntrenchingTool"
+	};
 	items[] += {"ACE_MapTools"};
 	linkedItems[] = {
 		"Binocular"
@@ -295,7 +319,7 @@ class hattl : car {
 
 class mtrg : car {
 	displayName = "Mortar Gunner";
-	secondaryWeapon[] = {"ace_csw_staticMortarCarry"};
+	secondaryWeapon[] = {"CUP_2b14_carry"};
 	backPack[] = {"B_Carryall_cbr"};
 	backpackItems[] = {
 		LIST_4("ACE_1Rnd_82mm_Mo_HE"),
diff --git a/addons/tmf_loadouts/loadouts/ussr_army_1985.hpp b/addons/tmf_loadouts/loadouts/ussr_army_1985.hpp
index f744e06..dd53dfb 100644
--- a/addons/tmf_loadouts/loadouts/ussr_army_1985.hpp
+++ b/addons/tmf_loadouts/loadouts/ussr_army_1985.hpp
@@ -171,7 +171,7 @@ class aar : r {
 
 class rat : r {
 	displayName = "Rifleman (AT)";
-	secondaryWeapon[] = {"CUP_launch_RPG18"};
+	secondaryWeapon[] = {"CUP_launch_RPG26"};
 };
 
 class dm : r {
@@ -217,17 +217,26 @@ class mmgtl : aar {
 
 class hmgg : car {
 	displayName = "HMG Gunner";
-	backPack[] = {"CUP_B_DShkM_Gun_Bag"};
+	secondaryWeapon[] = {"CUP_DSHKM_carry"};
+	backpack[] = {"B_Carryall_oli"};
+	backpackItems[] = {LIST_6("ace_csw_50Rnd_127x108_mag")};
 };
 
 class hmgac : r {
 	displayName = "HMG Ammo Carrier";
-	backPack[] = {"CUP_B_DShkM_TripodHigh_Bag"};
+	secondaryWeapon[] = {"ace_csw_kordCarryTripod"};
+	backpack[] = {"B_Carryall_oli"};
+	backpackItems[] = {LIST_6("ace_csw_50Rnd_127x108_mag")};
 };
 
 class hmgtl : car {
 	displayName = "HMG Team Leader";
-	backPack[] = {"CUP_B_DShkM_TripodLow_Bag"};
+	secondaryWeapon[] = {"ace_csw_kordCarryTripodLow"};
+	backpack[] = {"B_Carryall_oli"};
+	backpackItems[] = {
+		LIST_6("ace_csw_50Rnd_127x108_mag"),
+		"ACE_EntrenchingTool"
+	};
 	items[] += {"ACE_MapTools"};
 	linkedItems[] += {"Binocular"};
 };
@@ -263,17 +272,28 @@ class mattl : car {
 
 class hatg : car {
 	displayName = "HAT Gunner";
-	backPack[] = {"CUP_B_Metis_Gun_Bag"};
+	secondaryWeapon[] = {"CUP_launch_Metis"};
+	backPack[] = {"B_Carryall_oli"};
+	backpackItems[] = {
+		LIST_3("CUP_AT13_M")
+	};
 };
 
 class hatac : r {
 	displayName = "HAT Ammo Carrier";
-	backPack[] = {"CUP_B_Metis_Gun_Bag"};
+	backPack[] = {"B_Carryall_oli"};
+	backpackItems[] = {
+		LIST_3("CUP_AT13_M")
+	};
 };
 
 class hattl : car {
 	displayName = "HAT Team Leader";
-	backPack[] = {"CUP_B_Metis_Tripod_Bag"};
+	backPack[] = {"B_Carryall_oli"};
+	backpackItems[] = {
+		LIST_3("CUP_AT13_M"),
+		"ACE_EntrenchingTool"
+	};
 	items[] += {"ACE_MapTools"};
 	linkedItems[] = {
 		"Binocular"
@@ -282,7 +302,7 @@ class hattl : car {
 
 class mtrg : car {
 	displayName = "Mortar Gunner";
-	secondaryWeapon[] = {"ace_csw_staticMortarCarry"};
+	secondaryWeapon[] = {"CUP_2b14_carry"};
 	backPack[] = {"B_Carryall_oli"};
 	backpackItems[] = {
 		LIST_4("ACE_1Rnd_82mm_Mo_HE"),