diff --git a/addons/jam/CfgMagazineWells.hpp b/addons/jam/CfgMagazineWells.hpp
index 9b23f3243..2f9bf883c 100644
--- a/addons/jam/CfgMagazineWells.hpp
+++ b/addons/jam/CfgMagazineWells.hpp
@@ -1,174 +1,60 @@
 class CfgMagazineWells {
-    class CBA_545x39_AK {
-        BI_mags[] = {
-            "30Rnd_545x39_Mag_F",
-            "30Rnd_545x39_Mag_Green_F",
-            "30Rnd_545x39_Mag_Tracer_F",
-            "30Rnd_545x39_Mag_Tracer_Green_F"
-        };
-    };
-
-    class CBA_556x45_MINIMI {
-        BI_boxes[] = {
-            "200Rnd_556x45_Box_F",
-            "200Rnd_556x45_Box_Red_F",
-            "200Rnd_556x45_Box_Tracer_F",
-            "200Rnd_556x45_Box_Tracer_Red_F"
-        };
-    };
-    class CBA_556x45_STANAG {
-        BI_mags[] = {
-            "30Rnd_556x45_Stanag",
-            "30Rnd_556x45_Stanag_green",
-            "30Rnd_556x45_Stanag_red",
-            "30Rnd_556x45_Stanag_Tracer_Red",
-            "30Rnd_556x45_Stanag_Tracer_Green",
-            "30Rnd_556x45_Stanag_Tracer_Yellow"
-        };
-        BI_drums[] = {
-            "150Rnd_556x45_Drum_Mag_F",
-            "150Rnd_556x45_Drum_Mag_Tracer_F"
-        };
-    };
-
-    class CBA_556x45_STEYR {};        // AUG
-    class CBA_556x45_HK33 {};         // H&K 33/53/93
-    class CBA_556x45_G36 {};
-    class CBA_556x45_SG550 {};
-
-    class CBA_580x42_TYPE95 {
-        BI_mags[] = {
-            "30Rnd_580x42_Mag_F",
-            "30Rnd_580x42_Mag_Tracer_F"
-        };
-        BI_drums[] = {
-            "100Rnd_580x42_Mag_F",
-            "100Rnd_580x42_Mag_Tracer_F"
-        };
-    };
-
-    class CBA_65x39_MX {
-        BI_mags[] = {
-            "30Rnd_65x39_caseless_mag",
-            "30Rnd_65x39_caseless_green",
-            "30Rnd_65x39_caseless_mag_Tracer",
-            "30Rnd_65x39_caseless_green_mag_Tracer",
-            "100Rnd_65x39_caseless_mag",
-            "100Rnd_65x39_caseless_mag_Tracer"
-        };
-    };
+    #include "magwells_556x45.hpp"
+    #include "magwells_545x39.hpp"
+    #include "magwells_580x42.hpp"
+    #include "magwells_65x39.hpp"
+    #include "magwells_762x39.hpp"
+    #include "magwells_762x51.hpp"
+    #include "magwells_762x54.hpp"
+    #include "magwells_77x58.hpp"
+    #include "magwells_792x57.hpp"
+    #include "magwells_145x114.hpp"
+    #include "magwells_303B.hpp"
+    #include "magwells_3006.hpp"
+
+    #include "magwells_762x25.hpp"
+    #include "magwells_8x22.hpp"
+    #include "magwells_9x19.hpp"
+    #include "magwells_22LR.hpp"
+    #include "magwells_32ACP.hpp"
+    #include "magwells_357SIG.hpp"
+    #include "magwells_40SW.hpp"
+    #include "magwells_45ACP.hpp"
+
+    #include "magwells_10gauge.hpp"
+    #include "magwells_12gauge.hpp"
+    #include "magwells_16gauge.hpp"
+    #include "magwells_20gauge.hpp"
+
+    class CBA_762x38R_Nagant {};    // Nagant M1895 Revolver
+    class CBA_763x25_C96 {};        // Mauser C-96 in 7.63x25mm
+    class CBA_765x21_C96 {};        // Mauser C-96 in 7.65x21mm
+    class CBA_10x25_MP5 {};         // H&K MP5/10 10mm Auto
+    class CBA_38_200_Webley {};     // Webley Revolver in .38/200
+    class CBA_455_Webley {};        // Webley Revolver in .455 Webley
 
     class CBA_68x43_ACR {};         // 6.8mm Remington SPC
     class CBA_75x55_STGW57 {};      // SIG SG 510-1, Stgw. 57
     class CBA_762x35_STANAG {};     // .300 Blackout
-
-    class CBA_762x39_AK {
-        BI_mags[] = {
-            "30Rnd_762x39_Mag_F",
-            "30Rnd_762x39_Mag_Green_F",
-            "30Rnd_762x39_Mag_Tracer_F",
-            "30Rnd_762x39_Mag_Tracer_Green_F"
-        };
-    };
-
-    class CBA_762x51_M14 {
-        BI_mags[] = {
-            "20Rnd_762x51_Mag"
-        };
-    };
-    class CBA_762x51_HK417 {
-        BI_mags[] = {
-            "20Rnd_762x51_Mag"
-        };
-    };
-    class CBA_762x51_SR25 {};       // M110, SIG716
-    class CBA_762x51_SCAR {};
-    class CBA_762x51_FAL {};
-    class CBA_762x51_G3 {};
-    class CBA_762x51_SIGAMT {};    // SIG 510-4, AMT
-
-    class CBA_762x51_LINKS {
-        BI_belts[] = {
-            "150Rnd_762x51_Box",
-            "150Rnd_762x51_Box_Tracer"
-        };
-    };
-
-    class CBA_762x54R_SVD {
-        BI_mags[] = {
-            "10Rnd_762x54_Mag"
-        };
-    };
-    class CBA_762x54R_LINKS {
-        BI_belts[] = {
-            "150Rnd_762x54_Box",
-            "150Rnd_762x54_Box_Tracer"
-        };
-    };
-
-    class CBA_792x57_LINKS {};      // MG42
+    class CBA_792x33_StG {};        // StG44
+    class CBA_9x39_VSS {};          // Vintorez, Val
+    class CBA_11mm_Vickers {};      // Vickers machine gun in 11mm Vickers
     class CBA_300WM_AI {};          // AI .300 Winchester Magnum
     class CBA_338LM_AI {};          // AI .338 Lapua Magnum
     class CBA_50BMG_M107 {};        // M82, M107, G82
 
-    class CBA_9x19_MP5 {};          // H&K MP5
-    class CBA_9x19_STEYR {};        // AUG SMG, MPi, TMP
-    class CBA_9x19_P226 {};         // SIG P226
-    class CBA_9x19_P228 {};         // SIG P228
-    class CBA_9x19_P239 {};         // SIG P239
-
-    class CBA_9x39_VSS {};          // Vintorez, Val
-
-    class CBA_357SIG_P226 {};       // SIG P226
-    class CBA_357SIG_P229 {};       // SIG P229
-    class CBA_357SIG_P239 {};       // SIG P239
+    class CBA_35mm_Type10 {};       // Japanese Type 10 Flare Pistol
 
-    class CBA_40SW_P226 {};         // SIG P226 .40 S&W
-    class CBA_40SW_P229 {};         // SIG P229 .40 S&W
-    class CBA_40SW_P239 {};         // SIG P239 .40 S&W
+    #include "magwells_40mm.hpp"
 
-    class CBA_10x25_MP5 {};         // H&K MP5/10 10mm Auto
-    class CBA_12g_SAIGA {};
-
-    class CBA_40mm_M203 {
-        BI_grenades[] = {
-            "1Rnd_HE_Grenade_shell",
-            "1Rnd_Smoke_Grenade_shell",
-            "1Rnd_SmokeRed_Grenade_shell",
-            "1Rnd_SmokeGreen_Grenade_shell",
-            "1Rnd_SmokeYellow_Grenade_shell",
-            "1Rnd_SmokePurple_Grenade_shell",
-            "1Rnd_SmokeBlue_Grenade_shell",
-            "1Rnd_SmokeOrange_Grenade_shell",
-            "UGL_FlareWhite_F",
-            "UGL_FlareGreen_F",
-            "UGL_FlareRed_F",
-            "UGL_FlareYellow_F",
-            "UGL_FlareCIR_F"
-        };
-    };
-    class CBA_40mm_3GL {
-        BI_grenades[] = {
-            "3Rnd_HE_Grenade_shell",
-            "3Rnd_Smoke_Grenade_shell",
-            "3Rnd_SmokeRed_Grenade_shell",
-            "3Rnd_SmokeGreen_Grenade_shell",
-            "3Rnd_SmokeYellow_Grenade_shell",
-            "3Rnd_SmokePurple_Grenade_shell",
-            "3Rnd_SmokeBlue_Grenade_shell",
-            "3Rnd_SmokeOrange_Grenade_shell",
-            "3Rnd_UGL_FlareWhite_F",
-            "3Rnd_UGL_FlareGreen_F",
-            "3Rnd_UGL_FlareRed_F",
-            "3Rnd_UGL_FlareYellow_F",
-            "3Rnd_UGL_FlareCIR_F"
-        };
-    };
-    class CBA_40mm_GP {};
+    class CBA_Bazooka {};       // M1, M1A1 Bazooka
 
     class CBA_RPG7 {
         BI_rockets[] = {
             "RPG7_F"
         };
     };
+
+    class CBA_PIAT {};          // PIAT
+    class CBA_Panzerschreck {}; // Panzerschreck RPzB 54
 };
