diff --git a/cScripts/CfgFunctions.hpp b/cScripts/CfgFunctions.hpp
index 75b0e02aa..eeb6a4294 100644
--- a/cScripts/CfgFunctions.hpp
+++ b/cScripts/CfgFunctions.hpp
@@ -79,8 +79,10 @@ class cScripts {
         class setRadioChannel {};
         class setActiveRadio {};
 
+        class player_getOrganization {};
         class player_getCompany {};
-        class player_setCompany {};
+        class player_getPlatoon {};
+        class player_setOrganization {};
 
         // Other Functions
         class unit_getVariables {};
diff --git a/cScripts/Loadouts/CfgLoadouts_Alpha.hpp b/cScripts/Loadouts/CfgLoadouts_Alpha.hpp
index 37d6a8565..aa37ed07c 100644
--- a/cScripts/Loadouts/CfgLoadouts_Alpha.hpp
+++ b/cScripts/Loadouts/CfgLoadouts_Alpha.hpp
@@ -2,7 +2,7 @@ class Cav_B_A_Officer_F: Cav_B_Alpha_base_F {
     displayName = "PEGASUS-6";
     category[] += {"cScripts_Loadout_Cat_Alpha_Leadership"};
     scope = 2;
-    loadout = [["rhs_weap_m4a1_blockII_grip2_KAC","rhsusf_acc_SF3P556","rhsusf_acc_anpeq15","rhsusf_acc_ACOG_RMR_3d",["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tan_Tracer_Red",30],[],"rhsusf_acc_grip2"],[],["rhsusf_weap_glock17g4","","acc_flashlight_pistol","",["rhsusf_mag_17Rnd_9x19_FMJ",17],[],""],["USP_G3C_RS2_KP_OR_MC",[["ACE_tourniquet",4],["ACE_Flashlight_XL50",1],["ACE_MapTools",1],["ACE_microDAGR",1],["ACE_packingBandage",14],["kat_chestSeal",2],["kat_guedel",1],["ACE_EarPlugs",1],["kat_Painkiller",2,10],["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tan_Tracer_Red",1,30]]],["USP_CRYE_JPC_ASLTB",[["rhsusf_mag_17Rnd_9x19_FMJ",2,17],["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tan_Tracer_Red",8,30],["SmokeShell",4,1],["SmokeShellBlue",2,1],["HandGrenade",2,1]]],["USP_TACTICAL_PACK_CCT7",[["USP_PVS15",1],["ACE_splint",2],["ACE_SpraypaintRed",1],["ACE_EntrenchingTool",1],["ACE_CableTie",2],["SmokeShellPurple",1,1],["SmokeShellRed",2,1],["SmokeShellBlue",2,1]]],"USP_OPSCORE_FASTMTC_CGTW","",["ACE_Vector","","","",[],[],""],["ItemMap","ItemAndroid","","ItemCompass","ACE_Altimeter",""]];
+    loadout = [["rhs_weap_m4a1_blockII_grip2_KAC","rhsusf_acc_SF3P556","rhsusf_acc_anpeq15","rhsusf_acc_ACOG_RMR_3d",["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tan_Tracer_Red",30],[],"rhsusf_acc_grip2"],[],["UK3CB_P320_BLK","","acc_flashlight_pistol","",["UK3CB_P320_9x21_17Rnd",17],[],""],["USP_G3C_RS2_KP_OR_MC",[["ACE_tourniquet",4],["ACE_Flashlight_XL50",1],["ACE_MapTools",1],["ACE_microDAGR",1],["ACE_packingBandage",14],["kat_chestSeal",2],["kat_guedel",1],["ACE_EarPlugs",1],["kat_Painkiller",2,10],["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tan_Tracer_Red",1,30]]],["USP_CRYE_JPC_ASLTB",[["UK3CB_P320_9x21_17Rnd",2,17],["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tan_Tracer_Red",8,30],["SmokeShell",4,1],["SmokeShellBlue",2,1],["HandGrenade",2,1]]],["USP_TACTICAL_PACK_CCT7",[["USP_PVS15",1],["ACE_splint",2],["ACE_SpraypaintRed",1],["ACE_EntrenchingTool",1],["ACE_CableTie",2],["SmokeShellPurple",1,1],["SmokeShellRed",2,1],["SmokeShellBlue",2,1]]],"USP_OPSCORE_FASTMTC_CGTW","",["ACE_Vector","","","",[],[],""],["ItemMap","ItemAndroid","","ItemCompass","ACE_Altimeter",""]];
     role = "officer";
 };
 
@@ -10,7 +10,7 @@ class Cav_B_A_PltSgt_Local: Cav_B_Alpha_base_F {
     displayName = "PEGASUS-5";
     category[] += {"cScripts_Loadout_Cat_Alpha_Leadership"};
     scope = 2;
-    loadout = [["rhs_weap_m4a1_blockII_KAC","rhsusf_acc_SF3P556","rhsusf_acc_anpeq15","rhsusf_acc_ACOG_RMR_3d",["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tan_Tracer_Red",30],[],"rhsusf_acc_grip2"],[],["rhsusf_weap_glock17g4","","acc_flashlight_pistol","",["rhsusf_mag_17Rnd_9x19_FMJ",17],[],""],["USP_G3C_RS2_KP_OR_MC",[["ACE_tourniquet",4],["ACE_Flashlight_XL50",1],["ACE_MapTools",1],["ACE_microDAGR",1],["ACE_packingBandage",14],["kat_chestSeal",2],["kat_guedel",1],["ACE_EarPlugs",1],["kat_Painkiller",2,10]]],["USP_CRYE_JPC_ASLTB",[["rhsusf_mag_17Rnd_9x19_FMJ",2,17],["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tan_Tracer_Red",9,30],["SmokeShell",4,1],["SmokeShellBlue",2,1],["HandGrenade",2,1]]],["USP_TACTICAL_PACK_CCT7",[["USP_PVS15",1],["ACE_splint",2],["ACE_SpraypaintRed",1],["ACE_EntrenchingTool",1],["ACE_CableTie",2],["SmokeShellPurple",1,1],["SmokeShellRed",2,1],["SmokeShellBlue",2,1]]],"USP_OPSCORE_FASTMTC_CGTW","",["ACE_Vector","","","",[],[],""],["ItemMap","ItemAndroid","","ItemCompass","ACE_Altimeter",""]];
+    loadout = [["rhs_weap_m4a1_blockII_KAC","rhsusf_acc_SF3P556","rhsusf_acc_anpeq15","rhsusf_acc_ACOG_RMR_3d",["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tan_Tracer_Red",30],[],"rhsusf_acc_grip2"],[],["UK3CB_P320_BLK","","acc_flashlight_pistol","",["UK3CB_P320_9x21_17Rnd",17],[],""],["USP_G3C_RS2_KP_OR_MC",[["ACE_tourniquet",4],["ACE_Flashlight_XL50",1],["ACE_MapTools",1],["ACE_microDAGR",1],["ACE_packingBandage",14],["kat_chestSeal",2],["kat_guedel",1],["ACE_EarPlugs",1],["kat_Painkiller",2,10]]],["USP_CRYE_JPC_ASLTB",[["UK3CB_P320_9x21_17Rnd",2,17],["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tan_Tracer_Red",9,30],["SmokeShell",4,1],["SmokeShellBlue",2,1],["HandGrenade",2,1]]],["USP_TACTICAL_PACK_CCT7",[["USP_PVS15",1],["ACE_splint",2],["ACE_SpraypaintRed",1],["ACE_EntrenchingTool",1],["ACE_CableTie",2],["SmokeShellPurple",1,1],["SmokeShellRed",2,1],["SmokeShellBlue",2,1]]],"USP_OPSCORE_FASTMTC_CGTW","",["ACE_Vector","","","",[],[],""],["ItemMap","ItemAndroid","","ItemCompass","ACE_Altimeter",""]];
     role = "officer";
 };
 
@@ -27,7 +27,7 @@ class Cav_B_A_DroneOperator_F: Cav_B_Alpha_base_F {
     category[] += {"cScripts_Loadout_Cat_Alpha_Leadership"};
     scope = 2;
     abilityEngineer = 1;
-    loadout = [["rhs_weap_m4a1_blockII_grip_bk","ACE_muzzle_mzls_L","acc_pointer_IR","rhsusf_acc_ACOG_RMR",["ACE_30Rnd_556x45_Stanag_M995_AP_mag",30],[],"rhsusf_acc_rvg_blk"],[],["rhsusf_weap_glock17g4","","acc_flashlight_pistol","",["rhsusf_mag_17Rnd_9x19_JHP",17],[],""],["USP_G3C_RS2_MC",[["ACE_tourniquet",4],["ACE_MapTools",1],["ACE_IR_Strobe_Item",2],["ACE_microDAGR",1],["ACE_splint",4],["ACE_Flashlight_XL50",1],["ACE_Banana",1],["ACE_EarPlugs",1],["kat_Painkiller",2,10],["SmokeShellPurple",2,1],["Laserbatteries",1,1]]],["rhsusf_plateframe_teamleader",[["ACE_packingBandage",20],["ACE_IR_Strobe_Item",2],["ItemAndroid",1],["kat_chestSeal",2],["kat_guedel",1],["kat_ncdKit",1],["ACE_30Rnd_556x45_Stanag_M995_AP_mag",8,30],["ACE_HandFlare_Green",2,1],["SmokeShell",4,1],["rhsusf_mag_17Rnd_9x19_JHP",1,17],[["hgun_Pistol_Signal_F","","","",[],[],""],1]]],["USP_TACTICAL_PACK_CCT2",[["H_Cap_tan",1],["ACE_CableTie",2],["ACE_EntrenchingTool",1],["ToolKit",1]]],"rhsusf_opscore_mc_cover_pelt_cam","rhsusf_oakley_goggles_clr",["ACE_Vector","","","",[],[],""],["ItemMap","B_UavTerminal","","ItemCompass","ItemWatch","NVGogglesB_blk_F"]];
+    loadout = [["rhs_weap_m4a1_blockII_grip_bk","ACE_muzzle_mzls_L","acc_pointer_IR","rhsusf_acc_ACOG_RMR",["ACE_30Rnd_556x45_Stanag_M995_AP_mag",30],[],"rhsusf_acc_rvg_blk"],[],["UK3CB_P320_BLK","","acc_flashlight_pistol","",["UK3CB_P320_9x21_17Rnd",17],[],""],["USP_G3C_RS2_MC",[["ACE_tourniquet",4],["ACE_MapTools",1],["ACE_IR_Strobe_Item",2],["ACE_microDAGR",1],["ACE_splint",4],["ACE_Flashlight_XL50",1],["ACE_Banana",1],["ACE_EarPlugs",1],["kat_Painkiller",2,10],["SmokeShellPurple",2,1],["Laserbatteries",1,1]]],["rhsusf_plateframe_teamleader",[["ACE_packingBandage",20],["ACE_IR_Strobe_Item",2],["ItemAndroid",1],["kat_chestSeal",2],["kat_guedel",1],["kat_ncdKit",1],["ACE_30Rnd_556x45_Stanag_M995_AP_mag",8,30],["ACE_HandFlare_Green",2,1],["SmokeShell",4,1],["UK3CB_P320_9x21_17Rnd",1,17],[["hgun_Pistol_Signal_F","","","",[],[],""],1]]],["USP_TACTICAL_PACK_CCT2",[["H_Cap_tan",1],["ACE_CableTie",2],["ACE_EntrenchingTool",1],["ToolKit",1]]],"rhsusf_opscore_mc_cover_pelt_cam","rhsusf_oakley_goggles_clr",["ACE_Vector","","","",[],[],""],["ItemMap","B_UavTerminal","","ItemCompass","ItemWatch","NVGogglesB_blk_F"]];
     role = "officer";
 };
 // class Cav_B_A_JFO_F: Cav_B_Alpha_base_F {
diff --git a/cScripts/Loadouts/CfgLoadouts_Alpha_FixedWing.hpp b/cScripts/Loadouts/CfgLoadouts_Alpha_FixedWing.hpp
index 2ea54faa5..b407e77bb 100644
--- a/cScripts/Loadouts/CfgLoadouts_Alpha_FixedWing.hpp
+++ b/cScripts/Loadouts/CfgLoadouts_Alpha_FixedWing.hpp
@@ -4,7 +4,7 @@ class Cav_B_A_Plane_Fighter_Pilot_F: Cav_B_Alpha_base_F {
     category[] += {"cScripts_Loadout_Cat_Alpha_FixedWing"};
     scope = 2;
     abilityEngineer = 1;
-    loadout = [["rhs_weap_m4a1_blockII_grip_bk","ACE_muzzle_mzls_L","acc_pointer_IR","rhsusf_acc_ACOG_RMR",["ACE_30Rnd_556x45_Stanag_M995_AP_mag",30],[],"rhsusf_acc_rvg_blk"],[],["rhsusf_weap_glock17g4","","acc_flashlight_pistol","",["rhsusf_mag_17Rnd_9x19_JHP",17],[],""],["U_B_PilotCoveralls",[["ACE_microDAGR",1],["ACE_MapTools",1],["ACE_tourniquet",4],["ACE_splint",4],["ACE_packingBandage",20],["ACE_EarPlugs",2],["ACE_Banana",1],["kat_chestSeal",2],["kat_guedel",1],["kat_ncdKit",1],["kat_Painkiller",2,10],["acex_intelitems_notepad",1,1]]],["UK3CB_V_Pilot_Vest_Black",[["ACE_CableTie",2],["ACE_IR_Strobe_Item",2],["ACE_30Rnd_556x45_Stanag_M995_AP_mag",6,30],["HandGrenade",1,1],["SmokeShell",4,1],["rhsusf_mag_17Rnd_9x19_JHP",2,17],["SmokeShellBlue",2,1],["SmokeShellRed",2,1],["ACE_HandFlare_Green",2,1],["SmokeShellPurple",2,1],["ACE_Chemlight_UltraHiOrange",1,1],[["hgun_Pistol_Signal_F","","","",["6Rnd_GreenSignal_F",6],[],""],1]]],["USP_TACTICAL_PACK_MCB_CCT2",[["ToolKit",1],["USP_BASEBALL_CAP_ABU_BS",1],["NVGogglesB_blk_F",1],["ACE_EntrenchingTool",1]]],"H_PilotHelmetFighter_B","",["ACE_Vector","","","",[],[],""],["ItemMap","ItemAndroid","","ItemCompass","ACE_Altimeter",""]];
+    loadout = [["rhs_weap_m4a1_blockII_grip_bk","ACE_muzzle_mzls_L","acc_pointer_IR","rhsusf_acc_ACOG_RMR",["ACE_30Rnd_556x45_Stanag_M995_AP_mag",30],[],"rhsusf_acc_rvg_blk"],[],["UK3CB_P320_BLK","","acc_flashlight_pistol","",["UK3CB_P320_9x21_17Rnd",17],[],""],["U_B_PilotCoveralls",[["ACE_microDAGR",1],["ACE_MapTools",1],["ACE_tourniquet",4],["ACE_splint",4],["ACE_packingBandage",20],["ACE_EarPlugs",2],["ACE_Banana",1],["kat_chestSeal",2],["kat_guedel",1],["kat_ncdKit",1],["kat_Painkiller",2,10],["acex_intelitems_notepad",1,1]]],["UK3CB_V_Pilot_Vest_Black",[["ACE_CableTie",2],["ACE_IR_Strobe_Item",2],["ACE_30Rnd_556x45_Stanag_M995_AP_mag",6,30],["HandGrenade",1,1],["SmokeShell",4,1],["UK3CB_P320_9x21_17Rnd",2,17],["SmokeShellBlue",2,1],["SmokeShellRed",2,1],["ACE_HandFlare_Green",2,1],["SmokeShellPurple",2,1],["ACE_Chemlight_UltraHiOrange",1,1],[["hgun_Pistol_Signal_F","","","",["6Rnd_GreenSignal_F",6],[],""],1]]],["USP_TACTICAL_PACK_MCB_CCT2",[["ToolKit",1],["USP_BASEBALL_CAP_ABU_BS",1],["NVGogglesB_blk_F",1],["ACE_EntrenchingTool",1]]],"H_PilotHelmetFighter_B","",["ACE_Vector","","","",[],[],""],["ItemMap","ItemAndroid","","ItemCompass","ACE_Altimeter",""]];
     role = "pilotfighter";
 };
 class Cav_B_A_Plane_Transport_Pilot_F: Cav_B_Alpha_base_F {
@@ -12,14 +12,14 @@ class Cav_B_A_Plane_Transport_Pilot_F: Cav_B_Alpha_base_F {
     category[] += {"cScripts_Loadout_Cat_Alpha_FixedWing"};
     scope = 2;
     abilityEngineer = 1;
-    loadout = [["rhs_weap_m4a1_blockII_bk","ACE_muzzle_mzls_L","acc_pointer_IR","rhsusf_acc_ACOG_RMR",["ACE_30Rnd_556x45_Stanag_M995_AP_mag",30],[],"rhsusf_acc_rvg_blk"],[],["rhsusf_weap_glock17g4","","acc_flashlight_pistol","",["rhsusf_mag_17Rnd_9x19_JHP",17],[],""],["B_CWU_coverall_od_usaf",[["ACE_packingBandage",20],["ACE_EarPlugs",1],["ACE_MapTools",1],["ACE_microDAGR",1],["ACE_splint",4],["ACE_tourniquet",4],["ACE_Banana",1],["ACE_Chemlight_UltraHiOrange",1,1],["acex_intelitems_notepad",1,1]]],["UK3CB_V_Pilot_Vest_Black",[["ACE_CableTie",2],["ACE_IR_Strobe_Item",2],["kat_chestSeal",2],["kat_guedel",1],["kat_ncdKit",1],["ACE_30Rnd_556x45_Stanag_M995_AP_mag",6,30],["SmokeShell",4,1],["rhsusf_mag_17Rnd_9x19_JHP",2,17],["ACE_HandFlare_Green",2,1],["kat_Painkiller",2,10],["SmokeShellPurple",2,1],["SmokeShellBlue",2,1],["SmokeShellRed",2,1],["HandGrenade",1,1],[["hgun_Pistol_Signal_F","","","",["6Rnd_GreenSignal_F",6],[],""],1]]],["USP_TACTICAL_PACK_MCT_CCT2",[["ToolKit",1],["NVGogglesB_blk_F",1],["ACE_EntrenchingTool",1],["rhsusf_m112_mag",1,1]]],"USP_BASEBALL_CAP_CT3_OD","",["ACE_Vector","","","",[],[],""],["ItemMap","ItemAndroid","","ItemCompass","ACE_Altimeter",""]];
+    loadout = [["rhs_weap_m4a1_blockII_bk","ACE_muzzle_mzls_L","acc_pointer_IR","rhsusf_acc_ACOG_RMR",["ACE_30Rnd_556x45_Stanag_M995_AP_mag",30],[],"rhsusf_acc_rvg_blk"],[],["UK3CB_P320_BLK","","acc_flashlight_pistol","",["UK3CB_P320_9x21_17Rnd",17],[],""],["B_CWU_coverall_od_usaf",[["ACE_packingBandage",20],["ACE_EarPlugs",1],["ACE_MapTools",1],["ACE_microDAGR",1],["ACE_splint",4],["ACE_tourniquet",4],["ACE_Banana",1],["ACE_Chemlight_UltraHiOrange",1,1],["acex_intelitems_notepad",1,1]]],["UK3CB_V_Pilot_Vest_Black",[["ACE_CableTie",2],["ACE_IR_Strobe_Item",2],["kat_chestSeal",2],["kat_guedel",1],["kat_ncdKit",1],["ACE_30Rnd_556x45_Stanag_M995_AP_mag",6,30],["SmokeShell",4,1],["UK3CB_P320_9x21_17Rnd",2,17],["ACE_HandFlare_Green",2,1],["kat_Painkiller",2,10],["SmokeShellPurple",2,1],["SmokeShellBlue",2,1],["SmokeShellRed",2,1],["HandGrenade",1,1],[["hgun_Pistol_Signal_F","","","",["6Rnd_GreenSignal_F",6],[],""],1]]],["USP_TACTICAL_PACK_MCT_CCT2",[["ToolKit",1],["NVGogglesB_blk_F",1],["ACE_EntrenchingTool",1],["rhsusf_m112_mag",1,1]]],"USP_BASEBALL_CAP_CT3_OD","",["ACE_Vector","","","",[],[],""],["ItemMap","ItemAndroid","","ItemCompass","ACE_Altimeter",""]];
     role = "pilottransport";
 };
 class Cav_B_A_Plane_Transport_coPilot_F: Cav_B_A_Plane_Transport_Pilot_F {
     displayName = "$STR_Cav_Alpha_Characters_A_Plane_Transport_coPilot";
     abilityEngineer = 1;
     scope = 2;
-    loadout = [["rhs_weap_m4a1_blockII_bk","ACE_muzzle_mzls_L","acc_pointer_IR","rhsusf_acc_ACOG_RMR",["ACE_30Rnd_556x45_Stanag_M995_AP_mag",30],[],"rhsusf_acc_rvg_blk"],[],["rhsusf_weap_glock17g4","","acc_flashlight_pistol","",["rhsusf_mag_17Rnd_9x19_JHP",17],[],""],["B_CWU_coverall_od_usaf",[["ACE_packingBandage",20],["ACE_EarPlugs",1],["ACE_MapTools",1],["ACE_microDAGR",1],["ACE_splint",4],["ACE_tourniquet",4],["ACE_Banana",1],["ACE_Chemlight_UltraHiOrange",1,1],["acex_intelitems_notepad",1,1]]],["UK3CB_V_Pilot_Vest_Black",[["ACE_CableTie",2],["ACE_IR_Strobe_Item",2],["kat_chestSeal",2],["kat_guedel",1],["kat_ncdKit",1],["ACE_30Rnd_556x45_Stanag_M995_AP_mag",6,30],["SmokeShell",4,1],["rhsusf_mag_17Rnd_9x19_JHP",2,17],["ACE_HandFlare_Green",2,1],["kat_Painkiller",2,10],["SmokeShellPurple",2,1],["SmokeShellBlue",2,1],["SmokeShellRed",2,1],["HandGrenade",1,1],[["hgun_Pistol_Signal_F","","","",["6Rnd_GreenSignal_F",6],[],""],1]]],["USP_TACTICAL_PACK_MCT_CCT2",[["ToolKit",1],["NVGogglesB_blk_F",1],["ACE_EntrenchingTool",1],["rhsusf_m112_mag",1,1]]],"USP_BASEBALL_CAP_CT3_OD","",["ACE_Vector","","","",[],[],""],["ItemMap","ItemAndroid","","ItemCompass","ACE_Altimeter",""]];
+    loadout = [["rhs_weap_m4a1_blockII_bk","ACE_muzzle_mzls_L","acc_pointer_IR","rhsusf_acc_ACOG_RMR",["ACE_30Rnd_556x45_Stanag_M995_AP_mag",30],[],"rhsusf_acc_rvg_blk"],[],["UK3CB_P320_BLK","","acc_flashlight_pistol","",["UK3CB_P320_9x21_17Rnd",17],[],""],["B_CWU_coverall_od_usaf",[["ACE_packingBandage",20],["ACE_EarPlugs",1],["ACE_MapTools",1],["ACE_microDAGR",1],["ACE_splint",4],["ACE_tourniquet",4],["ACE_Banana",1],["ACE_Chemlight_UltraHiOrange",1,1],["acex_intelitems_notepad",1,1]]],["UK3CB_V_Pilot_Vest_Black",[["ACE_CableTie",2],["ACE_IR_Strobe_Item",2],["kat_chestSeal",2],["kat_guedel",1],["kat_ncdKit",1],["ACE_30Rnd_556x45_Stanag_M995_AP_mag",6,30],["SmokeShell",4,1],["UK3CB_P320_9x21_17Rnd",2,17],["ACE_HandFlare_Green",2,1],["kat_Painkiller",2,10],["SmokeShellPurple",2,1],["SmokeShellBlue",2,1],["SmokeShellRed",2,1],["HandGrenade",1,1],[["hgun_Pistol_Signal_F","","","",["6Rnd_GreenSignal_F",6],[],""],1]]],["USP_TACTICAL_PACK_MCT_CCT2",[["ToolKit",1],["NVGogglesB_blk_F",1],["ACE_EntrenchingTool",1],["rhsusf_m112_mag",1,1]]],"USP_BASEBALL_CAP_CT3_OD","",["ACE_Vector","","","",[],[],""],["ItemMap","ItemAndroid","","ItemCompass","ACE_Altimeter",""]];
 };
 
 
diff --git a/cScripts/Loadouts/CfgLoadouts_Alpha_Rotary.hpp b/cScripts/Loadouts/CfgLoadouts_Alpha_Rotary.hpp
index beab135cd..da1c01e89 100644
--- a/cScripts/Loadouts/CfgLoadouts_Alpha_Rotary.hpp
+++ b/cScripts/Loadouts/CfgLoadouts_Alpha_Rotary.hpp
@@ -6,19 +6,19 @@ class Cav_B_A_Helicopter_Tra_Pilot_F: Cav_B_A_PilotBase_F {
     displayName = "$STR_Cav_Alpha_Characters_A_Helicopter_Tra_Pilot";
     category[] += {"cScripts_Loadout_Cat_Alpha_Rotary"};
     scope = 2;
-    loadout = [["rhs_weap_m4a1_blockII_bk","ACE_muzzle_mzls_L","acc_pointer_IR","rhsusf_acc_ACOG_RMR",["ACE_30Rnd_556x45_Stanag_M995_AP_mag",30],[],"rhsusf_acc_rvg_blk"],[],["rhsusf_weap_glock17g4","","acc_flashlight_pistol","",["rhsusf_mag_17Rnd_9x19_JHP",17],[],""],["USP_G3C_RS2_MC",[["ACE_EarPlugs",1],["ACE_microDAGR",1],["ACE_MapTools",1],["ACE_splint",4],["ACE_tourniquet",4],["ACE_packingBandage",20],["ACE_Banana",1],["kat_Painkiller",2,10]]],["UK3CB_V_Pilot_Vest",[["ACE_IR_Strobe_Item",2],["kat_chestSeal",2],["kat_guedel",1],["kat_ncdKit",1],["SmokeShellRed",2,1],["SmokeShell",4,1],["SmokeShellPurple",2,1],["ACE_30Rnd_556x45_Stanag_M995_AP_mag",6,30],["rhsusf_mag_17Rnd_9x19_JHP",1,17],["ACE_HandFlare_Green",2,1],["SmokeShellBlue",2,1],[["hgun_Pistol_Signal_F","","","",["6Rnd_GreenSignal_F",6],[],""],1]]],["USP_TACTICAL_PACK_CCT2",[["ACE_EntrenchingTool",1],["H_Cap_tan",1],["ToolKit",1],["rhsusf_ihadss",1],["rhsusf_m112_mag",1,1]]],"rhsusf_hgu56p_visor","",["ACE_Vector","","","",[],[],""],["ItemMap","ItemAndroid","","ItemCompass","ACE_Altimeter","NVGogglesB_blk_F"]];
+    loadout = [["rhs_weap_m4a1_blockII_bk","ACE_muzzle_mzls_L","acc_pointer_IR","rhsusf_acc_ACOG_RMR",["ACE_30Rnd_556x45_Stanag_M995_AP_mag",30],[],"rhsusf_acc_rvg_blk"],[],["UK3CB_P320_BLK","","acc_flashlight_pistol","",["UK3CB_P320_9x21_17Rnd",17],[],""],["USP_G3C_RS2_MC",[["ACE_EarPlugs",1],["ACE_microDAGR",1],["ACE_MapTools",1],["ACE_splint",4],["ACE_tourniquet",4],["ACE_packingBandage",20],["ACE_Banana",1],["kat_Painkiller",2,10]]],["UK3CB_V_Pilot_Vest",[["ACE_IR_Strobe_Item",2],["kat_chestSeal",2],["kat_guedel",1],["kat_ncdKit",1],["SmokeShellRed",2,1],["SmokeShell",4,1],["SmokeShellPurple",2,1],["ACE_30Rnd_556x45_Stanag_M995_AP_mag",6,30],["UK3CB_P320_9x21_17Rnd",1,17],["ACE_HandFlare_Green",2,1],["SmokeShellBlue",2,1],[["hgun_Pistol_Signal_F","","","",["6Rnd_GreenSignal_F",6],[],""],1]]],["USP_TACTICAL_PACK_CCT2",[["ACE_EntrenchingTool",1],["H_Cap_tan",1],["ToolKit",1],["rhsusf_ihadss",1],["rhsusf_m112_mag",1,1]]],"rhsusf_hgu56p_visor","",["ACE_Vector","","","",[],[],""],["ItemMap","ItemAndroid","","ItemCompass","ACE_Altimeter","NVGogglesB_blk_F"]];
     role = "rotarypilot";
 };
 class Cav_B_A_Helicopter_Tra_coPilot_F: Cav_B_A_Helicopter_Tra_Pilot_F {
     displayName = "$STR_Cav_Alpha_Characters_A_Helicopter_Tra_coPilot";
     scope = 2;
-    loadout = [["rhs_weap_m4a1_blockII_bk","ACE_muzzle_mzls_L","acc_pointer_IR","rhsusf_acc_ACOG_RMR",["ACE_30Rnd_556x45_Stanag_M995_AP_mag",30],[],"rhsusf_acc_rvg_blk"],[],["rhsusf_weap_glock17g4","","acc_flashlight_pistol","",["rhsusf_mag_17Rnd_9x19_JHP",17],[],""],["USP_G3C_RS2_MC",[["ACE_EarPlugs",1],["ACE_microDAGR",1],["ACE_MapTools",1],["ACE_splint",4],["ACE_tourniquet",4],["ACE_packingBandage",20],["ACE_Banana",1],["kat_Painkiller",2,10]]],["UK3CB_V_Pilot_Vest",[["ACE_IR_Strobe_Item",2],["kat_chestSeal",2],["kat_guedel",1],["kat_ncdKit",1],["SmokeShellRed",2,1],["SmokeShell",4,1],["SmokeShellPurple",2,1],["ACE_30Rnd_556x45_Stanag_M995_AP_mag",6,30],["rhsusf_mag_17Rnd_9x19_JHP",1,17],["ACE_HandFlare_Green",2,1],["SmokeShellBlue",2,1],[["hgun_Pistol_Signal_F","","","",["6Rnd_GreenSignal_F",6],[],""],1]]],["USP_TACTICAL_PACK_CCT2",[["ACE_EntrenchingTool",1],["H_Cap_tan",1],["ToolKit",1],["rhsusf_ihadss",1],["rhsusf_m112_mag",1,1]]],"rhsusf_hgu56p_visor","",["ACE_Vector","","","",[],[],""],["ItemMap","ItemAndroid","","ItemCompass","ACE_Altimeter","NVGogglesB_blk_F"]];
+    loadout = [["rhs_weap_m4a1_blockII_bk","ACE_muzzle_mzls_L","acc_pointer_IR","rhsusf_acc_ACOG_RMR",["ACE_30Rnd_556x45_Stanag_M995_AP_mag",30],[],"rhsusf_acc_rvg_blk"],[],["UK3CB_P320_BLK","","acc_flashlight_pistol","",["UK3CB_P320_9x21_17Rnd",17],[],""],["USP_G3C_RS2_MC",[["ACE_EarPlugs",1],["ACE_microDAGR",1],["ACE_MapTools",1],["ACE_splint",4],["ACE_tourniquet",4],["ACE_packingBandage",20],["ACE_Banana",1],["kat_Painkiller",2,10]]],["UK3CB_V_Pilot_Vest",[["ACE_IR_Strobe_Item",2],["kat_chestSeal",2],["kat_guedel",1],["kat_ncdKit",1],["SmokeShellRed",2,1],["SmokeShell",4,1],["SmokeShellPurple",2,1],["ACE_30Rnd_556x45_Stanag_M995_AP_mag",6,30],["UK3CB_P320_9x21_17Rnd",1,17],["ACE_HandFlare_Green",2,1],["SmokeShellBlue",2,1],[["hgun_Pistol_Signal_F","","","",["6Rnd_GreenSignal_F",6],[],""],1]]],["USP_TACTICAL_PACK_CCT2",[["ACE_EntrenchingTool",1],["H_Cap_tan",1],["ToolKit",1],["rhsusf_ihadss",1],["rhsusf_m112_mag",1,1]]],"rhsusf_hgu56p_visor","",["ACE_Vector","","","",[],[],""],["ItemMap","ItemAndroid","","ItemCompass","ACE_Altimeter","NVGogglesB_blk_F"]];
 };
 class Cav_B_A_Helicopter_Tra_CrewChief_F: Cav_B_A_PilotBase_F {
     displayName = "Helicopter Crew Chief";
     category[] += {"cScripts_Loadout_Cat_Alpha_Rotary"};
     scope = 2;
-    loadout = [["rhs_weap_m249_pip_L_para_vfg2","ACE_muzzle_mzls_L","acc_pointer_IR","rhsusf_acc_ELCAN_ard",["rhsusf_200Rnd_556x45_box",200],[],"rhsusf_acc_grip4_bipod"],[],["rhsusf_weap_glock17g4","","acc_flashlight_pistol","",["rhsusf_mag_17Rnd_9x19_JHP",17],[],""],["USP_G3C_RS2_MC",[["ACE_Banana",1],["ACE_EarPlugs",1],["ACE_MapTools",1],["ACE_microDAGR",1],["ACE_tourniquet",4],["ACE_splint",4],["ACE_packingBandage",20],["kat_Painkiller",2,10]]],["UK3CB_V_Pilot_Vest",[["ACE_IR_Strobe_Item",2],["SmokeShellRed",2,1],["SmokeShell",4,1],["rhsusf_mag_17Rnd_9x19_JHP",1,17],["SmokeShellPurple",2,1],["ACE_HandFlare_Green",2,1],["SmokeShellBlue",2,1],["rhsusf_200Rnd_556x45_box",2,200],[["hgun_Pistol_Signal_F","","","",[],[],""],1]]],["USP_TACTICAL_PACK_CCT2",[["H_Cap_tan",1],["ACE_CableTie",2],["ACE_EntrenchingTool",1],["ToolKit",1],["kat_chestSeal",2],["kat_guedel",1],["kat_ncdKit",1]]],"rhsusf_hgu56p_visor_mask","",["ACE_Vector","","","",[],[],""],["ItemMap","ItemcTab","","ItemCompass","ACE_Altimeter","NVGogglesB_blk_F"]];
+    loadout = [["rhs_weap_m249_pip_L_para_vfg2","ACE_muzzle_mzls_L","acc_pointer_IR","rhsusf_acc_ELCAN_ard",["rhsusf_200Rnd_556x45_box",200],[],"rhsusf_acc_grip4_bipod"],[],["UK3CB_P320_BLK","","acc_flashlight_pistol","",["UK3CB_P320_9x21_17Rnd",17],[],""],["USP_G3C_RS2_MC",[["ACE_Banana",1],["ACE_EarPlugs",1],["ACE_MapTools",1],["ACE_microDAGR",1],["ACE_tourniquet",4],["ACE_splint",4],["ACE_packingBandage",20],["kat_Painkiller",2,10]]],["UK3CB_V_Pilot_Vest",[["ACE_IR_Strobe_Item",2],["SmokeShellRed",2,1],["SmokeShell",4,1],["UK3CB_P320_9x21_17Rnd",1,17],["SmokeShellPurple",2,1],["ACE_HandFlare_Green",2,1],["SmokeShellBlue",2,1],["rhsusf_200Rnd_556x45_box",2,200],[["hgun_Pistol_Signal_F","","","",[],[],""],1]]],["USP_TACTICAL_PACK_CCT2",[["H_Cap_tan",1],["ACE_CableTie",2],["ACE_EntrenchingTool",1],["ToolKit",1],["kat_chestSeal",2],["kat_guedel",1],["kat_ncdKit",1]]],"rhsusf_hgu56p_visor_mask","",["ACE_Vector","","","",[],[],""],["ItemMap","ItemcTab","","ItemCompass","ACE_Altimeter","NVGogglesB_blk_F"]];
     role = "rotarycrew";
 };
 
@@ -27,20 +27,20 @@ class Cav_B_A_Helicopter_Tra_DoorGunner_F: Cav_B_A_Helicopter_Tra_CrewChief_F {
     scope = 2;
     abilityMedic = 1;
     role = "rotarycls";
-    loadout = [["rhs_weap_m4a1_blockII_grip_bk","ACE_muzzle_mzls_L","acc_pointer_IR","rhsusf_acc_ACOG_RMR",["ACE_30Rnd_556x45_Stanag_M995_AP_mag",30],[],"rhsusf_acc_rvg_blk"],[],["rhsusf_weap_glock17g4","","acc_flashlight_pistol","",["rhsusf_mag_17Rnd_9x19_JHP",17],[],""],["USP_G3C_RS2_MC",[["ACE_Banana",1],["ACE_EarPlugs",1],["ACE_MapTools",1],["ACE_microDAGR",1],["ACE_tourniquet",4],["ACE_splint",4],["ACE_packingBandage",20],["kat_Painkiller",2,10]]],["UK3CB_V_Pilot_Vest",[["ACE_IR_Strobe_Item",2],["kat_chestSeal",2],["kat_guedel",1],["kat_ncdKit",1],["kat_Pulseoximeter",1],["ACE_elasticBandage",20],["ACE_quikclot",20],["ACE_splint",2],["ACE_tourniquet",2],["SmokeShellRed",2,1],["SmokeShell",4,1],["ACE_30Rnd_556x45_Stanag_M995_AP_mag",6,30],["rhsusf_mag_17Rnd_9x19_JHP",1,17],["SmokeShellPurple",2,1],["ACE_HandFlare_Green",2,1],["SmokeShellBlue",2,1],[["hgun_Pistol_Signal_F","","","",[],[],""],1]]],["USP_TACTICAL_PACK_CCT2",[["H_Cap_tan",1],["ACE_CableTie",2],["ACE_EntrenchingTool",1],["ToolKit",1],["rhsusf_m112_mag",1,1]]],"rhsusf_hgu56p_visor_mask","",["ACE_Vector","","","",[],[],""],["ItemMap","ItemcTab","","ItemCompass","ACE_Altimeter","NVGogglesB_blk_F"]];
+    loadout = [["rhs_weap_m4a1_blockII_grip_bk","ACE_muzzle_mzls_L","acc_pointer_IR","rhsusf_acc_ACOG_RMR",["ACE_30Rnd_556x45_Stanag_M995_AP_mag",30],[],"rhsusf_acc_rvg_blk"],[],["UK3CB_P320_BLK","","acc_flashlight_pistol","",["UK3CB_P320_9x21_17Rnd",17],[],""],["USP_G3C_RS2_MC",[["ACE_Banana",1],["ACE_EarPlugs",1],["ACE_MapTools",1],["ACE_microDAGR",1],["ACE_tourniquet",4],["ACE_splint",4],["ACE_packingBandage",20],["kat_Painkiller",2,10]]],["UK3CB_V_Pilot_Vest",[["ACE_IR_Strobe_Item",2],["kat_chestSeal",2],["kat_guedel",1],["kat_ncdKit",1],["kat_Pulseoximeter",1],["ACE_elasticBandage",20],["ACE_quikclot",20],["ACE_splint",2],["ACE_tourniquet",2],["SmokeShellRed",2,1],["SmokeShell",4,1],["ACE_30Rnd_556x45_Stanag_M995_AP_mag",6,30],["UK3CB_P320_9x21_17Rnd",1,17],["SmokeShellPurple",2,1],["ACE_HandFlare_Green",2,1],["SmokeShellBlue",2,1],[["hgun_Pistol_Signal_F","","","",[],[],""],1]]],["USP_TACTICAL_PACK_CCT2",[["H_Cap_tan",1],["ACE_CableTie",2],["ACE_EntrenchingTool",1],["ToolKit",1],["rhsusf_m112_mag",1,1]]],"rhsusf_hgu56p_visor_mask","",["ACE_Vector","","","",[],[],""],["ItemMap","ItemcTab","","ItemCompass","ACE_Altimeter","NVGogglesB_blk_F"]];
 };
 
 class Cav_B_A_Helicopter_Att_Pilot_F: Cav_B_A_Helicopter_Tra_Pilot_F {
     displayName = "$STR_Cav_Alpha_Characters_A_Helicopter_Att_Pilot";
     category[] += {"cScripts_Loadout_Cat_Alpha_Rotary"};
     scope = 2;
-    loadout = [["rhs_weap_m4a1_blockII_bk","ACE_muzzle_mzls_L","acc_pointer_IR","rhsusf_acc_ACOG_RMR",["ACE_30Rnd_556x45_Stanag_M995_AP_mag",30],[],"rhsusf_acc_rvg_blk"],[],["rhsusf_weap_glock17g4","","acc_flashlight_pistol","",["rhsusf_mag_17Rnd_9x19_JHP",17],[],""],["USP_G3C_RS2_MC",[["ACE_EarPlugs",1],["ACE_microDAGR",1],["ACE_MapTools",1],["ACE_splint",4],["ACE_tourniquet",4],["ACE_packingBandage",20],["ACE_Banana",1],["kat_Painkiller",2,10]]],["UK3CB_V_Pilot_Vest",[["ACE_IR_Strobe_Item",2],["kat_chestSeal",2],["kat_guedel",1],["kat_ncdKit",1],["SmokeShellRed",2,1],["SmokeShell",4,1],["SmokeShellPurple",2,1],["ACE_30Rnd_556x45_Stanag_M995_AP_mag",6,30],["rhsusf_mag_17Rnd_9x19_JHP",1,17],["ACE_HandFlare_Green",2,1],["SmokeShellBlue",2,1],[["hgun_Pistol_Signal_F","","","",["6Rnd_GreenSignal_F",6],[],""],1]]],["USP_TACTICAL_PACK_CCT2",[["ACE_EntrenchingTool",1],["H_Cap_tan",1],["ToolKit",1],["rhsusf_ihadss",1],["rhsusf_m112_mag",1,1]]],"rhsusf_hgu56p_visor","",["ACE_Vector","","","",[],[],""],["ItemMap","ItemAndroid","","ItemCompass","ACE_Altimeter","NVGogglesB_blk_F"]];
+    loadout = [["rhs_weap_m4a1_blockII_bk","ACE_muzzle_mzls_L","acc_pointer_IR","rhsusf_acc_ACOG_RMR",["ACE_30Rnd_556x45_Stanag_M995_AP_mag",30],[],"rhsusf_acc_rvg_blk"],[],["UK3CB_P320_BLK","","acc_flashlight_pistol","",["UK3CB_P320_9x21_17Rnd",17],[],""],["USP_G3C_RS2_MC",[["ACE_EarPlugs",1],["ACE_microDAGR",1],["ACE_MapTools",1],["ACE_splint",4],["ACE_tourniquet",4],["ACE_packingBandage",20],["ACE_Banana",1],["kat_Painkiller",2,10]]],["UK3CB_V_Pilot_Vest",[["ACE_IR_Strobe_Item",2],["kat_chestSeal",2],["kat_guedel",1],["kat_ncdKit",1],["SmokeShellRed",2,1],["SmokeShell",4,1],["SmokeShellPurple",2,1],["ACE_30Rnd_556x45_Stanag_M995_AP_mag",6,30],["UK3CB_P320_9x21_17Rnd",1,17],["ACE_HandFlare_Green",2,1],["SmokeShellBlue",2,1],[["hgun_Pistol_Signal_F","","","",["6Rnd_GreenSignal_F",6],[],""],1]]],["USP_TACTICAL_PACK_CCT2",[["ACE_EntrenchingTool",1],["H_Cap_tan",1],["ToolKit",1],["rhsusf_ihadss",1],["rhsusf_m112_mag",1,1]]],"rhsusf_hgu56p_visor","",["ACE_Vector","","","",[],[],""],["ItemMap","ItemAndroid","","ItemCompass","ACE_Altimeter","NVGogglesB_blk_F"]];
 };
 class Cav_B_A_Helicopter_Att_coPilot_F: Cav_B_A_Helicopter_Tra_Pilot_F {
     displayName = "$STR_Cav_Alpha_Characters_A_Helicopter_Att_coPilot";
     category[] += {"cScripts_Loadout_Cat_Alpha_Rotary"};
     scope = 2;
-    loadout = [["rhs_weap_m4a1_blockII_bk","ACE_muzzle_mzls_L","acc_pointer_IR","rhsusf_acc_ACOG_RMR",["ACE_30Rnd_556x45_Stanag_M995_AP_mag",30],[],"rhsusf_acc_rvg_blk"],[],["rhsusf_weap_glock17g4","","acc_flashlight_pistol","",["rhsusf_mag_17Rnd_9x19_JHP",17],[],""],["USP_G3C_RS2_MC",[["ACE_EarPlugs",1],["ACE_microDAGR",1],["ACE_MapTools",1],["ACE_splint",4],["ACE_tourniquet",4],["ACE_packingBandage",20],["ACE_Banana",1],["kat_Painkiller",2,10]]],["UK3CB_V_Pilot_Vest",[["ACE_IR_Strobe_Item",2],["kat_chestSeal",2],["kat_guedel",1],["kat_ncdKit",1],["SmokeShellRed",2,1],["SmokeShell",4,1],["SmokeShellPurple",2,1],["ACE_30Rnd_556x45_Stanag_M995_AP_mag",6,30],["rhsusf_mag_17Rnd_9x19_JHP",1,17],["ACE_HandFlare_Green",2,1],["SmokeShellBlue",2,1],[["hgun_Pistol_Signal_F","","","",["6Rnd_GreenSignal_F",6],[],""],1]]],["USP_TACTICAL_PACK_CCT2",[["ACE_EntrenchingTool",1],["H_Cap_tan",1],["ToolKit",1],["rhsusf_ihadss",1],["rhsusf_m112_mag",1,1]]],"rhsusf_hgu56p_visor","",["ACE_Vector","","","",[],[],""],["ItemMap","ItemAndroid","","ItemCompass","ACE_Altimeter","NVGogglesB_blk_F"]];
+    loadout = [["rhs_weap_m4a1_blockII_bk","ACE_muzzle_mzls_L","acc_pointer_IR","rhsusf_acc_ACOG_RMR",["ACE_30Rnd_556x45_Stanag_M995_AP_mag",30],[],"rhsusf_acc_rvg_blk"],[],["UK3CB_P320_BLK","","acc_flashlight_pistol","",["UK3CB_P320_9x21_17Rnd",17],[],""],["USP_G3C_RS2_MC",[["ACE_EarPlugs",1],["ACE_microDAGR",1],["ACE_MapTools",1],["ACE_splint",4],["ACE_tourniquet",4],["ACE_packingBandage",20],["ACE_Banana",1],["kat_Painkiller",2,10]]],["UK3CB_V_Pilot_Vest",[["ACE_IR_Strobe_Item",2],["kat_chestSeal",2],["kat_guedel",1],["kat_ncdKit",1],["SmokeShellRed",2,1],["SmokeShell",4,1],["SmokeShellPurple",2,1],["ACE_30Rnd_556x45_Stanag_M995_AP_mag",6,30],["UK3CB_P320_9x21_17Rnd",1,17],["ACE_HandFlare_Green",2,1],["SmokeShellBlue",2,1],[["hgun_Pistol_Signal_F","","","",["6Rnd_GreenSignal_F",6],[],""],1]]],["USP_TACTICAL_PACK_CCT2",[["ACE_EntrenchingTool",1],["H_Cap_tan",1],["ToolKit",1],["rhsusf_ihadss",1],["rhsusf_m112_mag",1,1]]],"rhsusf_hgu56p_visor","",["ACE_Vector","","","",[],[],""],["ItemMap","ItemAndroid","","ItemCompass","ACE_Altimeter","NVGogglesB_blk_F"]];
 };
 
 // Named
diff --git a/cScripts/Loadouts/CfgLoadouts_Bravo_Atlas.hpp b/cScripts/Loadouts/CfgLoadouts_Bravo_Atlas.hpp
index 0edc54d44..ea750644b 100644
--- a/cScripts/Loadouts/CfgLoadouts_Bravo_Atlas.hpp
+++ b/cScripts/Loadouts/CfgLoadouts_Bravo_Atlas.hpp
@@ -1,4 +1,5 @@
 class Cav_B_Bravo_Atlas_base_F: Cav_B_Bravo_base_F {
+    platoon = 1;
     scope = 0;
     category[] += {"cScripts_Loadout_Cat_Bravo_Atlas"};
     insignia = "cav_insignia_Specialized_Medic0";
diff --git a/cScripts/Loadouts/CfgLoadouts_Bravo_Viking.hpp b/cScripts/Loadouts/CfgLoadouts_Bravo_Viking.hpp
index 5126c998d..3833f66d9 100644
--- a/cScripts/Loadouts/CfgLoadouts_Bravo_Viking.hpp
+++ b/cScripts/Loadouts/CfgLoadouts_Bravo_Viking.hpp
@@ -1,4 +1,5 @@
 class Cav_B_B_Scout_Base_F: Cav_B_Bravo_base_F {
+    platoon = 2;
     scope = 0;
     role = "weapons";
 };
@@ -110,7 +111,7 @@ class Cav_B_B_Scout_CombatLifeSaver_F: Cav_B_B_Scout_Base_F {
     loadout = [["rhs_weap_m4a1_blockII_KAC","rhsusf_acc_SF3P556","rhsusf_acc_anpeq15","rhsusf_acc_ACOG_RMR",["rhs_mag_30Rnd_556x45_M855A1_PMAG",30],[],"rhsusf_acc_grip2"],[],[],["USP_G3C_RS_KP_OR_MC",[["ACE_packingBandage",10],["ACE_quikclot",10],["ACE_tourniquet",4],["ACE_microDAGR",1],["ACE_Flashlight_XL50",1],["ACE_MapTools",1],["ACE_splint",4]]],["USP_CRYE_JPC_ASLTB",[["kat_CarbonateItem",1],["ACE_epinephrine",3],["kat_phenylephrineAuto",3],["HandGrenade",4,1],["SmokeShell",4,1],["ACE_Chemlight_IR",2,1],["rhs_mag_mk3a2",4,1],["rhs_mag_30Rnd_556x45_M855A1_PMAG",8,30]]],["USP_DELTA_BAG_MC",[["ACE_EntrenchingTool",1],["ACE_packingBandage",40],["ACE_quikclot",40],["ACE_tourniquet",12],["ACE_splint",8],["ACE_EarPlugs",2],["kat_chestSeal",10],["kat_guedel",10],["kat_ncdKit",5],["kat_pocketBVM",1],["kat_accuvac",1],["kat_Painkiller",3,10]]],"USP_OPS_FASTXP_TAN_MC_03","USP_MFRAME_BLK2",["ACE_Vector","","","",[],[],""],["ItemMap","ItemAndroid","","ItemCompass","ItemWatch","USP_PVS15"]];
     insignia = "cav_insignia_specialized_cls";
     abilityMedic = 1;
-    role = "medic";
+    role = "cls";
     icon = "iconManMedic";
 };
 
diff --git a/cScripts/Loadouts/CfgLoadouts_Common.hpp b/cScripts/Loadouts/CfgLoadouts_Common.hpp
index 6405ebee7..8a2af07eb 100644
--- a/cScripts/Loadouts/CfgLoadouts_Common.hpp
+++ b/cScripts/Loadouts/CfgLoadouts_Common.hpp
@@ -1,6 +1,7 @@
 class CommonBlufor {
     //regiment = "";
     //company = "";
+    //platoon = 0;
 
     //displayName = "";
     //scope = 0;
diff --git a/cScripts/functions/gear/fn_gear_applyLoadout.sqf b/cScripts/functions/gear/fn_gear_applyLoadout.sqf
index 4888406a5..7636f6d0b 100644
--- a/cScripts/functions/gear/fn_gear_applyLoadout.sqf
+++ b/cScripts/functions/gear/fn_gear_applyLoadout.sqf
@@ -36,10 +36,11 @@ if (_loadConfig) then {
     };
     _unit setVariable [QEGVAR(Gear,LoadoutClass), _loadout];
 
-    // Company
+    // Organizaiton
     if (GVAR(isPlayer)) then {
-        private _company = getText (_config >> "company");
-        [_company] call EFUNC(player,setCompany);
+        private _configPlatoon = getNumber (_config >> "platoon");
+        private _configCompany = getText (_config >> "company");
+        [_configPlatoon,_configCompany] call EFUNC(Player,setOrganization);
     };
 };
 
diff --git a/cScripts/functions/init/fn_init_aceArsenal.sqf b/cScripts/functions/init/fn_init_aceArsenal.sqf
index 4a9972761..58bd6bb0c 100644
--- a/cScripts/functions/init/fn_init_aceArsenal.sqf
+++ b/cScripts/functions/init/fn_init_aceArsenal.sqf
@@ -40,7 +40,7 @@ GVAR(StagingArsenalOpen) = false;
 
 [QEGVAR(StagingArsenal,SaveWhitelist), {
     private _items = call FUNC(getArsenalWhitelist);
-    SETVAR(player,EGVAR(Player,ArsenalWhitelist), _items);
+    SETVAR(player,EGVAR(Player,ArsenalWhitelist),_items);
 }] call CBA_fnc_addEventHandler;
 
 
diff --git a/cScripts/functions/init/fn_init_logistics.sqf b/cScripts/functions/init/fn_init_logistics.sqf
index ce6e8088a..956a983c0 100644
--- a/cScripts/functions/init/fn_init_logistics.sqf
+++ b/cScripts/functions/init/fn_init_logistics.sqf
@@ -190,22 +190,6 @@ private _dataArray = [
         ["USP_OPS_FASTXP_TAN_MC_08", 0],
         ["USP_BOONIE_HAT_MC", 0],
 
-        // Weapons
-        ["dzn_MG_Tripod_M122A1_M240Mount_Carry", 0],
-        ["ace_csw_carryMortarBaseplate", 0],
-        ["ace_csw_staticMortarCarry", 0],
-
-        ["avm224_W_M224_mortar_carry", 0],
-        ["avm224_M_6Rnd_60mm_HE_csw", 0],
-        ["avm224_M_6Rnd_60mm_HE_0_csw", 0],
-        ["avm224_M_6Rnd_60mm_ILLUM_IR_csw", 0],
-        ["avm224_M_6Rnd_60mm_SMOKE_csw", 0],
-
-        ["ACE_1Rnd_82mm_Mo_HE", 0],
-        ["ACE_1Rnd_82mm_Mo_Illum", 0],
-        ["ACE_1Rnd_82mm_Mo_HE_LaserGuided", 0],
-        ["ACE_1Rnd_82mm_Mo_Smoke", 0],
-
         // Ammo
         ["rhs_mag_30Rnd_556x45_M855A1_PMAG", 0],
         ["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tracer_Red", 50],
@@ -214,17 +198,6 @@ private _dataArray = [
         ["30Rnd_556x45_Stanag_Sand_red", 0],
         ["30Rnd_556x45_Stanag_red", 0],
         ["rhs_mag_30Rnd_556x45_Mk262_PMAG", 0],
-        ["rhsusf_200Rnd_556x45_mixed_soft_pouch", 0],
-        ["rhsusf_100Rnd_762x51_m62_tracer", 0],
-        ["rhs_mag_M397_HET", 0],
-        ["rhs_mag_M433_HEDP", 50],
-        ["ACE_HuntIR_M203", 0],
-        ["ACE_40mm_Flare_white", 0],
-        ["ACE_40mm_Flare_red", 0],
-        ["ACE_40mm_Flare_ir", 0],
-        ["rhs_mag_m664_red_cluster", 0],
-        ["rhs_mag_m713_Red", 0],
-        ["rhs_mag_m716_yellow", 0],
         
         // NVG
         ["USP_PVS14", 0],
@@ -248,20 +221,9 @@ private _dataArray = [
 
         // Backpacks
         ["B_Carryall_mcamo", 0],
-        ["B_UAV_01_backpack_F", 0],
         ["B_Kitbag_mcamo", 0],
         ["UK3CB_B_Backpack_Pocket_OLI", 0],
-        ["UK3CB_B_Backpack_Pocket", 0],
-        ["B_rhsusf_B_BACKPACK", 0],
-        ["USP_TACTICAL_PACK_CCT", 0],
-        ["USP_TACTICAL_PACK_CCT2", 0],
-        ["USP_TACTICAL_PACK_CCT3", 0],
-        ["USP_TACTICAL_PACK_CCT4", 0],
-        ["USP_TACTICAL_PACK_CCT5", 0],
-        ["USP_TACTICAL_PACK_CCT6", 0],
-        ["USP_TACTICAL_PACK_CCT7", 0],
-        ["USP_TACTICAL_PACK_CCT8", 0],
-        ["UK3CB_US_B_B_RIF_OCP_Radio", 0]
+        ["UK3CB_B_Backpack_Pocket", 0]
     ]],
 
     ["bravo_company_viking", [
@@ -272,14 +234,23 @@ private _dataArray = [
         ["TFAR_anprc152", 0],
 
         // Lunchers and mortars
+        ["rhs_weap_M136_hp",0],
+        ["rhs_weap_M136",0],
         ["rhs_weap_M136_hedp",1],
-        ["rhs_weap_m72a7",10],
-        ["rhs_weap_fgm148",1],
-        ["rhs_weap_fim92",1],
-        ["dzn_MG_Tripod_M122A1_M240Mount_Carry",2],
-        ["ace_csw_carryMortarBaseplate",2],
-        ["ace_csw_staticMortarCarry",2],
-        ["avm224_W_M224_mortar_carry",2],
+        ["rhs_weap_m72a7",0],
+        ["dzn_MG_Tripod_M122A1_M240Mount_Carry", 0],
+        ["ace_csw_carryMortarBaseplate", 0],
+        ["ace_compat_rhs_usf3_m252_carry", 0],
+
+        ["avm224_W_M224_mortar_carry", 0],
+        ["avm224_M_6Rnd_60mm_HE_csw", 0],
+        ["avm224_M_6Rnd_60mm_HE_0_csw", 0],
+        ["avm224_M_6Rnd_60mm_ILLUM_IR_csw", 0],
+        ["avm224_M_6Rnd_60mm_SMOKE_csw", 0],
+
+        ["ACE_1Rnd_82mm_Mo_HE", 0],
+        ["ACE_1Rnd_82mm_Mo_Illum", 0],
+        ["ACE_1Rnd_82mm_Mo_Smoke", 0],
 
         // Ammo
         ["rhs_mag_30Rnd_556x45_M855A1_PMAG",0],
@@ -318,14 +289,6 @@ private _dataArray = [
         ["ACE_Chemlight_HiBlue",0],
         ["ACE_Chemlight_HiRed",0],
 
-        // Medical
-        ["ACE_EarPlugs",10],
-        ["kat_chestSeal",0],
-        ["ACE_quikclot",0],
-        ["ACE_tourniquet",0],
-        ["kat_Painkiller",0],
-        ["kat_PainkillerItem",0],
-
         // Mines and Explosives
         ["ACE_Clacker",0],
         ["ACE_DefusalKit",0],
@@ -343,121 +306,22 @@ private _dataArray = [
     ]],
 
     ["bravo_company_atlas", [
+        
+        // Radios
+        ["ACRE_PRC343", 0],
+        ["ACRE_PRC152", 0],
+        ["TFAR_anprc152", 0],
         ["ACE_microDAGR",0],
         ["ItemAndroid",0],
         ["ItemAndroidMisc",0],
 
-        // AEDs
-        ["kat_AED",0],
-        ["kat_X_AED",0],
-
-        // Airway Management and Respiration
-        ["kat_aatKit",0],
-        ["kat_accuvac",0],
-        ["kat_BVM",0],
-        ["kat_chestSeal",0],
-        ["kat_guedel",0],
-        ["kat_larynx",0],
-        ["kat_ncdKit",0],
-        ["kat_pocketBVM",0],
-
-        // Autoinjectors
-        ["ACE_adenosine",0],
-        ["ACE_epinephrine",0],
-        ["ACE_morphine",0],
-        ["kat_phenylephrineAuto",0],
-
-        // Bandages and Stitching
-        ["ACE_elasticBandage",0],
-        ["ACE_packingBandage",0],
-        ["ACE_quikclot",0],
-        ["ACE_surgicalKit",0],
-
-        // Diagnostic Tools
-        ["kat_Pulseoximeter",0],
-        ["kat_ultrasound",0],
-        ["kat_stethoscope",0],
-
-        // Fluids
-        ["ACE_bloodIV",0],
-        ["ACE_bloodIV_250",0],
-        ["ACE_bloodIV_500",0],
-        ["ACE_plasmaIV",0],
-        ["ACE_plasmaIV_250",0],
-        ["ACE_plasmaIV_500",0],
-        ["ACE_salineIV",0],
-        ["ACE_salineIV_250",0],
-        ["ACE_salineIV_500",0],
-
-        //Pills and Inhalants
-        ["kat_Carbonate",0],
-        ["kat_CarbonateItem",0],
-        ["kat_naloxone",0],
-        ["kat_Painkiller",0],
-        ["kat_PainkillerItem",0],
-        ["kat_PenthroxItem",0],
-
-        // Massive Hemorrhage Control
-        ["kat_reboa",0],
-        ["ACE_tourniquet",0],
-
-        //--------------------------
-        // Catheters and Medication
-        //--------------------------
-
-        // Catheters
-        ["kat_IV_16",0],
-        ["kat_IO_FAST",0],
-    
-        // Analgesic Medication
-        ["kat_fentanyl",0],
-        ["kat_ketamine",0],
-        ["kat_nalbuphine",0],
-
-        // BP Medication
-        ["kat_nitroglycerin",0],
-        ["kat_norepinephrine",0],
-        ["kat_phenylephrine",0],
-        
-        // Cardiac resuscitation
-        ["kat_amiodarone",0],
-        ["kat_atropine",0],
-
-        // Hemorrhage control
-        ["kat_EACA",0],
-        ["kat_TXA",0],
-
-        // Surgical Medication
-        ["kat_etomidate",0],
-        ["kat_flumazenil",0],
-        ["kat_lidocaine",0],
-        ["kat_lorazepam",0],
-        //--------------------------
-
-        //--------------------------
-        // Surgery and Fractures
-        //--------------------------
-
-        // Debridement
-        ["kat_vacuum",0],
-
-        // Splints
-        ["ACE_splint",0],
-
-        // Surgical Equipment
-        ["kat_clamp",0],
-        ["kat_plate",0],
-        ["kat_retractor",0],
-        ["kat_scalpel",0],
-        //--------------------------
-
         // Tools and Items
+        ["ACE_Flashlight_MX991",0],
         ["ACE_CableTie",0],
         ["ACE_Chemlight_Shield",0],
         ["ACE_EntrenchingTool",0],
         ["ACE_IR_Strobe_Item",0],
         ["ACE_wirecutter",10],
-        ["Rev_pelican_item",0],
 
         // Medical
         ["ACE_EarPlugs",10],
@@ -558,7 +422,6 @@ private _dataArray = [
 
         // Tools and Items
         ["ACE_CableTie",0],
-        ["USP_PVS15",0],
         ["ACE_EntrenchingTool",10],
         ["ACE_wirecutter",10],
         ["rhs_weap_rsp30_green",0],
@@ -603,7 +466,7 @@ private _dataArray = [
         // Autoinjector Medication
         ["kat_naloxone",20],
         ["ACE_epinephrine",20],
-        ["kat_phenylephrine_inject",24],
+        ["kat_phenylephrineAuto",24],
         
         // Oral Medication
         ["kat_Painkiller",60],
@@ -915,7 +778,7 @@ private _dataArray = [
         ["kat_naloxone",20],
         ["ACE_morphine",20],
         ["ACE_epinephrine",40],
-        ["kat_phenylephrine_inject",40],
+        ["kat_phenylephrineAuto",40],
         ["ACE_adenosine",0],
 
         // Splints
@@ -1036,7 +899,7 @@ private _dataArray = [
         ["rhs_weap_M136_hedp",2],
 
         // M320 Ammo
-        ["rhsusf_mag_M433_HEDP",20],
+        ["rhs_mag_M433_HEDP",20],
         ["rhs_mag_m714_White",6],
         ["rhs_mag_m713_Red",4],
         ["ACE_HuntIR_M203",1],
@@ -1487,6 +1350,7 @@ private _dataArray = [
 
         // Bandages and Stitching
         ["ACE_packingBandage",0],
+        ["ACE_quikclot",0],
 
         //Pills and Inhalants
         ["kat_Painkiller",0],
@@ -1499,7 +1363,10 @@ private _dataArray = [
         ["ACE_splint",0],
 
         // Night Gear
-        ["ACE_IR_Strobe_Item",0]
+        ["ACE_IR_Strobe_Item",0],
+        
+        // Radios
+        ["TFAR_anprc152", 0]
     ]],
 
     ["arsenal_company_fallback", [
@@ -1544,6 +1411,7 @@ private _dataArray = [
         ["ItemAndroid", 0],
         ["rhsusf_weap_glock17g4", 0],
         ["rhsusf_mag_17Rnd_9x19_FMJ",0],
+        ["acc_pistol_flashlight",0],
         ["USP_VEST_STRANDHOGG2_MC", 0],
         ["USP_VEST_STRANDHOGG2_CBR", 0],
         ["ACE_Vector", 0],
@@ -1565,6 +1433,7 @@ private _dataArray = [
         ["ACE_MX2A", 0],
         ["rhsusf_weap_glock17g4", 0],
         ["rhsusf_mag_17Rnd_9x19_FMJ",0],
+        ["acc_pistol_flashlight",0],
         ["USP_VEST_STRANDHOGG2_MC", 0],
         ["USP_VEST_STRANDHOGG2_CBR", 0],
         ["ACE_HuntIR_monitor", 0],
@@ -1705,6 +1574,7 @@ private _dataArray = [
         ["kat_larynx",0],
         ["kat_ncdKit",0],
         ["kat_pocketBVM",0],
+        ["kat_suction",0],
 
         // Autoinjectors
         ["ACE_adenosine",0],
@@ -1803,6 +1673,7 @@ private _dataArray = [
         ["kat_guedel",0],
         ["kat_ncdKit",0],
         ["kat_pocketBVM",0],
+        ["kat_suction",0],
 
         // Autoinjectors
         ["ACE_adenosine",0],
@@ -1869,8 +1740,19 @@ private _dataArray = [
         ["kat_TXA",0],
 
         // Splints
-        ["ACE_splint",0]
+        ["ACE_splint",0],
         //--------------------------
+
+        //Backpack
+        ["USP_TACTICAL_PACK_CCT", 0],
+        ["USP_TACTICAL_PACK_CCT2", 0],
+        ["USP_TACTICAL_PACK_CCT3", 0],
+        ["USP_TACTICAL_PACK_CCT4", 0],
+        ["USP_TACTICAL_PACK_CCT5", 0],
+        ["USP_TACTICAL_PACK_CCT6", 0],
+        ["USP_TACTICAL_PACK_CCT7", 0],
+        ["USP_TACTICAL_PACK_CCT8", 0],
+        ["UK3CB_US_B_B_RIF_OCP_Radio", 0]
     ]],
     ["arsenal_role_cls",[
         // Airway Management and Respiration
@@ -1879,6 +1761,7 @@ private _dataArray = [
         ["kat_guedel",0],
         ["kat_ncdKit",0],
         ["kat_pocketBVM",0],
+        ["kat_suction",0],
 
         // Autoinjectors
         ["ACE_epinephrine",0],
@@ -1893,7 +1776,6 @@ private _dataArray = [
         ["kat_CarbonateItem",0],
         ["kat_Painkiller",0],
         ["kat_PainkillerItem",0],
-        ["kat_PenthroxItem",0],
 
         // Massive Hemorrhage Control
         ["ACE_tourniquet",0],
@@ -2161,7 +2043,11 @@ private _dataArray = [
         ["rhsusf_weap_glock17g4",0],
         ["rhsusf_weap_m1911a1",0],
         ["rhsusf_mag_7x45acp_MHP",0],
-        ["rhsusf_mag_17Rnd_9x19_FMJ",0]
+        ["rhsusf_mag_17Rnd_9x19_FMJ",0],
+        ["UK3CB_P320_DES",0],
+        ["UK3CB_P320_BLK",0],
+        ["UK3CB_P320_9x21_17Rnd",0],
+        ["acc_pistol_flashlight",0]
     ]]
 ];
 
diff --git a/cScripts/functions/players/fn_player_getOrganization.sqf b/cScripts/functions/players/fn_player_getOrganization.sqf
new file mode 100644
index 000000000..fffb97f57
--- /dev/null
+++ b/cScripts/functions/players/fn_player_getOrganization.sqf
@@ -0,0 +1,29 @@
+#include "..\script_component.hpp";
+/*
+ * Author: SGT.Brostrom.A
+ * This function return your platoon and company
+ *
+ * Arguments:
+ * None
+ *
+ * Return Value:
+ * Organization <ARRAY>
+ *
+ * Example:
+ * call cScripts_fnc_player_getOrganization;
+ *
+ * Public: No
+ */
+
+private _loadout = [player] call EFUNC(gear,getLoadoutName);
+
+private _config = missionConfigFile >> "CfgLoadouts" >> _loadout;
+
+private _configPlatoon = getNumber (_config >> "platoon"); 
+private _platoon = GETVAR(player,EGVAR(Player,Platoon),_configPlatoon);
+
+private _configCompany = getText (_config >> "company"); 
+private _company = GETVAR(player,EGVAR(Player,Company),_configCompany);
+_company = toLower _company;
+
+[_platoon, _company]
\ No newline at end of file
diff --git a/cScripts/functions/players/fn_player_getPlatoon.sqf b/cScripts/functions/players/fn_player_getPlatoon.sqf
new file mode 100644
index 000000000..dc37dccf9
--- /dev/null
+++ b/cScripts/functions/players/fn_player_getPlatoon.sqf
@@ -0,0 +1,20 @@
+#include "..\script_component.hpp";
+/*
+ * Author: SGT.Brostrom.A
+ * This function return your platoon
+ *
+ * Arguments:
+ * None
+ *
+ * Return Value:
+ * Platoon Number <NUMBER>
+ *
+ * Example:
+ * call cScripts_fnc_player_getPlatoon;
+ *
+ * Public: No
+ */
+
+private _platoon = GETVAR(player,EGVAR(Player,Platoon), 0);
+
+_platoon
\ No newline at end of file
diff --git a/cScripts/functions/players/fn_player_setCompany.sqf b/cScripts/functions/players/fn_player_setCompany.sqf
deleted file mode 100644
index 9e74e0031..000000000
--- a/cScripts/functions/players/fn_player_setCompany.sqf
+++ /dev/null
@@ -1,25 +0,0 @@
-#include "..\script_component.hpp";
-/*
- * Author: SGT.Brostrom.A
- * This function sets your set your company name
- *
- * Arguments:
- * 0: Company <STRING>
- *
- * Return Value:
- * Company Name <STRING>
- *
- * Example:
- * ["Charlie"] call cScripts_fnc_player_setCompany;
- *
- * Public: No
- */
-
-params [["_company", "", [""]]];
-
-_company = toLower _company;
-SETVAR(player,EGVAR(Player,Company),_company);
-
-INFO_2("Player", "%1 have company set to '%2'", name _unit, _company);
-
-_company
\ No newline at end of file
diff --git a/cScripts/functions/players/fn_player_setOrganization.sqf b/cScripts/functions/players/fn_player_setOrganization.sqf
new file mode 100644
index 000000000..dbce26ae9
--- /dev/null
+++ b/cScripts/functions/players/fn_player_setOrganization.sqf
@@ -0,0 +1,39 @@
+#include "..\script_component.hpp";
+/*
+ * Author: SGT.Brostrom.A
+ * This function sets your set your company name
+ *
+ * Arguments:
+ * 0: Platoon <INTEGER>
+ * 1: Company <STRING>
+ *
+ * Return Value:
+ * Organization <ARRAY>
+ *
+ * Example:
+ * [2,"Charlie"] call cScripts_fnc_player_setOrganization;
+ *
+ * Public: No
+ */
+
+params [
+    ["_platoon", 0, [0]],
+    ["_company", "", [""]]
+];
+
+// Set platoon number
+if (_platoon < 0 || _platoon > 4) then {
+    SHOW_WARNING_1("Player","Platoon number '%1' is invalid. Must be between 0 and 4. Setting to default.",_platoon);
+    _platoon = 0;
+};
+
+SETVAR(player,EGVAR(Player,Platoon),_platoon);
+
+// Set company name
+_company = toLower _company;
+SETVAR(player,EGVAR(Player,Company),_company);
+
+private _unit = name player;
+INFO_3("Player", "%1 have company set to '%2' and platoon set to '%3'",_unit,_company,_platoon);
+
+[_platoon, _company]
\ No newline at end of file
diff --git a/cScripts/functions/players/fn_unit_getVariables.sqf b/cScripts/functions/players/fn_unit_getVariables.sqf
index 97dc11ec9..39f7bc5ff 100644
--- a/cScripts/functions/players/fn_unit_getVariables.sqf
+++ b/cScripts/functions/players/fn_unit_getVariables.sqf
@@ -32,6 +32,7 @@ private _rank_bis = GETVAR(_unit,EGVAR(Player,Rank),"PRIVATE");
 
 private _regiment = "";
 private _company = GETVAR(player,EGVAR(Player,Company), "");
+private _platoon = GETVAR(player,EGVAR(Player,Platoon), 0);
 private _squad = GETVAR(_unit,EGVAR(Player,Squad),groupId group _unit);
 private _squadInsignia = [_unit] call BIS_fnc_getUnitInsignia;
 private _team = "";
@@ -57,6 +58,7 @@ private _map = createHashMapFromArray [
 
     ["regiment",            _regiment],
     ["company",             _company],
+    ["platoon",             _platoon],
     ["squad",               _squad],
     ["squadInsignia",       _squadInsignia],
     ["team",                _team],             // Team Color
diff --git a/cScripts/functions/systems/fn_addLoadoutSelection.sqf b/cScripts/functions/systems/fn_addLoadoutSelection.sqf
index 8c2da6b39..ac727f140 100644
--- a/cScripts/functions/systems/fn_addLoadoutSelection.sqf
+++ b/cScripts/functions/systems/fn_addLoadoutSelection.sqf
@@ -27,6 +27,7 @@ params [
     ["_icon", "", [""]],
     ["_category", ["ACE_MainActions", "cScripts_Loadout_Cat_Main"], [[]]],
     ["_company", "", [""]],
+    ["_platoon", 0, [0]],
     ["_allowAllLoadouts", false]
 ];
 
@@ -35,7 +36,7 @@ private _condition = {
     _params params ["_className", "_company", "_allowAllLoadouts"];
     if (_allowAllLoadouts) exitWith {true};
     if ([player] call EFUNC(gear,getLoadoutName) == _className) exitWith {true};
-    if ([_company] call FUNC(allowLoadout)) exitWith {true};
+    if ([_company,_platoon] call FUNC(allowLoadout)) exitWith {true};
     false
 };
 
diff --git a/cScripts/functions/systems/fn_allowLoadout.sqf b/cScripts/functions/systems/fn_allowLoadout.sqf
index b2f78c0e2..aa518c7d9 100644
--- a/cScripts/functions/systems/fn_allowLoadout.sqf
+++ b/cScripts/functions/systems/fn_allowLoadout.sqf
@@ -15,13 +15,16 @@
  * Public: No
  */
 
-params ["_company"];
+params ["_company", "_platoon"];
 
 _company = toLower _company;
 
 // If you dont have a company don't show any.
 if (_company == "") exitWith {false};
 
+// There are 4 platoons in a company. 0 is for if there is no difference between the companies.
+if (_platoon < 0 || _platoon > 4) exitWith {false};
+
 
 // Show all loadouts
 if (EGVAR(Settings,showAllLoadouts)) exitWith {true};
diff --git a/cScripts/functions/systems/fn_getArsenalWhitelist.sqf b/cScripts/functions/systems/fn_getArsenalWhitelist.sqf
index 761a60d77..906164d11 100644
--- a/cScripts/functions/systems/fn_getArsenalWhitelist.sqf
+++ b/cScripts/functions/systems/fn_getArsenalWhitelist.sqf
@@ -28,11 +28,28 @@ _unitItems = _unitItems arrayIntersect _unitItems select {_x isEqualType "" && {
 private _commonGear = GET_CONTAINER_KEYS("arsenal_common");
 
 
-private _company = call EFUNC(player,getCompany);
-private _companyItems = switch (_company) do {
-    case "alpha": {GET_CONTAINER_KEYS("alpha_company");};
-    case "bravo": {GET_CONTAINER_KEYS("bravo_company");};
-    case "charlie": {GET_CONTAINER_KEYS("charlie_company");};
+private _organization = call EFUNC(Player,getOrganization);
+private _orgItems = switch (_organization#1) do {
+    case "alpha": {
+        GET_CONTAINER_KEYS("alpha_company");
+    };
+    case "bravo": {
+        // Bravo has two platoons that have different requirements
+        private _companyItems = GET_CONTAINER_KEYS("bravo_company");
+        private _platoonItems = switch (_organization#0) do {
+            case 1: {
+                GET_CONTAINER_KEYS("bravo_company_atlas");
+            };
+            case 2: {
+                GET_CONTAINER_KEYS("bravo_company_viking");
+            };
+            default {[]};
+        };
+        _companyItems + _platoonItems;
+    };
+    case "charlie": {
+        GET_CONTAINER_KEYS("charlie_company");
+    };
     default {GET_CONTAINER_KEYS("arsenal_company_fallback");};
 };
 
@@ -82,6 +99,8 @@ private _handgunWeapon = if (!isNil{_loadout#2#0}) then {_loadout#2#0} else {""}
 private _handgunSpecific = switch (true) do {
     case (_handgunWeapon isKindOf ['rhs_weap_M320', configFile >> 'CfgWeapons']): {GET_CONTAINER_KEYS("arsenal_weap_ugl");};
     case (_handgunWeapon isKindOf ['rhsusf_weap_glock17g4', configFile >> 'CfgWeapons']
+            || _handgunWeapon isKindOf ['UK3CB_P320_BLK', configFile >> 'CfgWeapons']
+            || _handgunWeapon isKindOf ['UK3CB_P320_DES', configFile >> 'CfgWeapons']
             || _handgunWeapon isKindOf ['rhsusf_weap_m1911a1', configFile >> 'CfgWeapons']): {GET_CONTAINER_KEYS("arsenal_weap_sidearm");};
     default {[]};
 };
@@ -97,6 +116,6 @@ private _launcherSpecific = switch (true) do {
     default {[]};
 };
 
-private _whitelist = _commonGear + _unitItems + _companyItems + _roleSpecific + _primarySpecific + _handgunSpecific + _launcherSpecific;
+private _whitelist = _commonGear + _unitItems + _orgItems + _roleSpecific + _primarySpecific + _handgunSpecific + _launcherSpecific;
 
 _whitelist
diff --git a/cScripts/functions/systems/fn_setupLoadoutSelection.sqf b/cScripts/functions/systems/fn_setupLoadoutSelection.sqf
index 7b390933f..a78d638e8 100644
--- a/cScripts/functions/systems/fn_setupLoadoutSelection.sqf
+++ b/cScripts/functions/systems/fn_setupLoadoutSelection.sqf
@@ -39,12 +39,13 @@ private _classnameList = configProperties [missionconfigfile >> "CfgLoadouts", "
     private _icon = getText (missionConfigFile >> 'CfgLoadouts' >> _class >> "icon") call FUNC(getIcon);
     if (isNil{_icon}) then { _icon = "iconMan" };
     private _company = getText (missionConfigFile >> 'CfgLoadouts' >> _class >> "company");
+    private _platoon = getNumber (missionConfigFile >> 'CfgLoadouts' >> _class >> "platoon");
     private _category = getArray (missionConfigFile >> 'CfgLoadouts' >> _class >> "category");
     
     INFO_2("LoadoutSelector", "Setting up %1 loadout on %2.", _displayName, _object);
 
     _category = [_aceCategory, _mainCategory] + _category;
-    [_object, _displayName, _classname, _icon, _category, _company, _allowAllLoadouts] call FUNC(addLoadoutSelection);
+    [_object, _displayName, _classname, _icon, _category, _company, _platoon, _allowAllLoadouts] call FUNC(addLoadoutSelection);
 } forEach _classnameList;
 
 INFO_1("LoadoutSelector", "Done setting up quick selections on %1.", _object);
\ No newline at end of file