diff --git a/resources/factions/CH_russia_2020.json b/resources/factions/CH_russia_2020.json
index 8d9ef32d..d3b37b35 100644
--- a/resources/factions/CH_russia_2020.json
+++ b/resources/factions/CH_russia_2020.json
@@ -47,15 +47,17 @@
   ],
   "frontline_units": [
     "[CH] T-14 MBT",
-    "[CH] T-90M MBT",
+    "MBT T-90M [CH]",
     "[CH] Tigr-M",
     "[CH] T-90A MBT",
     "[CH] T-80BVM MBT",
-    "[CH] BMD-4 IFV"
+    "[CH] BMD-4 IFV",
+    "IFV BMPT Terminator [CH]",
+    "MBT T-64BV Type 2017 [CH]"
   ],
   "artillery_units": [
     "[CH] 2S35 SPG",
-    "[CH] TOS-1A MRL"
+    "MLRS TOS-1A Solntsepyok [CH]"
   ],
   "logistics_units": [
     "LUV UAZ-469 Jeep",
@@ -72,7 +74,8 @@
   ],
   "missiles": [
     "[CH] Iskander-M SRBM",
-    "[CH] Iskander-K GLCM"
+    "SRBM 9K720 Iskander HE [CH]",
+    "SRBM 9K720 Iskander CM [CH]"
   ],
   "preset_groups": [
     "BAL LBASM",
@@ -85,7 +88,8 @@
     "S-350"
   ],
   "naval_units": [
-    "[CH] Project 22160 Patrol Ship",
+    "Project 22160 Patrol Ship [CH]",
+    "Project 22160 Patrol Ship with Tor M2KM [CH]",
     "[CH] Project 22350 Admiral Gorshkov Frigate",
     "CV 1143.5 Admiral Kuznetsov",
     "[CH] Project 11356R Admiral Grigorovich Frigate (AShM)",
@@ -99,10 +103,10 @@
   "air_defense_units": [
     "[CH] 2S38 SPAAG (LG-HE)",
     "[CH] 2S38 SPAAG",
-    "[CH] Pantsir-S1 SPAAGM",
+    "SAM SA-22 Pantsir-S1 \"Greyhound\" [CH]",
     "[CH] Pantsir-S2 SPAAGM",
     "[CH] Tor M2K SHORAD",
-    "[CH] Tor M2 SHORAD",
+    "SAM SA-15 Tor M2 \"Gauntlet\" [CH]",
     "[CH] Tor M2M SHORAD",
     "AAA ZU-23 Closed Emplacement",
     "ZU-23 on Ural-375",
diff --git a/resources/factions/blufor_current.json b/resources/factions/blufor_current.json
index cf1abd2c..e6ef8f84 100644
--- a/resources/factions/blufor_current.json
+++ b/resources/factions/blufor_current.json
@@ -81,8 +81,9 @@
     "[CH] M551 LT",
     "[CH] Oshkosh L-ATV (M2)",
     "[CH] Oshkosh L-ATV (Mk19)",
-    "[CH] Oshkosh M-ATV MRAP (M2)",
-    "[CH] Oshkosh M-ATV MRAP (Mk19)"
+    "APC MRAP M-ATV [CH]",
+    "[CH] Oshkosh M-ATV MRAP (Mk19)",
+    "IFV M1130 Stryker CV [CH]"
   ],
   "artillery_units": [
     "M109A6 Paladin",
@@ -92,16 +93,17 @@
     "[CH] M777 LTH M982 Excalibur",
     "[CH] M777 LTH M982 Excalibur (MTVR)",
     "[CH] M777 LTH M795 (MTVR)",
-    "[CH] M270A1 MLRS (GLSDB)",
-    "[CH] M142 HIMARS (GLSDB)",
-    "[CH] M142 HIMARS (AGMLRS)",
+    "MLRS M142 HIMARS ATACMS CM [CH]",
+    "MLRS M142 HIMARS ATACMS HE [CH]",
+    "MLRS M142 HIMARS GMLRS CM [CH]",
+    "MLRS M142 HIMARS GMLRS HE [CH]",
     "[CH] Grkpbv 90 SPM",
     "[CH] Archer SPG SGR77B",
     "[CH] Archer SPG M982 Excalibur"
   ],
   "logistics_units": [
     "Truck M818 6x6",
-    "[CH] Oshkosh FMTV M1083",
+    "Truck M1083 A1P2 MTV [CH]",
     "[CH] Oshkosh HEMTT M977",
     "[CH] Oshkosh HEMTT M983",
     "[CH] Oshkosh MTVR MK23"
@@ -148,7 +150,8 @@
     "MIM-104 Patriot (Mobile)",
     "MIM-104 Patriot (Stationary)",
     "NASAMS 3",
-    "THAAD"
+    "THAAD",
+    "IRIS-T SLM"
   ],
   "naval_units": [
     "DDG Arleigh Burke IIa",
diff --git a/resources/factions/redfor_current.json b/resources/factions/redfor_current.json
index 52da8e4c..d65b91c9 100644
--- a/resources/factions/redfor_current.json
+++ b/resources/factions/redfor_current.json
@@ -61,7 +61,7 @@
     "Type 04A (ZBD-04A)",
     "Type 96B (ZTZ-96B)",
     "[CH] T-14 MBT",
-    "[CH] T-90M MBT",
+    "MBT T-90M [CH]",
     "[CH] Tigr-M",
     "[CH] T-90A MBT",
     "[CH] T-80BVM MBT",
@@ -71,7 +71,8 @@
     "Type 04A (ZBD-04A)",
     "Type 96B (ZTZ-96B)",
     "[CH] ZTL-11 AFV",
-    "[CH] ZTZ-99A2 MBT"
+    "[CH] ZTZ-99A2 MBT",
+    "IFV BMPT Terminator [CH]"
   ],
   "artillery_units": [
     "2S19 Msta-S",
@@ -79,7 +80,7 @@
     "BM-27 Uragan",
     "BM-30 Smerch (9M55K5 HE Rockets)",
     "[CH] 2S35 SPG",
-    "[CH] TOS-1A MRL",
+    "MLRS TOS-1A Solntsepyok [CH]",
     "PLZ-05",
     "[CH] PCL-181 SPG GP155",
     "[CH] PHL-11 SPMRL (DPICM)",
@@ -104,7 +105,8 @@
   ],
   "missiles": [
     "[CH] Iskander-M SRBM",
-    "[CH] Iskander-K GLCM",
+    "SRBM 9K720 Iskander HE [CH]",
+    "SRBM 9K720 Iskander CM [CH]",
     "[CH] CJ-10 GLCM",
     "[CH] YJ-12B LBASM"
   ],
@@ -142,7 +144,8 @@
     "CV 1143.5 Admiral Kuznetsov",
     "Type 071 Amphibious Transport Dock",
     "Type 093 Attack Submarine",
-    "[CH] Project 22160 Patrol Ship",
+    "Project 22160 Patrol Ship [CH]",
+    "Project 22160 Patrol Ship with Tor M2KM [CH]",
     "[CH] Project 22350 Admiral Gorshkov Frigate",
     "[CH] Project 11356R Admiral Grigorovich Frigate (AShM)",
     "[CH] Project 11356R Admiral Grigorovich Frigate (LACM)",
@@ -168,10 +171,10 @@
     "ZSU-23-4 Shilka",
     "[CH] 2S38 SPAAG (LG-HE)",
     "[CH] 2S38 SPAAG",
-    "[CH] Pantsir-S1 SPAAGM",
+    "SAM SA-22 Pantsir-S1 \"Greyhound\" [CH]",
     "[CH] Pantsir-S2 SPAAGM",
     "[CH] Tor M2K SHORAD",
-    "[CH] Tor M2 SHORAD",
+    "SAM SA-15 Tor M2 \"Gauntlet\" [CH]",
     "[CH] Tor M2M SHORAD",
     "[CH] LD-3000 C-RAM Mobile",
     "[CH] LD-3000 C-RAM Stationary",
diff --git a/resources/factions/redfor_russia_2020.json b/resources/factions/redfor_russia_2020.json
index 5b0a3724..a75645eb 100644
--- a/resources/factions/redfor_russia_2020.json
+++ b/resources/factions/redfor_russia_2020.json
@@ -60,11 +60,12 @@
     "Type 04A (ZBD-04A)",
     "Type 96B (ZTZ-96B)",
     "[CH] T-14 MBT",
-    "[CH] T-90M MBT",
+    "MBT T-90M [CH]",
     "[CH] Tigr-M",
     "[CH] T-90A MBT",
     "[CH] T-80BVM MBT",
-    "[CH] BMD-4 IFV"
+    "[CH] BMD-4 IFV",
+    "IFV BMPT Terminator [CH]"
   ],
   "artillery_units": [
     "2S19 Msta-S",
@@ -72,7 +73,7 @@
     "BM-27 Uragan",
     "BM-30 Smerch (9M55K5 HE Rockets)",
     "[CH] 2S35 SPG",
-    "[CH] TOS-1A MRL"
+    "MLRS TOS-1A Solntsepyok [CH]"
   ],
   "logistics_units": [
     "LUV UAZ-469 Jeep",
@@ -90,7 +91,8 @@
   ],
   "missiles": [
     "[CH] Iskander-M SRBM",
-    "[CH] Iskander-K GLCM"
+    "SRBM 9K720 Iskander HE [CH]",
+    "SRBM 9K720 Iskander CM [CH]"
   ],
   "preset_groups": [
     "SA-2/S-75",
@@ -121,7 +123,8 @@
     "Type 054A Frigate",
     "CV 1143.5 Admiral Kuznetsov",
     "Type 071 Amphibious Transport Dock",
-    "[CH] Project 22160 Patrol Ship",
+    "Project 22160 Patrol Ship [CH]",
+    "Project 22160 Patrol Ship with Tor M2KM [CH]",
     "[CH] Project 22350 Admiral Gorshkov Frigate",
     "[CH] Project 11356R Admiral Grigorovich Frigate (AShM)",
     "[CH] Project 11356R Admiral Grigorovich Frigate (LACM)",
@@ -142,10 +145,10 @@
     "ZSU-23-4 Shilka",
     "[CH] 2S38 SPAAG (LG-HE)",
     "[CH] 2S38 SPAAG",
-    "[CH] Pantsir-S1 SPAAGM",
+    "SAM SA-22 Pantsir-S1 \"Greyhound\" [CH]",
     "[CH] Pantsir-S2 SPAAGM",
     "[CH] Tor M2K SHORAD",
-    "[CH] Tor M2 SHORAD",
+    "SAM SA-15 Tor M2 \"Gauntlet\" [CH]",
     "[CH] Tor M2M SHORAD"
   ],
   "helicopter_carrier_names": [
diff --git a/resources/factions/ukraine_2020.json b/resources/factions/ukraine_2020.json
index eab0d545..71412a28 100644
--- a/resources/factions/ukraine_2020.json
+++ b/resources/factions/ukraine_2020.json
@@ -32,8 +32,8 @@
     "[CH] BRDM-2L1 ARV",
     "[CH] Kozak-5 APC",
     "[CH] KrAZ Spartan APC",
-    "[CH] T-64BV MBT",
-    "[CH] T-84 Oplot-M MBT"
+    "MBT T-64BV Type 2017 [CH]",
+    "MBT T-84 Oplot-M [CH]"
   ],
   "artillery_units": [],
   "logistics_units": [
diff --git a/resources/factions/usa_2020.json b/resources/factions/usa_2020.json
index ae746058..84c2bfb3 100644
--- a/resources/factions/usa_2020.json
+++ b/resources/factions/usa_2020.json
@@ -75,7 +75,9 @@
     "[CH] M551 LT",
     "[CH] Oshkosh L-ATV (M2)",
     "[CH] Oshkosh L-ATV (Mk19)",
-    "[CH] Oshkosh M-ATV MRAP (M2)",
+    "APC MRAP M-ATV [CH]",
+    "[CH] Oshkosh M-ATV MRAP (Mk19)",
+    "IFV M1130 Stryker CV [CH]",
     "[CH] Oshkosh M-ATV MRAP (Mk19)"
   ],
   "artillery_units": [
@@ -87,12 +89,14 @@
     "[CH] M777 LTH M982 Excalibur (MTVR)",
     "[CH] M777 LTH M795 (MTVR)",
     "[CH] M270A1 MLRS (GLSDB)",
-    "[CH] M142 HIMARS (GLSDB)",
-    "[CH] M142 HIMARS (AGMLRS)"
+    "MLRS M142 HIMARS ATACMS CM [CH]",
+    "MLRS M142 HIMARS ATACMS HE [CH]",
+    "MLRS M142 HIMARS GMLRS CM [CH]",
+    "MLRS M142 HIMARS GMLRS HE [CH]"
   ],
   "logistics_units": [
     "Truck M818 6x6",
-    "[CH] Oshkosh FMTV M1083",
+    "Truck M1083 A1P2 MTV [CH]",
     "[CH] Oshkosh HEMTT M977",
     "[CH] Oshkosh HEMTT M983",
     "[CH] Oshkosh MTVR MK23"
diff --git a/resources/groups/IRIS-T_SLM.yaml b/resources/groups/IRIS-T_SLM.yaml
new file mode 100644
index 00000000..85697ab4
--- /dev/null
+++ b/resources/groups/IRIS-T_SLM.yaml
@@ -0,0 +1,9 @@
+name: IRIS-T SLM
+tasks:
+  - MERAD
+units:
+  - SAM IRIS-T SLM STR [CH]
+  - SAM IRIS-T SLM LN [CH]
+  - SAM IRIS-T SLM C2 [CH]
+layouts:
+  - 2 Launcher Site
\ No newline at end of file
diff --git a/resources/layouts/anti_air/2_Launcher.yaml b/resources/layouts/anti_air/2_Launcher.yaml
index 2e5293b4..e82447e3 100644
--- a/resources/layouts/anti_air/2_Launcher.yaml
+++ b/resources/layouts/anti_air/2_Launcher.yaml
@@ -26,6 +26,7 @@ groups:
         - 1
       unit_classes:
         - OpticalTracker
+        - CommandPost
     - name: Launcher
       unit_count:
         - 2
diff --git a/resources/units/ground_units/CHAP_9K720_Cluster.yaml b/resources/units/ground_units/CHAP_9K720_Cluster.yaml
new file mode 100644
index 00000000..09414256
--- /dev/null
+++ b/resources/units/ground_units/CHAP_9K720_Cluster.yaml
@@ -0,0 +1,11 @@
+class: Missile
+description: "The 9K720 Iskander (Russian: \xD0\x98\xD1\x81\xD0\xBA\xD0\xB0\xD0\xBD\xD0\xB4\xD0\xB5\xD1\x80; 
+  NATO reporting name SS-26 Stone) is a Russian mobile short-range ballistic missile system. It has a range of 
+  500 kilometres (270 nmi; 310 mi). It was intended to replace the OTR-21 Tochka in the Russian military by 
+  2020."
+introduced: 2006
+manufacturer: Votkinsk Plant State Production Association
+origin: Russia
+price: 0
+variants:
+  "SRBM 9K720 Iskander CM [CH]": null
\ No newline at end of file
diff --git a/resources/units/ground_units/CHAP_9K720_HE.yaml b/resources/units/ground_units/CHAP_9K720_HE.yaml
new file mode 100644
index 00000000..4e9bbb55
--- /dev/null
+++ b/resources/units/ground_units/CHAP_9K720_HE.yaml
@@ -0,0 +1,11 @@
+class: Missile
+description: "The 9K720 Iskander (Russian: \xD0\x98\xD1\x81\xD0\xBA\xD0\xB0\xD0\xBD\xD0\xB4\xD0\xB5\xD1\x80; 
+  NATO reporting name SS-26 Stone) is a Russian mobile short-range ballistic missile system. It has a range of 
+  500 kilometres (270 nmi; 310 mi). It was intended to replace the OTR-21 Tochka in the Russian military by 
+  2020."
+introduced: 2006
+manufacturer: Votkinsk Plant State Production Association
+origin: Russia
+price: 0
+variants:
+  "SRBM 9K720 Iskander HE [CH]": null
\ No newline at end of file
diff --git a/resources/units/ground_units/CHAP_BMPT.yaml b/resources/units/ground_units/CHAP_BMPT.yaml
new file mode 100644
index 00000000..6b594992
--- /dev/null
+++ b/resources/units/ground_units/CHAP_BMPT.yaml
@@ -0,0 +1,13 @@
+class: IFV
+description: "The BMPT \"Terminator\" is an armored fighting vehicle (AFV), designed and manufactured by 
+  the Russian company Uralvagonzavod. This vehicle was designed for supporting tanks and other AFVs in urban areas.
+  The BMPT is unofficially named the \"Terminator\" by the manufacturers. It is heavily armed and armored to survive 
+  in urban combat. The AFV is armed with four 9M120 Ataka missile launchers, two 30 mm 2A42 autocannons, two AG-17D grenade launchers, 
+  and one coaxial 7.62 mm PKTM machine gun."
+introduced: 2011
+manufacturer: Uralvagonzavod
+origin: Russia
+price: 18
+role: Amphibious Infantry Fighting Vehicle
+variants:
+  "IFV BMPT Terminator [CH]": {}
diff --git a/resources/units/ground_units/CHAP_FV101.yaml b/resources/units/ground_units/CHAP_FV101.yaml
new file mode 100644
index 00000000..4d35fb23
--- /dev/null
+++ b/resources/units/ground_units/CHAP_FV101.yaml
@@ -0,0 +1,11 @@
+class: IFV
+description: 'The FV101 Scorpion is a British armoured reconnaissance vehicle and light tank. It was the lead vehicle and the fire support type in the Combat Vehicle Reconnaissance
+  (Tracked), CVR(T), family of seven armoured vehicles. Manufactured by Alvis, it was introduced into service with the British Army in 1973 and was withdrawn in 1994.
+  More than 3,000 were produced and used as reconnaissance vehicles or light tanks.'
+introduced: 1973
+manufacturer: Alvis
+origin: UK
+price: 10
+role: Infantry Fighting Vehicle
+variants:
+  "LT FV101 Scorpion [CH]": {}
diff --git a/resources/units/ground_units/CHAP_FV107.yaml b/resources/units/ground_units/CHAP_FV107.yaml
new file mode 100644
index 00000000..65dfd526
--- /dev/null
+++ b/resources/units/ground_units/CHAP_FV107.yaml
@@ -0,0 +1,11 @@
+class: IFV
+description: 'The FV107 Scimitar is an armoured tracked military reconnaissance vehicle (sometimes classed as a light tank) formerly used by the British Army,
+  until it was retired from active service in April 2023. It was manufactured by Alvis in Coventry. It is very similar to the FV101 Scorpion, but mounts a 
+  high-velocity 30 mm L21 RARDEN cannon instead of a low-velocity 76 mm gun.'
+introduced: 1974
+manufacturer: Alvis
+origin: UK
+price: 10
+role: Infantry Fighting Vehicle
+variants:
+  "Scout FV107 Scimitar [CH]": {}
diff --git a/resources/units/ground_units/CHAP_IRISTSLM_CP.yaml b/resources/units/ground_units/CHAP_IRISTSLM_CP.yaml
new file mode 100644
index 00000000..c07172e1
--- /dev/null
+++ b/resources/units/ground_units/CHAP_IRISTSLM_CP.yaml
@@ -0,0 +1,4 @@
+class: CommandPost
+price: 14
+variants:
+  "SAM IRIS-T SLM C2 [CH]": null
diff --git a/resources/units/ground_units/CHAP_IRISTSLM_LN.yaml b/resources/units/ground_units/CHAP_IRISTSLM_LN.yaml
new file mode 100644
index 00000000..cca96c28
--- /dev/null
+++ b/resources/units/ground_units/CHAP_IRISTSLM_LN.yaml
@@ -0,0 +1,4 @@
+class: Launcher
+price: 8
+variants:
+  "SAM IRIS-T SLM LN [CH]": null
diff --git a/resources/units/ground_units/CHAP_IRISTSLM_STR.yaml b/resources/units/ground_units/CHAP_IRISTSLM_STR.yaml
new file mode 100644
index 00000000..52ca86b3
--- /dev/null
+++ b/resources/units/ground_units/CHAP_IRISTSLM_STR.yaml
@@ -0,0 +1,18 @@
+class: SearchTrackRadar
+reversed_heading: true
+description: "The IRIS-T SL is a family of short and high to medium air defense surface-to-air missile systems. 
+  The missile systems are developed from the IRIS-T air-to-air missile. Two variants and their derivatives are at the moment in service. 
+  Those two variants are IRIS-T SLS and the IRIS-T SLM."
+introduced: 2020
+manufacturer: Diehl Defence and Hensoldt, Saab AB
+origin: Germany/Sweden
+price: 20
+variants:
+  "SAM IRIS-T SLM STR [CH]": {}
+skynet_properties: # Override skynet default properties
+  can_engage_harm: true
+  # can_engage_air_weapon: true # https://github.com/walder/Skynet-IADS/tree/develop#engage-air-weapons
+  go_live_range_in_percent: 100
+  harm_detection_chance: 90
+  engagement_zone: SkynetIADSAbstractRadarElement.GO_LIVE_WHEN_IN_KILL_ZONE # https://github.com/walder/Skynet-IADS/tree/develop#engagement-zone
+  autonomous_behaviour: SkynetIADSAbstractRadarElement.AUTONOMOUS_STATE_DCS_AI # https://github.com/walder/Skynet-IADS/tree/develop#autonomous-mode-behaviour
diff --git a/resources/units/ground_units/CHAP_M1083.yaml b/resources/units/ground_units/CHAP_M1083.yaml
new file mode 100644
index 00000000..0a07bdd0
--- /dev/null
+++ b/resources/units/ground_units/CHAP_M1083.yaml
@@ -0,0 +1,4 @@
+class: Logistics
+price: 3
+variants:
+  "Truck M1083 A1P2 MTV [CH]": null
diff --git a/resources/units/ground_units/CHAP_M1130.yaml b/resources/units/ground_units/CHAP_M1130.yaml
new file mode 100644
index 00000000..83700bc9
--- /dev/null
+++ b/resources/units/ground_units/CHAP_M1130.yaml
@@ -0,0 +1,10 @@
+class: APC
+description: 'The ICV (Infantry Carrier Vehicle) Stryker is a family of eight-wheeled
+  armored fighting vehicles derived from the Canadian LAV III. '
+introduced: 2002
+manufacturer: General Dynamics
+origin: USA
+price: 10
+role: Armoured Personnel Carrier
+variants:
+  "IFV M1130 Stryker CV [CH]": {}
diff --git a/resources/units/ground_units/CHAP_M142_ATACMS_M39A1.yaml b/resources/units/ground_units/CHAP_M142_ATACMS_M39A1.yaml
new file mode 100644
index 00000000..8abc887c
--- /dev/null
+++ b/resources/units/ground_units/CHAP_M142_ATACMS_M39A1.yaml
@@ -0,0 +1,12 @@
+class: Artillery
+description: "A highly mobile wheeled artillery rocket system designed to deliver long-range precision strikes.
+  The HIMARS is based on a standard 5-ton truck chassis and can be airliffted by C-130 hercules aircraft for rapid
+  deployment. Depending on the munitions, the HIMARS can engage targets at up to 27- nautical miles.
+  It has been deployed in multiple combat theaters, including Iraq, Afghanistan and now Ukraine."
+introduced: 2005
+manufacturer: Lockheed Martin
+origin: United States
+price: 55
+role: Long-Range Precision Artillery Striker
+variants: 
+  "MLRS M142 HIMARS ATACMS CM [CH]": {}
diff --git a/resources/units/ground_units/CHAP_M142_ATACMS_M48.yaml b/resources/units/ground_units/CHAP_M142_ATACMS_M48.yaml
new file mode 100644
index 00000000..4ccabd0c
--- /dev/null
+++ b/resources/units/ground_units/CHAP_M142_ATACMS_M48.yaml
@@ -0,0 +1,12 @@
+class: Artillery
+description: "A highly mobile wheeled artillery rocket system designed to deliver long-range precision strikes.
+  The HIMARS is based on a standard 5-ton truck chassis and can be airliffted by C-130 hercules aircraft for rapid
+  deployment. Depending on the munitions, the HIMARS can engage targets at up to 27- nautical miles.
+  It has been deployed in multiple combat theaters, including Iraq, Afghanistan and now Ukraine."
+introduced: 2005
+manufacturer: Lockheed Martin
+origin: United States
+price: 55
+role: Long-Range Precision Artillery Striker
+variants: 
+  "MLRS M142 HIMARS ATACMS HE [CH]": {}
diff --git a/resources/units/ground_units/CHAP_M142_GMLRS_M30.yaml b/resources/units/ground_units/CHAP_M142_GMLRS_M30.yaml
new file mode 100644
index 00000000..161a12ca
--- /dev/null
+++ b/resources/units/ground_units/CHAP_M142_GMLRS_M30.yaml
@@ -0,0 +1,12 @@
+class: Artillery
+description: "A highly mobile wheeled artillery rocket system designed to deliver long-range precision strikes.
+  The HIMARS is based on a standard 5-ton truck chassis and can be airliffted by C-130 hercules aircraft for rapid
+  deployment. Depending on the munitions, the HIMARS can engage targets at up to 27- nautical miles.
+  It has been deployed in multiple combat theaters, including Iraq, Afghanistan and now Ukraine."
+introduced: 2005
+manufacturer: Lockheed Martin
+origin: United States
+price: 55
+role: Long-Range Precision Artillery Striker
+variants: 
+  "MLRS M142 HIMARS GMLRS CM [CH]": {}
diff --git a/resources/units/ground_units/CHAP_M142_GMLRS_M31.yaml b/resources/units/ground_units/CHAP_M142_GMLRS_M31.yaml
new file mode 100644
index 00000000..6d6cee14
--- /dev/null
+++ b/resources/units/ground_units/CHAP_M142_GMLRS_M31.yaml
@@ -0,0 +1,12 @@
+class: Artillery
+description: "A highly mobile wheeled artillery rocket system designed to deliver long-range precision strikes.
+  The HIMARS is based on a standard 5-ton truck chassis and can be airliffted by C-130 hercules aircraft for rapid
+  deployment. Depending on the munitions, the HIMARS can engage targets at up to 27- nautical miles.
+  It has been deployed in multiple combat theaters, including Iraq, Afghanistan and now Ukraine."
+introduced: 2005
+manufacturer: Lockheed Martin
+origin: United States
+price: 55
+role: Long-Range Precision Artillery Striker
+variants: 
+  "MLRS M142 HIMARS GMLRS HE [CH]": {}
diff --git a/resources/units/ground_units/CHAP_MATV.yaml b/resources/units/ground_units/CHAP_MATV.yaml
new file mode 100644
index 00000000..87b5e30f
--- /dev/null
+++ b/resources/units/ground_units/CHAP_MATV.yaml
@@ -0,0 +1,11 @@
+class: Recon
+description: The Mine-Resistant Ambush-Protected or M-ATV serves as a more heavily armored troop carrier
+  in response to increased threat from IEDs during the war on terror. THe rugged chassis allows for multiple
+  configurations of heavy armor. It exceps at convoy protection and troop transport in asymmetric warfare enviroments.
+introduced: 2007
+manufacturer: Oshkosh Defence
+origin: United States
+price: 3
+role: Armored Personnel Carrier
+variants: 
+  "APC MRAP M-ATV [CH]": {}
diff --git a/resources/units/ground_units/CHAP_PantsirS1.yaml b/resources/units/ground_units/CHAP_PantsirS1.yaml
new file mode 100644
index 00000000..b0dfb472
--- /dev/null
+++ b/resources/units/ground_units/CHAP_PantsirS1.yaml
@@ -0,0 +1,14 @@
+class: SHORAD
+description: "The Pantsir (Russian: \xD0\x9F\xD0\xB0\xD0\xBD\xD1\x86\xD0\xB8\xD1\x80\xD1\x8C, lit. '[body] 
+  armour') missile system is a family of self-propelled, medium-range surface-to-air missile and 
+  anti-aircraft artillery systems. Three types of vehicles make up one system: a missile launcher, 
+  a radar truck and a command post. Starting with the Pantsir-S1 (Russian: \xD0\x9F\xD0\xB0\xD0\xBD\xD1\x86\xD0\xB8\xD1\x80\xD1\x8C\x2D\xD0\xA1\x31, 
+  NATO reporting name SA-22 Greyhound) as the first version, it is produced by KBP Instrument Design 
+  Bureau of Tula, Russia, and is the successor to the Tunguska M1."
+introduced: 2012
+manufacturer: Ulyanovsk Mechanical Plant
+origin: Russia
+price: 40
+role: Self-Propelled Surface-to-Air Missile Launcher
+variants:
+  "SAM SA-22 Pantsir-S1 \"Greyhound\" [CH]": {}
\ No newline at end of file
diff --git a/resources/units/ground_units/CHAP_T64BV.yaml b/resources/units/ground_units/CHAP_T64BV.yaml
new file mode 100644
index 00000000..f421f4f7
--- /dev/null
+++ b/resources/units/ground_units/CHAP_T64BV.yaml
@@ -0,0 +1,17 @@
+class: Tank
+description: The T-64 is a Soviet second-generation main battle tank, designed by
+  Kharkiv Morozov Machine Building Design Bureau in Ukraine, introduced in the early
+  1960s. It was a more advanced counterpart to the T-62; the T-64 served in tank
+  divisions, while the T-62 supported infantry in motorized rifle divisions. It
+  introduced a number of advanced features including composite armour, a compact
+  engine and transmission, and a smoothbore 125-mm gun equipped with an autoloader
+  to allow the crew to be reduced to three so the tank could be smaller and lighter.
+  In spite of being armed and armoured like a heavy tank, the T-64 weighed only 38
+  tonnes (42 short tons; 37 long tons).
+introduced: 1966
+manufacturer: Kharkiv
+origin: USSR/Russia
+price: 19
+role: Main Battle Tank
+variants:
+  "MBT T-64BV Type 2017 [CH]": {}
diff --git a/resources/units/ground_units/CHAP_T84OplotM.yaml b/resources/units/ground_units/CHAP_T84OplotM.yaml
new file mode 100644
index 00000000..626a6034
--- /dev/null
+++ b/resources/units/ground_units/CHAP_T84OplotM.yaml
@@ -0,0 +1,13 @@
+class: Tank
+description: "The T-84 is a Ukrainian main battle tank (MBT), based on the Soviet T-80 MBT 
+  introduced in 1976, specifically the diesel engine version: T-80UD. The T-84 was first built in 
+  1994 and entered service in the Ukrainian Armed Forces in 1999. Its high-performance opposed-piston 
+  engine makes it a fast tank, comparable to other modern MBTs with a power-to-weight ratio of about 
+  26 horsepower per tonne (19 kW/t)."
+introduced: 1999
+manufacturer: Malyshev Factory
+origin: Ukraine
+price: 25
+role: Main Battle Tank
+variants:
+  "MBT T-84 Oplot-M [CH]": {}
diff --git a/resources/units/ground_units/CHAP_T90M.yaml b/resources/units/ground_units/CHAP_T90M.yaml
new file mode 100644
index 00000000..1c7295e4
--- /dev/null
+++ b/resources/units/ground_units/CHAP_T90M.yaml
@@ -0,0 +1,13 @@
+class: Tank
+description: "The T-90 is a third-generation Russian main battle tank developed from, and designed to replace 
+  the T-72. It uses a 125 mm 2A46 smoothbore main gun, the 1A45T fire-control system, an upgraded engine, 
+  and gunner's thermal sight. Standard protective measures include a blend of steel and composite armour, 
+  smoke grenade dischargers, Kontakt-5 explosive reactive armour (ERA) and the Shtora infrared anti-tank 
+  guided missile (ATGM) jamming system."
+introduced: 2019
+manufacturer: Uralvagonzavod
+origin: Russia
+price: 25
+role: Main Battle Tank
+variants:
+  "MBT T-90M [CH]": {}
diff --git a/resources/units/ground_units/CHAP_TOS1A.yaml b/resources/units/ground_units/CHAP_TOS1A.yaml
new file mode 100644
index 00000000..02ba00e4
--- /dev/null
+++ b/resources/units/ground_units/CHAP_TOS1A.yaml
@@ -0,0 +1,14 @@
+class: Artillery
+description: "TOS-1 Buratino (Russian: \xD1\x82\xD1\x8F\xD0\xB6\xD1\x91\xD0\xBB\xD0\xB0\xD1\x8F\x20\xD0\xBE\xD0\xB3\xD0\xBD\xD0\xB5\xD0\xBC\xD1\x91\xD1\x82\xD0\xBD\xD0\xB0\xD1\x8F\x20\xD1\x81\xD0\xB8\xD1\x81\xD1\x82\xD0\xB5\xD0\xBC\xD0\xB0\x20\x5B\xD0\xA2\xD0\x9E\xD0\xA1\x2D\x31\x5D,
+  romanized: Tyazhyelaya ognemyetnaya sistema [TOS-1], Heavy Flamethrower System) is a Soviet 220 mm
+  30-barrel (original system, Object 634 or TOS-1M) or 24-barrel (Object 634B or TOS-1A Solntsepyok)
+  multiple rocket launcher capable of using thermobaric warheads, mounted on a T-72 / T-90 tank chassis.
+  TOS-1 was designed to attack enemy fortified positions and lightly armored vehicles and transports,
+  particularly in open terrain."
+introduced: 2003
+manufacturer: Uralvagonzavod
+origin: USSR/Russia
+price: 45
+role: Multiple-Launch Rocket System
+variants:
+  "MLRS TOS-1A Solntsepyok [CH]": {}
diff --git a/resources/units/ground_units/CHAP_TorM2.yaml b/resources/units/ground_units/CHAP_TorM2.yaml
new file mode 100644
index 00000000..6214c8e3
--- /dev/null
+++ b/resources/units/ground_units/CHAP_TorM2.yaml
@@ -0,0 +1,13 @@
+class: SHORAD
+description: "The Tor (Russian: \xD0\xA2\xD0\xBE\xD1\x80; English: torus) is an all-weather, low-to 
+  medium-altitude, short-range surface-to-air missile system designed for destroying airplanes, helicopters, 
+  cruise missiles, unmanned aerial vehicles and short-range ballistic threats (anti-munitions). Originally 
+  developed by the Soviet Union under the GRAU designation 9K330 Tor, the system is commonly known by its 
+  NATO reporting name, SA-15 Gauntlet."
+introduced: 2007
+manufacturer: Almaz-Antey
+origin: Russia
+price: 40
+role: Self-Propelled Anti-Aircraft System
+variants:
+  "SAM SA-15 Tor M2 \"Gauntlet\" [CH]": {}
\ No newline at end of file
diff --git a/resources/units/ships/CHAP_Project22160.yaml b/resources/units/ships/CHAP_Project22160.yaml
new file mode 100644
index 00000000..03dbec76
--- /dev/null
+++ b/resources/units/ships/CHAP_Project22160.yaml
@@ -0,0 +1,4 @@
+class: Destroyer
+price: 0
+variants:
+  "Project 22160 Patrol Ship [CH]": null
\ No newline at end of file
diff --git a/resources/units/ships/CHAP_Project22160_TorM2KM.yaml b/resources/units/ships/CHAP_Project22160_TorM2KM.yaml
new file mode 100644
index 00000000..f005852a
--- /dev/null
+++ b/resources/units/ships/CHAP_Project22160_TorM2KM.yaml
@@ -0,0 +1,4 @@
+class: Destroyer
+price: 0
+variants:
+  "Project 22160 Patrol Ship with Tor M2KM [CH]": null
\ No newline at end of file