diff --git a/addons/jam/CfgWeapons.hpp b/addons/jam/CfgWeapons.hpp
index 7ff7004bf..a65a72898 100644
--- a/addons/jam/CfgWeapons.hpp
+++ b/addons/jam/CfgWeapons.hpp
@@ -5,29 +5,29 @@ class CfgWeapons {
     class Launcher_Base_F;
 
     class mk20_base_F: Rifle_Base_F {
-        magazineWell[] = {"CBA_556x45_STANAG"};
+        magazineWell[] = {"CBA_556x45_STANAG", "CBA_556x45_STANAG_L", "CBA_556x45_STANAG_XL", "CBA_556x45_STANAG_2D"};
     };
     class SDAR_base_F: Rifle_Base_F {
         magazineWell[] = {"CBA_556x45_STANAG"};
     };
     class Tavor_base_F: Rifle_Base_F {
-        magazineWell[] = {"CBA_556x45_STANAG"};
+        magazineWell[] = {"CBA_556x45_STANAG", "CBA_556x45_STANAG_L", "CBA_556x45_STANAG_XL", "CBA_556x45_STANAG_2D"};
     };
     class arifle_SPAR_01_base_F : Rifle_Base_F {
-        magazineWell[] = {"CBA_556x45_STANAG"};
+        magazineWell[] = {"CBA_556x45_STANAG", "CBA_556x45_STANAG_L", "CBA_556x45_STANAG_XL", "CBA_556x45_STANAG_2D", "CBA_556x45_STANAG_2D_XL"};
     };
     class arifle_SPAR_02_base_F : Rifle_Base_F {
-        magazineWell[] = {"CBA_556x45_STANAG"};
+        magazineWell[] = {"CBA_556x45_STANAG", "CBA_556x45_STANAG_L", "CBA_556x45_STANAG_XL", "CBA_556x45_STANAG_2D", "CBA_556x45_STANAG_2D_XL"};
     };
 
     class UGL_F : GrenadeLauncher {
-        magazineWell[] = {"CBA_40mm_M203"};
+        magazineWell[] = {"CBA_40mm_M203", "CBA_40mm_EGLM"};
     };
 
     class arifle_MX_Base_F : Rifle_Base_F {
-        magazineWell[] = {"CBA_65x39_MX"};
+        magazineWell[] = {"CBA_65x39_MX", "CBA_65x39_MX_XL"};
         class GL_3GL_F : UGL_F {
-            magazineWell[] = {"CBA_40mm_3GL", "CBA_40mm_M203"};
+            magazineWell[] = {"CBA_40mm_3GL", "CBA_40mm_M203", "CBA_40mm_EGLM"};
         };
     };
 
@@ -60,7 +60,7 @@ class CfgWeapons {
     };
 
     class arifle_AKS_base_F : Rifle_Base_F {
-        magazineWell[] = {"CBA_545x39_AK"};
+        magazineWell[] = {"CBA_545x39_AK", "CBA_545x39_AK_L"};
     };
 
     class LMG_03_base_F : Rifle_Long_Base_F {
diff --git a/addons/jam/magwells_10gauge.hpp b/addons/jam/magwells_10gauge.hpp
new file mode 100644
index 000000000..1a5880425
--- /dev/null
+++ b/addons/jam/magwells_10gauge.hpp
@@ -0,0 +1,9 @@
+    class CBA_10g_9rnds {};         // 9 loose rounds
+    class CBA_10g_8rnds {};         // 8 loose rounds
+    class CBA_10g_7rnds {};         // 7 loose rounds
+    class CBA_10g_6rnds {};         // 6 loose rounds
+    class CBA_10g_5rnds {};         // 5 loose rounds
+    class CBA_10g_4rnds {};         // 4 loose rounds
+    class CBA_10g_3rnds {};         // 3 loose rounds
+    class CBA_10g_2rnds {};         // 2 loose rounds
+    class CBA_10g_1rnd {};          // 1 loose round
diff --git a/addons/jam/magwells_12gauge.hpp b/addons/jam/magwells_12gauge.hpp
new file mode 100644
index 000000000..71b719e6c
--- /dev/null
+++ b/addons/jam/magwells_12gauge.hpp
@@ -0,0 +1,11 @@
+    class CBA_12g_9rnds {};         // 9 loose rounds
+    class CBA_12g_8rnds {};         // 8 loose rounds
+    class CBA_12g_7rnds {};         // 7 loose rounds
+    class CBA_12g_6rnds {};         // 6 loose rounds
+    class CBA_12g_5rnds {};         // 5 loose rounds
+    class CBA_12g_4rnds {};         // 4 loose rounds
+    class CBA_12g_3rnds {};         // 3 loose rounds
+    class CBA_12g_2rnds {};         // 2 loose rounds
+    class CBA_12g_1rnd {};          // 1 loose round
+
+    class CBA_12g_SAIGA {};
diff --git a/addons/jam/magwells_145x114.hpp b/addons/jam/magwells_145x114.hpp
new file mode 100644
index 000000000..f9b611f71
--- /dev/null
+++ b/addons/jam/magwells_145x114.hpp
@@ -0,0 +1,2 @@
+    class CBA_145x114_PTRD {};      // PTRD-41
+    class CBA_145x114_PTRS {};      // PTRS-41
diff --git a/addons/jam/magwells_16gauge.hpp b/addons/jam/magwells_16gauge.hpp
new file mode 100644
index 000000000..a7c996246
--- /dev/null
+++ b/addons/jam/magwells_16gauge.hpp
@@ -0,0 +1,9 @@
+    class CBA_16g_9rnds {};         // 9 loose rounds
+    class CBA_16g_8rnds {};         // 8 loose rounds
+    class CBA_16g_7rnds {};         // 7 loose rounds
+    class CBA_16g_6rnds {};         // 6 loose rounds
+    class CBA_16g_5rnds {};         // 5 loose rounds
+    class CBA_16g_4rnds {};         // 4 loose rounds
+    class CBA_16g_3rnds {};         // 3 loose rounds
+    class CBA_16g_2rnds {};         // 2 loose rounds
+    class CBA_16g_1rnd {};          // 1 loose round
diff --git a/addons/jam/magwells_20gauge.hpp b/addons/jam/magwells_20gauge.hpp
new file mode 100644
index 000000000..f6b7b116c
--- /dev/null
+++ b/addons/jam/magwells_20gauge.hpp
@@ -0,0 +1,9 @@
+    class CBA_20g_9rnds {};         // 9 loose rounds
+    class CBA_20g_8rnds {};         // 8 loose rounds
+    class CBA_20g_7rnds {};         // 7 loose rounds
+    class CBA_20g_6rnds {};         // 6 loose rounds
+    class CBA_20g_5rnds {};         // 5 loose rounds
+    class CBA_20g_4rnds {};         // 4 loose rounds
+    class CBA_20g_3rnds {};         // 3 loose rounds
+    class CBA_20g_2rnds {};         // 2 loose rounds
+    class CBA_20g_1rnd {};          // 1 loose round
diff --git a/addons/jam/magwells_22LR.hpp b/addons/jam/magwells_22LR.hpp
new file mode 100644
index 000000000..65cd5bd4b
--- /dev/null
+++ b/addons/jam/magwells_22LR.hpp
@@ -0,0 +1,2 @@
+    class CBA_22LR_PP {};           // Walther PP in .22LR
+    class CBA_22LR_PPK {};          // Walther PPK in .22LR
diff --git a/addons/jam/magwells_3006.hpp b/addons/jam/magwells_3006.hpp
new file mode 100644
index 000000000..e3e66b8af
--- /dev/null
+++ b/addons/jam/magwells_3006.hpp
@@ -0,0 +1,5 @@
+    class CBA_3006_BAR {};          // M1918 BAR
+    class CBA_3006_Garand {};       // M1 Garand
+    class CBA_3006_Spring {};       // M1903 Springfield
+    class CBA_3006_Belt {};         // M1917/M1919 Browning Machine Gun
+    class CBA_3006_Vickers {};      // Vickers machine gun in .30-06
diff --git a/addons/jam/magwells_303B.hpp b/addons/jam/magwells_303B.hpp
new file mode 100644
index 000000000..6b25320e2
--- /dev/null
+++ b/addons/jam/magwells_303B.hpp
@@ -0,0 +1,4 @@
+    class CBA_303B_LeeEn {};        // Lee Enfield
+    class CBA_303B_BREN {};         // BREN gun
+    class CBA_303B_Maxim {};        // Maxim gun in .303 British
+    class CBA_303B_Vickers {};      // Vickers machine gun in .303 British (might be the same as the Maxim belt in .303)
diff --git a/addons/jam/magwells_32ACP.hpp b/addons/jam/magwells_32ACP.hpp
new file mode 100644
index 000000000..6c5dab839
--- /dev/null
+++ b/addons/jam/magwells_32ACP.hpp
@@ -0,0 +1,3 @@
+    class CBA_32ACP_PP {};          // Walther PP in .32 ACP (7.65x17mm Browning)
+    class CBA_32ACP_PPK {};         // Walther PPK in .32 ACP (7.65x17mm Browning)
+    class CBA_32ACP_Welrod {};      // Welrod pistol in .32 ACP (7.65x17mm Browning)
diff --git a/addons/jam/magwells_357SIG.hpp b/addons/jam/magwells_357SIG.hpp
new file mode 100644
index 000000000..ecd31731c
--- /dev/null
+++ b/addons/jam/magwells_357SIG.hpp
@@ -0,0 +1,3 @@
+    class CBA_357SIG_P226 {};       // SIG P226
+    class CBA_357SIG_P229 {};       // SIG P229
+    class CBA_357SIG_P239 {};       // SIG P239
diff --git a/addons/jam/magwells_380ACP.hpp b/addons/jam/magwells_380ACP.hpp
new file mode 100644
index 000000000..cceb96bcb
--- /dev/null
+++ b/addons/jam/magwells_380ACP.hpp
@@ -0,0 +1,2 @@
+    class CBA_380ACP_PP {};         // Walther PP in .380 ACP (9x17mm/9mm Short/9mm Browning)
+    class CBA_380ACP_PPK {};        // Walther PPK in .380 ACP (9x17mm/9mm Short/9mm Browning)
diff --git a/addons/jam/magwells_40SW.hpp b/addons/jam/magwells_40SW.hpp
new file mode 100644
index 000000000..cffe63265
--- /dev/null
+++ b/addons/jam/magwells_40SW.hpp
@@ -0,0 +1,3 @@
+    class CBA_40SW_P226 {};         // SIG P226 .40 S&W
+    class CBA_40SW_P229 {};         // SIG P229 .40 S&W
+    class CBA_40SW_P239 {};         // SIG P239 .40 S&W
diff --git a/addons/jam/magwells_40mm.hpp b/addons/jam/magwells_40mm.hpp
new file mode 100644
index 000000000..852d1f13f
--- /dev/null
+++ b/addons/jam/magwells_40mm.hpp
@@ -0,0 +1,38 @@
+    class CBA_40mm_M203 {
+        BI_grenades[] = {
+            "1Rnd_HE_Grenade_shell",
+            "1Rnd_Smoke_Grenade_shell",
+            "1Rnd_SmokeRed_Grenade_shell",
+            "1Rnd_SmokeGreen_Grenade_shell",
+            "1Rnd_SmokeYellow_Grenade_shell",
+            "1Rnd_SmokePurple_Grenade_shell",
+            "1Rnd_SmokeBlue_Grenade_shell",
+            "1Rnd_SmokeOrange_Grenade_shell",
+            "UGL_FlareWhite_F",
+            "UGL_FlareGreen_F",
+            "UGL_FlareRed_F",
+            "UGL_FlareYellow_F",
+            "UGL_FlareCIR_F"
+        };
+    };
+
+    class CBA_40mm_3GL {
+        BI_grenades[] = {
+            "3Rnd_HE_Grenade_shell",
+            "3Rnd_Smoke_Grenade_shell",
+            "3Rnd_SmokeRed_Grenade_shell",
+            "3Rnd_SmokeGreen_Grenade_shell",
+            "3Rnd_SmokeYellow_Grenade_shell",
+            "3Rnd_SmokePurple_Grenade_shell",
+            "3Rnd_SmokeBlue_Grenade_shell",
+            "3Rnd_SmokeOrange_Grenade_shell",
+            "3Rnd_UGL_FlareWhite_F",
+            "3Rnd_UGL_FlareGreen_F",
+            "3Rnd_UGL_FlareRed_F",
+            "3Rnd_UGL_FlareYellow_F",
+            "3Rnd_UGL_FlareCIR_F"
+        };
+    };
+
+    class CBA_40mm_EGLM {};     // for longer grenades that can only fit side breech-loading
+    class CBA_40mm_GP {};       // GP-25, GP-30
diff --git a/addons/jam/magwells_45ACP.hpp b/addons/jam/magwells_45ACP.hpp
new file mode 100644
index 000000000..597053598
--- /dev/null
+++ b/addons/jam/magwells_45ACP.hpp
@@ -0,0 +1,7 @@
+    class CBA_45ACP_1911 {};        // Colt M1911
+    class CBA_45ACP_C96 {};         // Mauser C-96 in .45 ACP
+    class CBA_45ACP_Delisle {};     // De Lisle Carbine
+    class CBA_45ACP_Grease {};      // Grease Gun
+    class CBA_45ACP_Thompson_Stick {};  // Thompson stick magazines
+    class CBA_45ACP_Thompson_Drum {};   // Thompson drum magazines
+    class CBA_45ACP_Reising {};     // M50/M55 Reising
diff --git a/addons/jam/magwells_545x39.hpp b/addons/jam/magwells_545x39.hpp
new file mode 100644
index 000000000..48dc3a9fa
--- /dev/null
+++ b/addons/jam/magwells_545x39.hpp
@@ -0,0 +1,10 @@
+    class CBA_545x39_AK {
+        BI_mags[] = {
+            "30Rnd_545x39_Mag_F",
+            "30Rnd_545x39_Mag_Green_F",
+            "30Rnd_545x39_Mag_Tracer_F",
+            "30Rnd_545x39_Mag_Tracer_Green_F"
+        };
+    };
+
+    class CBA_545x39_AK_L {};    // 45rnd RPK-74
diff --git a/addons/jam/magwells_556x45.hpp b/addons/jam/magwells_556x45.hpp
new file mode 100644
index 000000000..2b1ebea9c
--- /dev/null
+++ b/addons/jam/magwells_556x45.hpp
@@ -0,0 +1,35 @@
+    class CBA_556x45_MINIMI {
+        BI_boxes[] = {
+            "200Rnd_556x45_Box_F",
+            "200Rnd_556x45_Box_Red_F",
+            "200Rnd_556x45_Box_Tracer_F",
+            "200Rnd_556x45_Box_Tracer_Red_F"
+        };
+    };
+
+    class CBA_556x45_STANAG {
+        BI_mags[] = {
+            "30Rnd_556x45_Stanag",
+            "30Rnd_556x45_Stanag_green",
+            "30Rnd_556x45_Stanag_red",
+            "30Rnd_556x45_Stanag_Tracer_Red",
+            "30Rnd_556x45_Stanag_Tracer_Green",
+            "30Rnd_556x45_Stanag_Tracer_Yellow"
+        };
+    };
+
+    class CBA_556x45_STANAG_L {};           // Magpul PMAG 40, Surefire MAG5-60
+    class CBA_556x45_STANAG_XL {};          // Surefire MAG5-100
+    class CBA_556x45_STANAG_2D {};          // twin-drum 100rnd Beta C-MAG
+
+    class CBA_556x45_STANAG_2D_XL {         // twin-drum 150rnd Armatac SAW-MAG
+        BI_mags[] = {
+            "150Rnd_556x45_Drum_Mag_F",
+            "150Rnd_556x45_Drum_Mag_Tracer_F"
+        };
+    };
+
+    class CBA_556x45_STEYR {};        // AUG
+    class CBA_556x45_HK33 {};         // H&K 33/53/93
+    class CBA_556x45_G36 {};
+    class CBA_556x45_SG550 {};
diff --git a/addons/jam/magwells_580x42.hpp b/addons/jam/magwells_580x42.hpp
new file mode 100644
index 000000000..5a96e66e3
--- /dev/null
+++ b/addons/jam/magwells_580x42.hpp
@@ -0,0 +1,10 @@
+    class CBA_580x42_TYPE95 {
+        BI_mags[] = {
+            "30Rnd_580x42_Mag_F",
+            "30Rnd_580x42_Mag_Tracer_F"
+        };
+        BI_drums[] = {
+            "100Rnd_580x42_Mag_F",
+            "100Rnd_580x42_Mag_Tracer_F"
+        };
+    };
diff --git a/addons/jam/magwells_65x39.hpp b/addons/jam/magwells_65x39.hpp
new file mode 100644
index 000000000..a85fa5604
--- /dev/null
+++ b/addons/jam/magwells_65x39.hpp
@@ -0,0 +1,14 @@
+    class CBA_65x39_MX {
+        BI_mags[] = {
+            "30Rnd_65x39_caseless_mag",
+            "30Rnd_65x39_caseless_green",
+            "30Rnd_65x39_caseless_mag_Tracer",
+            "30Rnd_65x39_caseless_green_mag_Tracer"
+        };
+    };
+    class CBA_65x39_MX_XL {
+        BI_mags[] = {
+            "100Rnd_65x39_caseless_mag",
+            "100Rnd_65x39_caseless_mag_Tracer"
+        };
+    };
diff --git a/addons/jam/magwells_762x25.hpp b/addons/jam/magwells_762x25.hpp
new file mode 100644
index 000000000..61848b2c1
--- /dev/null
+++ b/addons/jam/magwells_762x25.hpp
@@ -0,0 +1,6 @@
+    class CBA_762x25_TT {};         // TT-30, TT-33 Tokarev
+    class CBA_762x25_PPS {};        // PPS-43
+    class CBA_762x25_PPSh_Stick {}; // PPSh-41 stick magazines
+    class CBA_762x25_PPSh_Drum {};  // PPSh-41 drum magazines
+    class CBA_762x25_PPD_Stick {};  // PPD-40 stick magazines
+    class CBA_762x25_PPD_Drum {};   // PPD-40 drum magazines
diff --git a/addons/jam/magwells_762x39.hpp b/addons/jam/magwells_762x39.hpp
new file mode 100644
index 000000000..b321f7fba
--- /dev/null
+++ b/addons/jam/magwells_762x39.hpp
@@ -0,0 +1,8 @@
+    class CBA_762x39_AK {
+        BI_mags[] = {
+            "30Rnd_762x39_Mag_F",
+            "30Rnd_762x39_Mag_Green_F",
+            "30Rnd_762x39_Mag_Tracer_F",
+            "30Rnd_762x39_Mag_Tracer_Green_F"
+        };
+    };
diff --git a/addons/jam/magwells_762x51.hpp b/addons/jam/magwells_762x51.hpp
new file mode 100644
index 000000000..9e5ac8ab1
--- /dev/null
+++ b/addons/jam/magwells_762x51.hpp
@@ -0,0 +1,24 @@
+    class CBA_762x51_M14 {
+        BI_mags[] = {
+            "20Rnd_762x51_Mag"
+        };
+    };
+
+    class CBA_762x51_HK417 {
+        BI_mags[] = {
+            "20Rnd_762x51_Mag"
+        };
+    };
+
+    class CBA_762x51_SR25 {};       // M110, SIG716
+    class CBA_762x51_SCAR {};
+    class CBA_762x51_FAL {};
+    class CBA_762x51_G3 {};
+    class CBA_762x51_SIGAMT {};    // SIG 510-4, AMT
+
+    class CBA_762x51_LINKS {
+        BI_belts[] = {
+            "150Rnd_762x51_Box",
+            "150Rnd_762x51_Box_Tracer"
+        };
+    };
diff --git a/addons/jam/magwells_762x54.hpp b/addons/jam/magwells_762x54.hpp
new file mode 100644
index 000000000..d28491b47
--- /dev/null
+++ b/addons/jam/magwells_762x54.hpp
@@ -0,0 +1,18 @@
+    class CBA_762x54R_SVD {
+        BI_mags[] = {
+            "10Rnd_762x54_Mag"
+        };
+    };
+
+    class CBA_762x54R_LINKS {
+        BI_belts[] = {
+            "150Rnd_762x54_Box",
+            "150Rnd_762x54_Box_Tracer"
+        };
+    };
+
+    class CBA_762x54R_Mosin {};     // M91/30, M38, M44 Mosin
+    class CBA_762x54R_SVT {};       // SVT
+    class CBA_762x54R_DPM {};       // DPM
+    class CBA_762x54R_DT {};        // DT
+    class CBA_762x54R_Maxim {};     // Maxim gun in 7.62x54R
diff --git a/addons/jam/magwells_77x58.hpp b/addons/jam/magwells_77x58.hpp
new file mode 100644
index 000000000..b8b5f6b8c
--- /dev/null
+++ b/addons/jam/magwells_77x58.hpp
@@ -0,0 +1,3 @@
+    class CBA_77x58_Arisaka {};     // Japanese Type 99 Arisaka
+    class CBA_77x58_Type92 {};      // Japanese Type 92 HMG
+    class CBA_77x58_Type99 {};      // Japanese Type 99 LMG
diff --git a/addons/jam/magwells_792x57.hpp b/addons/jam/magwells_792x57.hpp
new file mode 100644
index 000000000..f29655eb5
--- /dev/null
+++ b/addons/jam/magwells_792x57.hpp
@@ -0,0 +1,6 @@
+    class CBA_792x57_FG42 {};       // FG42
+    class CBA_792x57_G43 {};        // G43, G41
+    class CBA_792x57_K98 {};        // K98, G98
+    class CBA_792x57_LINKS {};      // MG42, MG34
+    class CBA_792x57_TROMMEL {};    // MG34 Patronentrommel 34
+    class CBA_792x57_MG08 {};       // MG08
diff --git a/addons/jam/magwells_8x22.hpp b/addons/jam/magwells_8x22.hpp
new file mode 100644
index 000000000..6270fcce9
--- /dev/null
+++ b/addons/jam/magwells_8x22.hpp
@@ -0,0 +1,3 @@
+    class CBA_8x22_TypeB {};        // Japanese Type B Nambu
+    class CBA_8x22_Type14 {};       // Japanese Type 14 Nambu
+    class CBA_8x22_Type100 {};      // Japanese Type 100 SMG
diff --git a/addons/jam/magwells_9x19.hpp b/addons/jam/magwells_9x19.hpp
new file mode 100644
index 000000000..1d59fd7cc
--- /dev/null
+++ b/addons/jam/magwells_9x19.hpp
@@ -0,0 +1,13 @@
+    class CBA_9x19_MP5 {};          // H&K MP5
+    class CBA_9x19_STEYR {};        // AUG SMG, MPi, TMP
+    class CBA_9x19_P226 {};         // SIG P226
+    class CBA_9x19_P228 {};         // SIG P228
+    class CBA_9x19_P239 {};         // SIG P239
+    class CBA_9x19_MP40 {};         // MP40, MP38
+    class CBA_9x19_STEN {};         // STEN
+    class CBA_9x19_C96 {};          // Mauser C-96 in 9x19mm
+    class CBA_9x19_HiPower {};      // Browning HiPower
+    class CBA_9x19_P08 {};          // Luger P08
+    class CBA_9x19_P38 {};          // Walther P38
+    class CBA_9x19_Vis {};          // wz. 35 Vis (Radom)
+    class CBA_9x19_Welrod {};       // Welrod pistol in 9x19mm