diff --git a/.gitignore b/.gitignore
index d023a5dd..4238e3be 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@ Distribution/Restock/GameData/ReStock/Props/**/*.png
 Distribution/RestockPlus/GameData/ReStockPlus/Props/**/*.png
 Distribution/RestockPlus/GameData/ReStockPlus/Spaces/**/*.png
 Distribution/Restock/GameData/ReStock/RestockPatchDisabler.cfg
+Source/Restock/dlls
diff --git a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-bobcat-1-e.dds b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-bobcat-1-e.dds
new file mode 100644
index 00000000..80bc1c98
Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-bobcat-1-e.dds differ
diff --git a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-bobcat-1-n.dds b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-bobcat-1-n.dds
new file mode 100644
index 00000000..1174d11a
Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-bobcat-1-n.dds differ
diff --git a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-bobcat-1.dds b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-bobcat-1.dds
new file mode 100644
index 00000000..ddfd24a9
Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-bobcat-1.dds differ
diff --git a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-bobcat-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-bobcat-1.mu
new file mode 100644
index 00000000..4051bc20
Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-bobcat-1.mu differ
diff --git a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-cheetah-1-e.dds b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-cheetah-1-e.dds
new file mode 100644
index 00000000..df79d720
Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-cheetah-1-e.dds differ
diff --git a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-cheetah-1-n.dds b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-cheetah-1-n.dds
new file mode 100644
index 00000000..91543613
Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-cheetah-1-n.dds differ
diff --git a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-cheetah-1.dds b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-cheetah-1.dds
new file mode 100644
index 00000000..3c99c2c2
Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-cheetah-1.dds differ
diff --git a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-cheetah-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-cheetah-1.mu
new file mode 100644
index 00000000..485ce0aa
Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-cheetah-1.mu differ
diff --git a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-cheetah-2.mu b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-cheetah-2.mu
new file mode 100644
index 00000000..07daa862
Binary files /dev/null and b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-cheetah-2.mu differ
diff --git a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-dart-1.mu b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-dart-1.mu
index 1fc0bfca..f11da9f4 100644
Binary files a/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-dart-1.mu and b/Distribution/Restock/GameData/ReStock/Assets/Engine/restock-engine-dart-1.mu differ
diff --git a/Distribution/Restock/GameData/ReStock/Localization/en-us.cfg b/Distribution/Restock/GameData/ReStock/Localization/en-us.cfg
index 93b5ab5e..b98f5715 100644
--- a/Distribution/Restock/GameData/ReStock/Localization/en-us.cfg
+++ b/Distribution/Restock/GameData/ReStock/Localization/en-us.cfg
@@ -42,6 +42,8 @@ Localization
     #LOC_Restock_variant-engine_boattail_size1p5_white = Boattail (1.875m, White)
     #LOC_Restock_variant-engine_boattail_size1_grey-orange = Boattail (1.25m, Orange/Grey)
     #LOC_Restock_variant-engine_boattail_size1p5_grey-orange = Boattail (1.875m, Orange/Grey)
+	#LOC_Restock_variant-engine_tankbutt = Tankbutt
+	#LOC_Restock_variant-engine_tankbutt_white = Tankbutt (White)
     #LOC_Restock_variant-engine_tankbutt_size2_white = Tankbutt (2.5m, White)
     #LOC_Restock_variant-engine_tankbutt_size2_grey-orange = Tankbutt (2.5m, Orange/Grey)
     #LOC_Restock_variant-engine_singlebell_compact = Single Compact
diff --git a/Distribution/Restock/GameData/ReStock/Patches/Aerodynamic/restock-intakes-depthmasks.cfg b/Distribution/Restock/GameData/ReStock/Patches/Aerodynamic/restock-intakes-depthmasks.cfg
index 1a29c1fd..a44c368c 100644
--- a/Distribution/Restock/GameData/ReStock/Patches/Aerodynamic/restock-intakes-depthmasks.cfg
+++ b/Distribution/Restock/GameData/ReStock/Patches/Aerodynamic/restock-intakes-depthmasks.cfg
@@ -9,7 +9,7 @@
 // - Mk1 Diverterless Supersonic Intake (MK1IntakeFuselage)
 
 // Circular Intake
-@PART[CircularIntake]
+@PART[CircularIntake]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
 {
   !mesh = DELETE
   MODEL
@@ -28,7 +28,7 @@
 }
 
 // Small Circular Intake
-@PART[miniIntake]
+@PART[miniIntake]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
 {
   !mesh = DELETE
   MODEL
@@ -47,7 +47,7 @@
 }
 
 // Shock Cone Intake
-@PART[shockConeIntake]
+@PART[shockConeIntake]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
 {
   MODEL
   {
@@ -61,7 +61,7 @@
 }
 
 // Adjustable Ramp Intake 
-@PART[ramAirIntake]
+@PART[ramAirIntake]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
 {
   !mesh = DELETE
   MODEL
@@ -80,7 +80,7 @@
 }
 
 // Adjustable Ramp Intake Radial
-@PART[IntakeRadialLong]
+@PART[IntakeRadialLong]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
 {
   !mesh = DELETE
   MODEL
@@ -99,7 +99,7 @@
 }
 
 // XM-G50 Radial Air Intake
-@PART[airScoop]
+@PART[airScoop]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
 {
   !mesh = DELETE
   MODEL
@@ -119,7 +119,7 @@
 }
 
 // Mk1 Diverterless Supersonic Intake
-@PART[MK1IntakeFuselage]
+@PART[MK1IntakeFuselage]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
 {
   MODEL
   {
diff --git a/Distribution/Restock/GameData/ReStock/Patches/Coupling/restock-claws.cfg b/Distribution/Restock/GameData/ReStock/Patches/Coupling/restock-claws.cfg
index c389e5ec..95d48df8 100644
--- a/Distribution/Restock/GameData/ReStock/Patches/Coupling/restock-claws.cfg
+++ b/Distribution/Restock/GameData/ReStock/Patches/Coupling/restock-claws.cfg
@@ -4,7 +4,7 @@
 // - Advanced Grabbing Unit Jr. (smallClaw)
 
 // Advanced Grabbing Unit
-@PART[GrapplingDevice]:HAS[~RestockIgnore[*]]:FOR[ReStock]
+@PART[GrapplingDevice]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
 {
   @author = Andrew Cassidy
   !mesh = DELETE
@@ -189,7 +189,7 @@
 }
 
 // Advanced Grabbing Unit Jr.
-@PART[smallClaw]:HAS[~RestockIgnore[*]]:FOR[ReStock]
+@PART[smallClaw]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
 {
   @author = Andrew Cassidy
   !mesh = DELETE
diff --git a/Distribution/Restock/GameData/ReStock/Patches/Electrical/restock-solarpanels.cfg b/Distribution/Restock/GameData/ReStock/Patches/Electrical/restock-solarpanels.cfg
index 77009278..9807eb48 100644
--- a/Distribution/Restock/GameData/ReStock/Patches/Electrical/restock-solarpanels.cfg
+++ b/Distribution/Restock/GameData/ReStock/Patches/Electrical/restock-solarpanels.cfg
@@ -201,7 +201,7 @@
 }
 
 // SP-10C Photovoltaic Panels
-@PART[solarPanelSP10C]
+@PART[solarPanelSP10C]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
 {
   @author = Chris Adderley (Nertea)
   !mesh = DELETE
diff --git a/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-jet-depthmasks.cfg b/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-jet-depthmasks.cfg
index fd5ac9c3..9e40a089 100644
--- a/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-jet-depthmasks.cfg
+++ b/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-jet-depthmasks.cfg
@@ -6,7 +6,7 @@
 // J-20 "Juno" Basic Jet Engine (miniJetEngine)
 
 // J-33 "Wheesley" Turbofan Engine
-@PART[JetEngine]
+@PART[JetEngine]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
 {
   MODEL
   {
@@ -20,7 +20,7 @@
 }
 
 // J-404 "Panther" Afterburning Turbofan
-@PART[turboJet]
+@PART[turboJet]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
 {
   MODEL
   {
@@ -34,7 +34,7 @@
 }
 
 // J-X4 "Whiplash" Turbo Ramjet Engine
-@PART[turboFanEngine]
+@PART[turboFanEngine]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
 {
   MODEL
   {
@@ -48,7 +48,7 @@
 }
 
 // J-20 "Juno" Basic Jet Engine
-@PART[miniJetEngine]
+@PART[miniJetEngine]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
 {
   MODEL
   {
diff --git a/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-srb-125.cfg b/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-srb-125.cfg
index c5dac638..e9f82b84 100644
--- a/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-srb-125.cfg
+++ b/Distribution/Restock/GameData/ReStock/Patches/Engine/restock-engines-srb-125.cfg
@@ -779,7 +779,7 @@
 }
 
 // Launch Escape System
-@PART[LaunchEscapeSystem]
+@PART[LaunchEscapeSystem]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
 {
   @author = Andrew Cassidy
   !mesh = DELETE
diff --git a/Distribution/Restock/GameData/ReStock/Patches/Resource/restock-fuelvent.cfg b/Distribution/Restock/GameData/ReStock/Patches/Resource/restock-fuelvent.cfg
index d71dbe30..f157d34d 100644
--- a/Distribution/Restock/GameData/ReStock/Patches/Resource/restock-fuelvent.cfg
+++ b/Distribution/Restock/GameData/ReStock/Patches/Resource/restock-fuelvent.cfg
@@ -3,7 +3,7 @@
 // - FTE-1 Drain Valve (ReleaseValve)
 
 // FTE-1 Drain Valve
-@PART[ReleaseValve]:HAS[~RestockIgnore[*]]:FOR[ReStock]
+@PART[ReleaseValve]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
 {
   @author = Andrew Cassidy
   !mesh = DELETE
diff --git a/Distribution/Restock/GameData/ReStock/Patches/Science/restock-science.cfg b/Distribution/Restock/GameData/ReStock/Patches/Science/restock-science.cfg
index cd1ae6ad..8ecef985 100644
--- a/Distribution/Restock/GameData/ReStock/Patches/Science/restock-science.cfg
+++ b/Distribution/Restock/GameData/ReStock/Patches/Science/restock-science.cfg
@@ -188,7 +188,7 @@
 }
 
 // Magnetometer Boom
-@PART[Magnetometer]:HAS[~RestockIgnore[*]]:FOR[ReStock]
+@PART[Magnetometer]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
 {
   @author = Andrew Cassidy
   !mesh = DELETE
diff --git a/Distribution/Restock/GameData/ReStock/Patches/Thermal/restock-heat-shields.cfg b/Distribution/Restock/GameData/ReStock/Patches/Thermal/restock-heat-shields.cfg
index 789f7410..0c646e49 100644
--- a/Distribution/Restock/GameData/ReStock/Patches/Thermal/restock-heat-shields.cfg
+++ b/Distribution/Restock/GameData/ReStock/Patches/Thermal/restock-heat-shields.cfg
@@ -294,7 +294,7 @@
 }
 
 // Heat Shield (10m)
-@PART[InflatableHeatShield]
+@PART[InflatableHeatShield]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
 {
   @author = Chris Adderley (Nertea)
   !mesh = DELETE
diff --git a/Distribution/Restock/GameData/ReStock/PatchesLegacy/Control/restock-rcs.cfg b/Distribution/Restock/GameData/ReStock/PatchesLegacy/Control/restock-rcs.cfg
index 0fd95d03..ed2fe537 100644
--- a/Distribution/Restock/GameData/ReStock/PatchesLegacy/Control/restock-rcs.cfg
+++ b/Distribution/Restock/GameData/ReStock/PatchesLegacy/Control/restock-rcs.cfg
@@ -1,10 +1,9 @@
 // Patches applying art changes to Legacy RCS blocks
 // Contents:
 // - RV-105 RCS Thruster Block (RCSBlock)
-// - Vernor Engine (vernorEngine)
 
 // RV-105 RCS Thruster Block
-@PART[RCSBlock]
+@PART[RCSBlock]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
 {
   @author = Chris Adderley (Nertea)
   !mesh = DELETE
@@ -58,48 +57,3 @@
     }
   }
 }
-
-// Vernor Engine
-@PART[vernierEngine]
-{
-  @author = Chris Adderley (Nertea)
-  !mesh = DELETE
-  !MODEL {}
-  MODEL
-  {
-    model = ReStock/Assets/Control/restock-rcs-vernor-1
-    scale = 1,1,1
-  }
-  @scale = 1
-  @rescaleFactor = 1
-  !EFFECTS {}
-  EFFECTS
-  {
-    running
-    {
-      AUDIO
-      {
-        channel = Ship
-        clip = sound_rocket_mini
-        volume = 0.0 0.0
-        volume = 0.02 0.2
-        volume = 0.5 0.2
-        volume = 1.0 0.2
-        pitch = 1.0
-        loop = true
-      }
-      MODEL_MULTI_PARTICLE
-      {
-        name = fx1
-        modelName = ReStock/FX/restock-fx-vernor-1
-        transformName = RCSthruster
-        emission = 0.0 0.0
-        emission = 0.1 0.0
-        emission = 1.0 1.0
-        speed = 0.0 0.8
-        speed = 1.0 1.0
-        localRotation = -180, 0, 0
-      }
-    }
-  }
-}
diff --git a/Distribution/Restock/GameData/ReStock/PatchesLegacy/Engines/restock-engines-liquid-0625.cfg b/Distribution/Restock/GameData/ReStock/PatchesLegacy/Engines/restock-engines-liquid-0625.cfg
index a23a5d5f..4a24d9e1 100644
--- a/Distribution/Restock/GameData/ReStock/PatchesLegacy/Engines/restock-engines-liquid-0625.cfg
+++ b/Distribution/Restock/GameData/ReStock/PatchesLegacy/Engines/restock-engines-liquid-0625.cfg
@@ -5,7 +5,7 @@
 // - 24-77 "Twitch" Liquid Fuel Engine (smallRadialEngine)
 
 // LV-1 "Ant" Liquid Fuel Engine
-@PART[microEngine]
+@PART[microEngine]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
 {
   @author = Chris Adderley (Nertea)
   !mesh = DELETE
@@ -162,7 +162,7 @@
 }
 
 // LV-1R "Spider" Liquid Fuel Engine
-@PART[radialEngineMini]
+@PART[radialEngineMini]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
 {
   @author = Chris Adderley (Nertea)
   !mesh = DELETE
@@ -338,7 +338,7 @@
 }
 
 // 24-77 "Twitch" Liquid Fuel Engine
-@PART[smallRadialEngine]
+@PART[smallRadialEngine]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
 {
   @author = Chris Adderley (Nertea)
   !mesh = DELETE
diff --git a/Distribution/Restock/GameData/ReStock/PatchesMH/Command/restock-mh-command-pods.cfg b/Distribution/Restock/GameData/ReStock/PatchesMH/Command/restock-mh-command-pods.cfg
index 937ea848..27ac2132 100644
--- a/Distribution/Restock/GameData/ReStock/PatchesMH/Command/restock-mh-command-pods.cfg
+++ b/Distribution/Restock/GameData/ReStock/PatchesMH/Command/restock-mh-command-pods.cfg
@@ -6,7 +6,7 @@
 // - Mk2 Command Pod (Mk2Pod)
 
 //  KV-1
-@PART[kv1Pod]:HAS[~RestockIgnore[*]]:FOR[ReStock]
+@PART[kv1Pod]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
 {
   @author = Well
   !mesh = DELETE
@@ -60,7 +60,7 @@
 }
 
 //  KV-2
-@PART[kv2Pod]:HAS[~RestockIgnore[*]]:FOR[ReStock]
+@PART[kv2Pod]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
 {
   @author = Well
   !mesh = DELETE
@@ -114,7 +114,7 @@
 }
 
 //  KV-3
-@PART[kv3Pod]:HAS[~RestockIgnore[*]]:FOR[ReStock]
+@PART[kv3Pod]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
 {
   @author = Well
   !mesh = DELETE
@@ -168,7 +168,7 @@
 }
 
 // MK-2
-@PART[Mk2Pod]:HAS[~RestockIgnore[*]]:FOR[ReStock]
+@PART[Mk2Pod]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
 {
   @author = Andrew Cassidy
   !mesh = DELETE
diff --git a/Distribution/Restock/GameData/ReStock/PatchesMH/Coupling/restock-mh-airlock.cfg b/Distribution/Restock/GameData/ReStock/PatchesMH/Coupling/restock-mh-airlock.cfg
index cd9d4dfa..c68c30d0 100644
--- a/Distribution/Restock/GameData/ReStock/PatchesMH/Coupling/restock-mh-airlock.cfg
+++ b/Distribution/Restock/GameData/ReStock/PatchesMH/Coupling/restock-mh-airlock.cfg
@@ -3,7 +3,7 @@
 // - Inflatable Airlock (InflatableAirlock)
 
 // Inflatable Airlock
-@PART[InflatableAirlock]:HAS[~RestockIgnore[*]]:FOR[ReStock]
+@PART[InflatableAirlock]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
 {
   @author = Andrew Cassidy
 
diff --git a/Distribution/Restock/GameData/ReStock/PatchesMH/Engine/restock-mh-engines-1875.cfg b/Distribution/Restock/GameData/ReStock/PatchesMH/Engine/restock-mh-engines-1875.cfg
index f051a0c0..5659712f 100644
--- a/Distribution/Restock/GameData/ReStock/PatchesMH/Engine/restock-mh-engines-1875.cfg
+++ b/Distribution/Restock/GameData/ReStock/PatchesMH/Engine/restock-mh-engines-1875.cfg
@@ -2,6 +2,8 @@
 // Contents:
 // - RK-7 "Kodiak" Liquid Fueled Engine (LiquidEngineRK-7)
 // - RE-J10 "Wolfhound" Liquid Fuel Engine AJ10 (LiquidEngineRE-J10)
+// - LV-T91 "Cheetah" Liquid Fuel Engine (LiquidEngineLV-T91)
+// - LV-TX87 "Bobcat" Liquid Fuel Engine (LiquidEngineLV-TX87)
 
 // RK-7 "Kodiak" Liquid Fueled Engine
 @PART[LiquidEngineRK-7]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
@@ -1001,3 +1003,1248 @@
     }
   }
 }
+
+// LV-T91 "Cheetah" Liquid Fuel Engine
+@PART[LiquidEngineLV-T91]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
+{
+  @author = Kavaeric
+  !mesh = DELETE
+  !MODEL,* {}
+  MODEL
+  {
+    model = ReStock/Assets/Engine/restock-engine-cheetah-1
+  }
+  !fx_exhaustFlame_blue = DELETE
+  !fx_exhaustLight_blue = DELETE
+  !fx_smokeTrail_light = DELETE
+  !fx_exhaustSparks_flameout = DELETE
+  !sound_vent_medium = DELETE
+  !sound_rocket_hard = DELETE
+  !sound_vent_soft = DELETE
+  !sound_explosion_low = DELETE
+  !MODULE[ModulePartVariants] {}
+  EFFECTS
+  {
+    engage
+    {
+      AUDIO
+      {
+        channel = Ship
+        clip = sound_vent_medium
+        volume = 1.0
+        pitch = 2.0
+        loop = false
+      }
+    }
+    flameout
+    {
+      AUDIO
+      {
+        channel = Ship
+        clip = sound_explosion_low
+        volume = 1.0
+        pitch = 2.0
+        loop = false
+      }
+    }
+    fx-cheetah-running
+    {
+      AUDIO
+      {
+        channel = Ship
+        clip = sound_rocket_hard
+        volume = 0.0 0.0
+        volume = 0.01 0.2
+        volume = 1.0 0.8
+        pitch = 0.0 0.1
+        pitch = 0.01 0.2
+        pitch = 1.0 0.7
+        loop = true
+      }
+      MODEL_MULTI_PARTICLE
+      {
+        name = core
+        modelName = ReStock/FX/restock-fx-wolfhound-core
+        transformName = fxTransformCore
+        emission = 0.0 0.0
+        emission = 0.01 0.1
+        emission = 0.075 0.25
+        emission = 1.0 1.0
+        speed = 0.0 0.8
+        speed = 1.0 1.0
+      }
+      MODEL_MULTI_PARTICLE
+      {
+        name = plume
+        modelName = ReStock/FX/restock-fx-wolfhound-plume
+        transformName = fxTransformPlume
+        emission = 0.0 0.0
+        emission = 0.01 0.1
+        emission = 0.075 0.25
+        emission = 1.0 1.0
+        speed = 0.0 0.8
+        speed = 1.0 1.0
+      }
+	  MODEL_MULTI_PARTICLE
+      {
+        name = vernier
+        modelName = ReStock/FX/restock-fx-reliant-turbo-1
+        transformName = vernier_fxTransform
+        emission = 0.0 0.0
+        emission = 0.01 0.1
+        emission = 0.075 0.25
+        emission = 1.0 1.0
+        speed = 0.0 0.8
+        speed = 1.0 1.0
+		localRotation = 0, 0, -180
+      }
+      PREFAB_PARTICLE
+      {
+        prefabName = fx_smokeTrail_light
+        transformName = fxTransformPlume
+        emission = 0.0 0.0
+        emission = 0.05 0.0
+        emission = 0.075 0.25
+        emission = 1.0 1.25
+        speed = 0.0 0.25
+        speed = 1.0 1.0
+      }
+    }
+  }
+  @bulkheadProfiles = size1, size1p5, srf
+  @MODULE[ModuleEngines]
+  {
+    @name = ModuleEnginesFX
+    %runningEffectName = fx-cheetah-running
+  }
+  // New bottom node location. Overriden for legacy boattail and compact variants
+  @node_stack_bottom = 0.0, -1.11945, 0.0, 0.0, -1.0, 0.0, 2
+  @MODULE[ModuleJettison]
+  {
+    @jettisonName = LFD_Cheetah_Shrouds
+    %useMultipleDragCubes = false
+  }
+  MODULE
+  {
+    name = ModulePartVariants
+    baseVariant = Cap
+    VARIANT
+    {
+      name = Size1p5
+      displayName = #LOC_Restock_variant-engine_size1p5_white
+      primaryColor = #999999
+      secondaryColor = #ffffff
+      GAMEOBJECTS
+      {
+        // Size 12 ring mount
+        LFD_Cheetah_12_Mount = false
+        LFD_Cheetah_Shroud_12 = false
+        LFD_Cheetah_Shroud_12Alt = false
+        // Size 12 boattail
+        LFD_Cheetah_12_Boattail = false
+        LFD_Cheetah_12_BoattailAlt = false
+        LFD_Cheetah_12_BoattailAlt2 = false
+        LFD_Cheetah_Shroud_12Boattail = false
+        LFD_Cheetah_Shroud_12BoattailAlt = false
+        // Size 12 trusses--enable for all s12 variants
+        LFD_Cheetah_12_MountTruss = false
+        // Size 18 ring mount
+        LFD_Cheetah_18_Mount = true
+        LFD_Cheetah_Shroud_18 = true
+        LFD_Cheetah_Shroud_18Alt = false
+        // Size 18 boattail
+        LFD_Cheetah_18_Boattail = false
+        LFD_Cheetah_18_BoattailAlt = false
+        LFD_Cheetah_18_BoattailAlt2 = false
+        LFD_Cheetah_Shroud_18Boattail = false
+        LFD_Cheetah_Shroud_18BoattailAlt = false
+        // Size 18 trusses--enable for all s18 variants
+        LFD_Cheetah_18_MountTruss = true
+        // Truss for verniers--only disabled on s12 boattail
+        LFD_Cheetah_GimbalTruss = true
+      }
+    }
+	VARIANT
+    {
+      name = Size1p5Alt
+      displayName = #LOC_Restock_variant-engine_size1p5_grey-orange
+      primaryColor = #666666
+      secondaryColor = #f69449
+      GAMEOBJECTS
+      {
+        // Size 12 ring mount
+        LFD_Cheetah_12_Mount = false
+        LFD_Cheetah_Shroud_12 = false
+        LFD_Cheetah_Shroud_12Alt = false
+        // Size 12 boattail
+        LFD_Cheetah_12_Boattail = false
+        LFD_Cheetah_12_BoattailAlt = false
+        LFD_Cheetah_12_BoattailAlt2 = false
+        LFD_Cheetah_Shroud_12Boattail = false
+        LFD_Cheetah_Shroud_12BoattailAlt = false
+        // Size 12 trusses--enable for all s12 variants
+        LFD_Cheetah_12_MountTruss = false
+        // Size 18 ring mount
+        LFD_Cheetah_18_Mount = true
+        LFD_Cheetah_Shroud_18 = false
+        LFD_Cheetah_Shroud_18Alt = true
+        // Size 18 boattail
+        LFD_Cheetah_18_Boattail = false
+        LFD_Cheetah_18_BoattailAlt = false
+        LFD_Cheetah_18_BoattailAlt2 = false
+        LFD_Cheetah_Shroud_18Boattail = false
+        LFD_Cheetah_Shroud_18BoattailAlt = false
+        // Size 18 trusses--enable for all s18 variants
+        LFD_Cheetah_18_MountTruss = true
+        // Truss for verniers--only disabled on s12 boattail
+        LFD_Cheetah_GimbalTruss = true
+      }
+    }
+    VARIANT
+    {
+      name = Cap // Size1p5Boat
+      displayName = #LOC_Restock_variant-engine_boattail_size1p5
+      primaryColor = #000000
+      secondaryColor = #ffffff
+      GAMEOBJECTS
+      {
+        // Size 12 ring mount
+        LFD_Cheetah_12_Mount = false
+        LFD_Cheetah_Shroud_12 = false
+        LFD_Cheetah_Shroud_12Alt = false
+        // Size 12 boattail
+        LFD_Cheetah_12_Boattail = false
+        LFD_Cheetah_12_BoattailAlt = false
+        LFD_Cheetah_12_BoattailAlt2 = false
+        LFD_Cheetah_Shroud_12Boattail = false
+        LFD_Cheetah_Shroud_12BoattailAlt = false
+        // Size 12 trusses--enable for all s12 variants
+        LFD_Cheetah_12_MountTruss = false
+        // Size 18 ring mount
+        LFD_Cheetah_18_Mount = false
+        LFD_Cheetah_Shroud_18 = false
+        LFD_Cheetah_Shroud_18Alt = false
+        // Size 18 boattail
+        LFD_Cheetah_18_Boattail = true
+        LFD_Cheetah_18_BoattailAlt = false
+        LFD_Cheetah_18_BoattailAlt2 = false
+        LFD_Cheetah_Shroud_18Boattail = true
+        LFD_Cheetah_Shroud_18BoattailAlt = false
+        // Size 18 trusses--enable for all s18 variants
+        LFD_Cheetah_18_MountTruss = true
+        // Truss for verniers--only disabled on s12 boattail
+        LFD_Cheetah_GimbalTruss = true
+      }
+      NODES
+      {
+        node_stack_bottom = 0.0, -1.635, 0.0, 0.0, -1.0, 0.0, 2
+      }
+    }
+	VARIANT
+    {
+      name = Size1p5BoatAlt
+      displayName = #LOC_Restock_variant-engine_boattail_size1p5_white
+      primaryColor = #ffffff
+      secondaryColor = #ffffff
+      GAMEOBJECTS
+      {
+        // Size 12 ring mount
+        LFD_Cheetah_12_Mount = false
+        LFD_Cheetah_Shroud_12 = false
+        LFD_Cheetah_Shroud_12Alt = false
+        // Size 12 boattail
+        LFD_Cheetah_12_Boattail = false
+        LFD_Cheetah_12_BoattailAlt = false
+        LFD_Cheetah_12_BoattailAlt2 = false
+        LFD_Cheetah_Shroud_12Boattail = false
+        LFD_Cheetah_Shroud_12BoattailAlt = false
+        // Size 12 trusses--enable for all s12 variants
+        LFD_Cheetah_12_MountTruss = false
+        // Size 18 ring mount
+        LFD_Cheetah_18_Mount = false
+        LFD_Cheetah_Shroud_18 = false
+        LFD_Cheetah_Shroud_18Alt = false
+        // Size 18 boattail
+        LFD_Cheetah_18_Boattail = false
+        LFD_Cheetah_18_BoattailAlt = false
+        LFD_Cheetah_18_BoattailAlt2 = true
+        LFD_Cheetah_Shroud_18Boattail = true
+        LFD_Cheetah_Shroud_18BoattailAlt = false
+        // Size 18 trusses--enable for all s18 variants
+        LFD_Cheetah_18_MountTruss = true
+        // Truss for verniers--only disabled on s12 boattail
+        LFD_Cheetah_GimbalTruss = true
+      }
+	  NODES
+      {
+        node_stack_bottom = 0.0, -1.635, 0.0, 0.0, -1.0, 0.0, 2
+      }
+    }
+	VARIANT
+    {
+      name = Size1p5BoatAlt2
+      displayName = #LOC_Restock_variant-engine_boattail_size1p5_grey-orange
+      primaryColor = #666666
+      secondaryColor = #f69449
+      GAMEOBJECTS
+      {
+        // Size 12 ring mount
+        LFD_Cheetah_12_Mount = false
+        LFD_Cheetah_Shroud_12 = false
+        LFD_Cheetah_Shroud_12Alt = false
+        // Size 12 boattail
+        LFD_Cheetah_12_Boattail = false
+        LFD_Cheetah_12_BoattailAlt = false
+        LFD_Cheetah_12_BoattailAlt2 = false
+        LFD_Cheetah_Shroud_12Boattail = false
+        LFD_Cheetah_Shroud_12BoattailAlt = false
+        // Size 12 trusses--enable for all s12 variants
+        LFD_Cheetah_12_MountTruss = false
+        // Size 18 ring mount
+        LFD_Cheetah_18_Mount = false
+        LFD_Cheetah_Shroud_18 = false
+        LFD_Cheetah_Shroud_18Alt = false
+        // Size 18 boattail
+        LFD_Cheetah_18_Boattail = false
+        LFD_Cheetah_18_BoattailAlt = true
+        LFD_Cheetah_18_BoattailAlt2 = false
+        LFD_Cheetah_Shroud_18Boattail = false
+        LFD_Cheetah_Shroud_18BoattailAlt = true
+        // Size 18 trusses--enable for all s18 variants
+        LFD_Cheetah_18_MountTruss = true
+        // Truss for verniers--only disabled on s12 boattail
+        LFD_Cheetah_GimbalTruss = true
+      }
+	  NODES
+      {
+        node_stack_bottom = 0.0, -1.635, 0.0, 0.0, -1.0, 0.0, 2
+      }
+    }
+    VARIANT
+    {
+      name = Size1
+      displayName = #LOC_Restock_variant-engine_size1_white
+      primaryColor = #999999
+      secondaryColor = #ffffff
+      GAMEOBJECTS
+      {
+        // Size 12 ring mount
+        LFD_Cheetah_12_Mount = true
+        LFD_Cheetah_Shroud_12 = true
+        LFD_Cheetah_Shroud_12Alt = false
+        // Size 12 boattail
+        LFD_Cheetah_12_Boattail = false
+        LFD_Cheetah_12_BoattailAlt = false
+        LFD_Cheetah_12_BoattailAlt2 = false
+        LFD_Cheetah_Shroud_12Boattail = false
+        LFD_Cheetah_Shroud_12BoattailAlt = false
+        // Size 12 trusses--enable for all s12 variants
+        LFD_Cheetah_12_MountTruss = true
+        // Size 18 ring mount
+        LFD_Cheetah_18_Mount = false
+        LFD_Cheetah_Shroud_18 = false
+        LFD_Cheetah_Shroud_18Alt = false
+        // Size 18 boattail
+        LFD_Cheetah_18_Boattail = false
+        LFD_Cheetah_18_BoattailAlt = false
+        LFD_Cheetah_18_BoattailAlt2 = false
+        LFD_Cheetah_Shroud_18Boattail = false
+        LFD_Cheetah_Shroud_18BoattailAlt = false
+        // Size 18 trusses--enable for all s18 variants
+        LFD_Cheetah_18_MountTruss = false
+        // Truss for verniers--only disabled on s12 boattail
+        LFD_Cheetah_GimbalTruss = true
+      }
+	  NODES
+      {
+        node_stack_bottom = 0.0, -1.66, 0.0, 0.0, -1.0, 0.0, 2
+      }
+    }
+	VARIANT
+    {
+      name = Size1Alt
+      displayName = #LOC_Restock_variant-engine_size1_grey-orange
+      primaryColor = #666666
+      secondaryColor = #f69449
+      GAMEOBJECTS
+      {
+        // Size 12 ring mount
+        LFD_Cheetah_12_Mount = true
+        LFD_Cheetah_Shroud_12 = false
+        LFD_Cheetah_Shroud_12Alt = true
+        // Size 12 boattail
+        LFD_Cheetah_12_Boattail = false
+        LFD_Cheetah_12_BoattailAlt = false
+        LFD_Cheetah_12_BoattailAlt2 = false
+        LFD_Cheetah_Shroud_12Boattail = false
+        LFD_Cheetah_Shroud_12BoattailAlt = false
+        // Size 12 trusses--enable for all s12 variants
+        LFD_Cheetah_12_MountTruss = true
+        // Size 18 ring mount
+        LFD_Cheetah_18_Mount = false
+        LFD_Cheetah_Shroud_18 = false
+        LFD_Cheetah_Shroud_18Alt = false
+        // Size 18 boattail
+        LFD_Cheetah_18_Boattail = false
+        LFD_Cheetah_18_BoattailAlt = false
+        LFD_Cheetah_18_BoattailAlt2 = false
+        LFD_Cheetah_Shroud_18Boattail = false
+        LFD_Cheetah_Shroud_18BoattailAlt = false
+        // Size 18 trusses--enable for all s18 variants
+        LFD_Cheetah_18_MountTruss = false
+        // Truss for verniers--only disabled on s12 boattail
+        LFD_Cheetah_GimbalTruss = true
+      }
+	  NODES
+      {
+        node_stack_bottom = 0.0, -1.66, 0.0, 0.0, -1.0, 0.0, 2
+      }
+    }
+    VARIANT
+    {
+      name = Size1Boat
+      displayName = #LOC_Restock_variant-engine_boattail_size1
+      primaryColor = #000000
+      secondaryColor = #ffffff
+      GAMEOBJECTS
+      {
+        // Size 12 ring mount
+        LFD_Cheetah_12_Mount = false
+        LFD_Cheetah_Shroud_12 = false
+        LFD_Cheetah_Shroud_12Alt = false
+        // Size 12 boattail
+        LFD_Cheetah_12_Boattail = true
+        LFD_Cheetah_12_BoattailAlt = false
+        LFD_Cheetah_12_BoattailAlt2 = false
+        LFD_Cheetah_Shroud_12Boattail = true
+        LFD_Cheetah_Shroud_12BoattailAlt = false
+        // Size 12 trusses--enable for all s12 variants
+        LFD_Cheetah_12_MountTruss = true
+        // Size 18 ring mount
+        LFD_Cheetah_18_Mount = false
+        LFD_Cheetah_Shroud_18 = false
+        LFD_Cheetah_Shroud_18Alt = false
+        // Size 18 boattail
+        LFD_Cheetah_18_Boattail = false
+        LFD_Cheetah_18_BoattailAlt = false
+        LFD_Cheetah_18_BoattailAlt2 = false
+        LFD_Cheetah_Shroud_18Boattail = false
+        LFD_Cheetah_Shroud_18BoattailAlt = false
+        // Size 18 trusses--enable for all s18 variants
+        LFD_Cheetah_18_MountTruss = false
+        // Truss for verniers--only disabled on s12 boattail
+        LFD_Cheetah_GimbalTruss = false
+      }
+    }
+	VARIANT
+    {
+      name = Size1BoatAlt
+      displayName = #LOC_Restock_variant-engine_boattail_size1_white
+      primaryColor = #ffffff
+      secondaryColor = #ffffff
+      GAMEOBJECTS
+      {
+        // Size 12 ring mount
+        LFD_Cheetah_12_Mount = false
+        LFD_Cheetah_Shroud_12 = false
+        LFD_Cheetah_Shroud_12Alt = false
+        // Size 12 boattail
+        LFD_Cheetah_12_Boattail = false
+        LFD_Cheetah_12_BoattailAlt = false
+        LFD_Cheetah_12_BoattailAlt2 = true
+        LFD_Cheetah_Shroud_12Boattail = true
+        LFD_Cheetah_Shroud_12BoattailAlt = false
+        // Size 12 trusses--enable for all s12 variants
+        LFD_Cheetah_12_MountTruss = true
+        // Size 18 ring mount
+        LFD_Cheetah_18_Mount = false
+        LFD_Cheetah_Shroud_18 = false
+        LFD_Cheetah_Shroud_18Alt = false
+        // Size 18 boattail
+        LFD_Cheetah_18_Boattail = false
+        LFD_Cheetah_18_BoattailAlt = false
+        LFD_Cheetah_18_BoattailAlt2 = false
+        LFD_Cheetah_Shroud_18Boattail = false
+        LFD_Cheetah_Shroud_18BoattailAlt = false
+        // Size 18 trusses--enable for all s18 variants
+        LFD_Cheetah_18_MountTruss = false
+        // Truss for verniers--only disabled on s12 boattail
+        LFD_Cheetah_GimbalTruss = false
+      }
+    }
+	VARIANT
+    {
+      name = Size1BoatAlt2
+      displayName = #LOC_Restock_variant-engine_boattail_size1_grey-orange
+      primaryColor = #666666
+      secondaryColor = #f69449
+      GAMEOBJECTS
+      {
+        // Size 12 ring mount
+        LFD_Cheetah_12_Mount = false
+        LFD_Cheetah_Shroud_12 = false
+        LFD_Cheetah_Shroud_12Alt = false
+        // Size 12 boattail
+        LFD_Cheetah_12_Boattail = false
+        LFD_Cheetah_12_BoattailAlt = true
+        LFD_Cheetah_12_BoattailAlt2 = false
+        LFD_Cheetah_Shroud_12Boattail = false
+        LFD_Cheetah_Shroud_12BoattailAlt = true
+        // Size 12 trusses--enable for all s12 variants
+        LFD_Cheetah_12_MountTruss = true
+        // Size 18 ring mount
+        LFD_Cheetah_18_Mount = false
+        LFD_Cheetah_Shroud_18 = false
+        LFD_Cheetah_Shroud_18Alt = false
+        // Size 18 boattail
+        LFD_Cheetah_18_Boattail = false
+        LFD_Cheetah_18_BoattailAlt = false
+        LFD_Cheetah_18_BoattailAlt2 = false
+        LFD_Cheetah_Shroud_18Boattail = false
+        LFD_Cheetah_Shroud_18BoattailAlt = false
+        // Size 18 trusses--enable for all s18 variants
+        LFD_Cheetah_18_MountTruss = false
+        // Truss for verniers--only disabled on s12 boattail
+        LFD_Cheetah_GimbalTruss = false
+      }
+    }
+    VARIANT
+    {
+      name = Bare
+      displayName = #LOC_Restock_variant-engine_compact_white
+      themeName = Bare
+      primaryColor = #666666
+      secondaryColor = #ffffff
+      GAMEOBJECTS
+      {
+        // Size 12 ring mount
+        LFD_Cheetah_12_Mount = false
+        LFD_Cheetah_Shroud_12 = true
+        LFD_Cheetah_Shroud_12Alt = false
+        // Size 12 boattail
+        LFD_Cheetah_12_Boattail = false
+        LFD_Cheetah_12_BoattailAlt = false
+        LFD_Cheetah_12_BoattailAlt2 = false
+        LFD_Cheetah_Shroud_12Boattail = false
+        LFD_Cheetah_Shroud_12BoattailAlt = false
+        // Size 12 trusses--enable for all s12 variants
+        LFD_Cheetah_12_MountTruss = false
+        // Size 18 ring mount
+        LFD_Cheetah_18_Mount = false
+        LFD_Cheetah_Shroud_18 = false
+        LFD_Cheetah_Shroud_18Alt = false
+        // Size 18 boattail
+        LFD_Cheetah_18_Boattail = false
+        LFD_Cheetah_18_BoattailAlt = false
+        LFD_Cheetah_18_BoattailAlt2 = false
+        LFD_Cheetah_Shroud_18Boattail = false
+        LFD_Cheetah_Shroud_18BoattailAlt = false
+        // Size 18 trusses--enable for all s18 variants
+        LFD_Cheetah_18_MountTruss = false
+        // Truss for verniers--only disabled on s12 boattail
+        LFD_Cheetah_GimbalTruss = true
+      }
+	  NODES
+      {
+        node_stack_bottom = 0.0, -1.66, 0.0, 0.0, -1.0, 0.0, 2
+      }
+    }
+	VARIANT
+    {
+      name = BareAlt
+      displayName = #LOC_Restock_variant-engine_compact_grey-orange
+      themeName = Bare
+      primaryColor = #666666
+      secondaryColor = #ffffff
+      GAMEOBJECTS
+      {
+        // Size 12 ring mount
+        LFD_Cheetah_12_Mount = false
+        LFD_Cheetah_Shroud_12 = false
+        LFD_Cheetah_Shroud_12Alt = true
+        // Size 12 boattail
+        LFD_Cheetah_12_Boattail = false
+        LFD_Cheetah_12_BoattailAlt = false
+        LFD_Cheetah_12_BoattailAlt2 = false
+        LFD_Cheetah_Shroud_12Boattail = false
+        LFD_Cheetah_Shroud_12BoattailAlt = false
+        // Size 12 trusses--enable for all s12 variants
+        LFD_Cheetah_12_MountTruss = false
+        // Size 18 ring mount
+        LFD_Cheetah_18_Mount = false
+        LFD_Cheetah_Shroud_18 = false
+        LFD_Cheetah_Shroud_18Alt = false
+        // Size 18 boattail
+        LFD_Cheetah_18_Boattail = false
+        LFD_Cheetah_18_BoattailAlt = false
+        LFD_Cheetah_18_BoattailAlt2 = false
+        LFD_Cheetah_Shroud_18Boattail = false
+        LFD_Cheetah_Shroud_18BoattailAlt = false
+        // Size 18 trusses--enable for all s18 variants
+        LFD_Cheetah_18_MountTruss = false
+        // Truss for verniers--only disabled on s12 boattail
+        LFD_Cheetah_GimbalTruss = true
+      }
+	  NODES
+      {
+        node_stack_bottom = 0.0, -1.66, 0.0, 0.0, -1.0, 0.0, 2
+      }
+    }
+  }
+  MODULE
+  {
+    name = FXModuleThrottleEffects
+    fxModuleNames = heatColor
+    responseSpeed = 1.0
+    dependOnEngineState = True
+    dependOnThrottle = True
+  }
+  MODULE
+  {
+    name = FXModuleThrottleEffects
+    fxModuleNames = throttleColor
+    responseSpeed = 1.0
+    dependOnEngineState = True
+    dependOnThrottle = True
+  }
+  MODULE
+  {
+    name = ModuleColorChanger
+    moduleID = heatColor
+    animRate = 0.025
+    shaderProperty = _EmissiveColor
+    excludedRenderer = EngineCore
+    toggleInEditor = false
+    toggleInFlight = false
+    redCurve
+    {
+      key = 0 0 1 1
+      key = 1 1 1 1
+    }
+    greenCurve
+    {
+      key = 0 0 1 1
+      key = 1 1 1 1
+    }
+    blueCurve
+    {
+      key = 0 0 1 1
+      key = 1 1 1 1
+    }
+    alphaCurve
+    {
+      key = 0 0 1 1
+      key = 1 1 1 1
+    }
+  }
+  MODULE
+  {
+    name = ModuleColorChanger
+    moduleID = throttleColor
+    animRate = 1
+    shaderProperty = _TintColor
+    includedRenderer = EngineCore
+    toggleInEditor = false
+    toggleInFlight = false
+    redCurve
+    {
+      key = 0 0
+      key = 1 1
+    }
+    greenCurve
+    {
+      key = 0 0
+      key = 1 1
+    }
+    blueCurve
+    {
+      key = 0 0
+      key = 1 1
+    }
+    alphaCurve
+    {
+      key = 0 0
+      key = 1 1
+    }
+  }
+  MODULE
+  {
+    name = FXModuleLookAtConstraint
+    CONSTRAINLOOKFX
+    {
+      targetName = gimbalArm_upper1
+      rotatorsName = gimbalArm_lower1
+    }
+    CONSTRAINLOOKFX
+    {
+      targetName = gimbalArm_lower1
+      rotatorsName = gimbalArm_upper1
+    }
+    CONSTRAINLOOKFX
+    {
+      targetName = gimbalArm_upper2
+      rotatorsName = gimbalArm_lower2
+    }
+    CONSTRAINLOOKFX
+    {
+      targetName = gimbalArm_lower2
+      rotatorsName = gimbalArm_upper2
+    }
+    CONSTRAINLOOKFX
+    {
+      targetName = gimbalArm_upper3
+      rotatorsName = gimbalArm_lower3
+    }
+    CONSTRAINLOOKFX
+    {
+      targetName = gimbalArm_lower3
+      rotatorsName = gimbalArm_upper3
+    }
+    CONSTRAINLOOKFX
+    {
+      targetName = gimbalArm_upper4
+      rotatorsName = gimbalArm_lower4
+    }
+    CONSTRAINLOOKFX
+    {
+      targetName = gimbalArm_lower4
+      rotatorsName = gimbalArm_upper4
+    }
+  }
+}
+
+// LV-TX87 "Bobcat" Liquid Fuel Engine
+@PART[LiquidEngineLV-TX87]:HAS[~RestockIgnore[*]]:FOR[000_ReStock]
+{
+  @author = Kavaeric
+  !mesh = DELETE
+  !MODEL,* {}
+  MODEL
+  {
+    model = ReStock/Assets/Engine/restock-engine-bobcat-1
+  }
+  !fx_exhaustFlame_blue_medium = DELETE
+  !fx_exhaustLight_blue = DELETE
+  !fx_smokeTrail_light = DELETE
+  !fx_exhaustSparks_flameout = DELETE
+  !sound_vent_medium = DELETE
+  !sound_rocket_hard = DELETE
+  !sound_vent_soft = DELETE
+  !sound_explosion_low = DELETE
+  !MODULE[ModulePartVariants] {}
+  EFFECTS
+  {
+    engage
+    {
+      AUDIO
+      {
+        channel = Ship
+        clip = sound_vent_medium
+        volume = 1.0
+        pitch = 2.0
+        loop = false
+      }
+    }
+    flameout
+    {
+      AUDIO
+      {
+        channel = Ship
+        clip = sound_explosion_low
+        volume = 1.0
+        pitch = 2.0
+        loop = false
+      }
+    }
+    fx-bobcat-running
+    {
+      AUDIO
+      {
+        channel = Ship
+        clip = sound_rocket_hard
+        volume = 0.0 0.0
+        volume = 0.01 0.2
+        volume = 1.0 0.8
+        pitch = 0.0 0.1
+        pitch = 0.01 0.2
+        pitch = 1.0 0.5
+        loop = true
+      }
+      MODEL_MULTI_PARTICLE
+      {
+        name = core
+        modelName = ReStock/FX/restock-fx-kodiak-core-1
+        transformName = fxTransformCore
+        emission = 0.0 0.0
+        emission = 0.01 0.1
+        emission = 0.075 0.25
+        emission = 1.0 1.0
+        speed = 0.0 0.8
+        speed = 1.0 1.0
+      }
+      MODEL_MULTI_PARTICLE
+      {
+        name = plume
+        modelName = ReStock/FX/restock-fx-kodiak-plume-1
+        transformName = fxTransformPlume
+        emission = 0.0 0.0
+        emission = 0.01 0.1
+        emission = 0.075 0.25
+        emission = 1.0 1.0
+        speed = 0.0 0.8
+        speed = 1.0 1.0
+      }
+	  MODEL_MULTI_PARTICLE
+      {
+        name = exhaust
+        modelName = ReStock/FX/restock-fx-mainsail-turbo-1
+        transformName = exhaust_fxTransform
+        emission = 0.0 0.0
+        emission = 0.01 0.1
+        emission = 0.075 0.25
+        emission = 1.0 1.0
+        speed = 0.0 0.8
+        speed = 1.0 1.0
+      }
+      PREFAB_PARTICLE
+      {
+        prefabName = fx_smokeTrail_light
+        transformName = fxTransformPlume
+        emission = 0.0 0.0
+        emission = 0.05 0.0
+        emission = 0.075 0.25
+        emission = 1.0 1.25
+        speed = 0.0 0.25
+        speed = 1.0 1.0
+      }
+    }
+  }
+  @bulkheadProfiles = size1p5, srf
+  @MODULE[ModuleEngines]
+  {
+    @name = ModuleEnginesFX
+    %runningEffectName = fx-bobcat-running
+  }
+  @MODULE[ModuleJettison]
+  {
+    @jettisonName = LFL_Bobcat_Shrouds
+  }
+  MODULE
+  {
+    name = ModulePartVariants
+    baseVariant = TankButt
+    VARIANT
+    {
+      name = TankButt
+      displayName = #LOC_Restock_variant-engine_tankbutt
+      primaryColor = #ffffff
+      secondaryColor = #000000
+      sizeGroup = GroupA
+      GAMEOBJECTS
+      {
+        // Size 18 tank butt
+        LFL_Bobcat_18_Cap = true
+        LFL_Bobcat_18_Cap_Shroud = true
+        LFL_Bobcat_18_CapAlt = false
+        LFL_Bobcat_18_Cap_ShroudAlt = false
+        // Size 18 truss/ring mount
+        LFL_Bobcat_18_Mount = false
+        LFL_Bobcat_18_Shroud = false
+        LFL_Bobcat_18_ShroudAlt = false
+        // Size 18 boattail no autoshroud
+        LFL_Bobcat_18_Boattail = false
+        LFL_Bobcat_18_BoattailAlt = false
+        LFL_Bobcat_Compact = false
+        LFL_Bobcat_CentreTruss = false // Enable for standard/truss mount, boattail, compact. Disable for tank butt/cap
+      }
+      NODES
+      {
+        node_stack_bottom = 0.0, -1.307, 0.0, 0.0, -1.0, 0.0, 2
+      }
+    }
+    VARIANT
+    {
+      name = TankButtAlt
+      displayName = #LOC_Restock_variant-engine_tankbutt_white
+      primaryColor = #ffffff
+      secondaryColor = #000000
+      sizeGroup = GroupA
+      GAMEOBJECTS
+      {
+        // Size 18 tank butt
+        LFL_Bobcat_18_Cap = false
+        LFL_Bobcat_18_Cap_Shroud = false
+        LFL_Bobcat_18_CapAlt = true
+        LFL_Bobcat_18_Cap_ShroudAlt = true
+        // Size 18 truss/ring mount
+        LFL_Bobcat_18_Mount = false
+        LFL_Bobcat_18_Shroud = false
+        LFL_Bobcat_18_ShroudAlt = false
+        // Size 18 boattail no autoshroud
+        LFL_Bobcat_18_Boattail = false
+        LFL_Bobcat_18_BoattailAlt = false
+        LFL_Bobcat_Compact = false
+        LFL_Bobcat_CentreTruss = false // Enable for standard/truss mount, boattail, compact. Disable for tank butt/cap
+      }
+      NODES
+      {
+        node_stack_bottom = 0.0, -1.307, 0.0, 0.0, -1.0, 0.0, 2
+      }
+    }
+    VARIANT
+    {
+      name = 18Boattail
+      displayName = #LOC_Restock_variant-engine_boattail
+      primaryColor = #ffffff
+      secondaryColor = #000000
+      sizeGroup = GroupA
+      GAMEOBJECTS
+      {
+        // Size 18 tank butt
+        LFL_Bobcat_18_Cap = false
+        LFL_Bobcat_18_Cap_Shroud = false
+        LFL_Bobcat_18_CapAlt = false
+        LFL_Bobcat_18_Cap_ShroudAlt = false
+        // Size 18 truss/ring mount
+        LFL_Bobcat_18_Mount = false
+        LFL_Bobcat_18_Shroud = false
+        LFL_Bobcat_18_ShroudAlt = false
+        // Size 18 boattail no autoshroud
+        LFL_Bobcat_18_Boattail = true
+        LFL_Bobcat_18_BoattailAlt = false
+        LFL_Bobcat_Compact = false
+        LFL_Bobcat_CentreTruss = true // Enable for standard/truss mount, boattail, compact. Disable for tank butt/cap
+      }
+      NODES
+      {
+        node_stack_bottom = 0.0, -1.307, 0.0, 0.0, -1.0, 0.0, 2
+      }
+    }
+    VARIANT
+    {
+      name = 18BoattailAlt
+      displayName = #LOC_Restock_variant-engine_boattail_white
+      primaryColor = #ffffff
+      secondaryColor = #000000
+      sizeGroup = GroupA
+      GAMEOBJECTS
+      {
+        // Size 18 tank butt
+        LFL_Bobcat_18_Cap = false
+        LFL_Bobcat_18_Cap_Shroud = false
+        LFL_Bobcat_18_CapAlt = false
+        LFL_Bobcat_18_Cap_ShroudAlt = false
+        // Size 18 truss/ring mount
+        LFL_Bobcat_18_Mount = false
+        LFL_Bobcat_18_Shroud = false
+        LFL_Bobcat_18_ShroudAlt = false
+        // Size 18 boattail no autoshroud
+        LFL_Bobcat_18_Boattail = false
+        LFL_Bobcat_18_BoattailAlt = true
+        LFL_Bobcat_Compact = false
+        LFL_Bobcat_CentreTruss = true // Enable for standard/truss mount, boattail, compact. Disable for tank butt/cap
+      }
+      NODES
+      {
+        node_stack_bottom = 0.0, -1.307, 0.0, 0.0, -1.0, 0.0, 2
+      }
+    }
+    VARIANT
+    {
+      name = TrussMount // Size 18 ring mount
+      displayName = #LOC_Restock_variant-engine_size1p5
+      primaryColor = #999999
+      secondaryColor = #000000
+      sizeGroup = GroupB
+      GAMEOBJECTS
+      {
+        // Size 18 tank butt
+        LFL_Bobcat_18_Cap = false
+        LFL_Bobcat_18_Cap_Shroud = false
+        LFL_Bobcat_18_CapAlt = false
+        LFL_Bobcat_18_Cap_ShroudAlt = false
+        // Size 18 truss/ring mount
+        LFL_Bobcat_18_Mount = true
+        LFL_Bobcat_18_Shroud = true
+        LFL_Bobcat_18_ShroudAlt = false
+        // Size 18 boattail no autoshroud
+        LFL_Bobcat_18_Boattail = false
+        LFL_Bobcat_18_BoattailAlt = false
+        LFL_Bobcat_Compact = false
+        LFL_Bobcat_CentreTruss = false // Enable for standard/truss mount, boattail, compact. Disable for tank butt/cap
+      }
+      NODES
+      {
+        node_stack_bottom = 0.0, -1.732, 0.0, 0.0, -1.0, 0.0, 2
+      }
+    }
+    VARIANT
+    {
+      name = TrussMountAlt // Size 18 ring mount
+      displayName = #LOC_Restock_variant-engine_size1p5_white
+      primaryColor = #999999
+      secondaryColor = #000000
+      sizeGroup = GroupB
+      GAMEOBJECTS
+      {
+        // Size 18 tank butt
+        LFL_Bobcat_18_Cap = false
+        LFL_Bobcat_18_Cap_Shroud = false
+        LFL_Bobcat_18_CapAlt = false
+        LFL_Bobcat_18_Cap_ShroudAlt = false
+        // Size 18 truss/ring mount
+        LFL_Bobcat_18_Mount = true
+        LFL_Bobcat_18_Shroud = false
+        LFL_Bobcat_18_ShroudAlt = true
+        // Size 18 boattail no autoshroud
+        LFL_Bobcat_18_Boattail = false
+        LFL_Bobcat_18_BoattailAlt = false
+        LFL_Bobcat_Compact = false
+        LFL_Bobcat_CentreTruss = false // Enable for standard/truss mount, boattail, compact. Disable for tank butt/cap
+      }
+      NODES
+      {
+        node_stack_bottom = 0.0, -1.732, 0.0, 0.0, -1.0, 0.0, 2
+      }
+    }
+    VARIANT
+    {
+      name = Compact
+      displayName = #LOC_Restock_variant-engine_compact
+      primaryColor = #999999
+      secondaryColor = #000000
+      GAMEOBJECTS
+      {
+        // Size 18 tank butt
+        LFL_Bobcat_18_Cap = false
+        LFL_Bobcat_18_Cap_Shroud = false
+        LFL_Bobcat_18_CapAlt = false
+        LFL_Bobcat_18_Cap_ShroudAlt = false
+        // Size 18 truss/ring mount
+        LFL_Bobcat_18_Mount = false
+        LFL_Bobcat_18_Shroud = true
+        LFL_Bobcat_18_ShroudAlt = false
+        // Size 18 boattail no autoshroud
+        LFL_Bobcat_18_Boattail = false
+        LFL_Bobcat_18_BoattailAlt = false
+        LFL_Bobcat_Compact = true
+        LFL_Bobcat_CentreTruss = true // Enable for standard/truss mount, boattail, compact. Disable for tank butt/cap
+      }
+      NODES
+      {
+        node_stack_bottom = 0.0, -1.732, 0.0, 0.0, -1.0, 0.0, 2
+      }
+    }
+    VARIANT
+    {
+      name = CompactAlt
+      displayName = #LOC_Restock_variant-engine_compact_white
+      primaryColor = #999999
+      secondaryColor = #000000
+      GAMEOBJECTS
+      {
+        // Size 18 tank butt
+        LFL_Bobcat_18_Cap = false
+        LFL_Bobcat_18_Cap_Shroud = false
+        LFL_Bobcat_18_CapAlt = false
+        LFL_Bobcat_18_Cap_ShroudAlt = false
+        // Size 18 truss/ring mount
+        LFL_Bobcat_18_Mount = false
+        LFL_Bobcat_18_Shroud = false
+        LFL_Bobcat_18_ShroudAlt = true
+        // Size 18 boattail no autoshroud
+        LFL_Bobcat_18_Boattail = false
+        LFL_Bobcat_18_BoattailAlt = false
+        LFL_Bobcat_Compact = true
+        LFL_Bobcat_CentreTruss = true // Enable for standard/truss mount, boattail, compact. Disable for tank butt/cap
+      }
+      NODES
+      {
+        node_stack_bottom = 0.0, -1.732, 0.0, 0.0, -1.0, 0.0, 2
+      }
+    }
+  }
+  MODULE
+  {
+    name = FXModuleThrottleEffects
+    fxModuleNames = heatColor
+    responseSpeed = 1.0
+    dependOnEngineState = True
+    dependOnThrottle = True
+  }
+  MODULE
+  {
+    name = FXModuleThrottleEffects
+    fxModuleNames = throttleColor
+    responseSpeed = 1.0
+    dependOnEngineState = True
+    dependOnThrottle = True
+  }
+  MODULE
+  {
+    name = ModuleColorChanger
+    moduleID = heatColor
+    animRate = 0.025
+    shaderProperty = _EmissiveColor
+    excludedRenderers = EngineCore
+    toggleInEditor = false
+    toggleInFlight = false
+    redCurve
+    {
+      key = 0 0 1 1
+      key = 1 1 1 1
+    }
+    greenCurve
+    {
+      key = 0 0 1 1
+      key = 1 1 1 1
+    }
+    blueCurve
+    {
+      key = 0 0 1 1
+      key = 1 1 1 1
+    }
+    alphaCurve
+    {
+      key = 0 0 1 1
+      key = 1 1 1 1
+    }
+  }
+  MODULE
+  {
+    name = ModuleColorChanger
+    moduleID = throttleColor
+    animRate = 1
+    shaderProperty = _TintColor
+    includedRenderers = EngineCore
+    toggleInEditor = false
+    toggleInFlight = false
+    redCurve
+    {
+      key = 0 0
+      key = 1 1
+    }
+    greenCurve
+    {
+      key = 0 0
+      key = 1 1
+    }
+    blueCurve
+    {
+      key = 0 0
+      key = 1 1
+    }
+    alphaCurve
+    {
+      key = 0 0
+      key = 1 1
+    }
+  }
+  MODULE
+  {
+    name = FXModuleLookAtConstraint
+    CONSTRAINLOOKFX
+    {
+      targetName = gimbalArm_upper1
+      rotatorsName = gimbalArm_lower1
+    }
+    CONSTRAINLOOKFX
+    {
+      targetName = gimbalArm_lower1
+      rotatorsName = gimbalArm_upper1
+    }
+  
+    CONSTRAINLOOKFX
+    {
+      targetName = gimbalArm_upper2
+      rotatorsName = gimbalArm_lower2
+    }
+    CONSTRAINLOOKFX
+    {
+      targetName = gimbalArm_lower2
+      rotatorsName = gimbalArm_upper2
+    }
+  
+    CONSTRAINLOOKFX
+    {
+      targetName = gimbalArm_upper3
+      rotatorsName = gimbalArm_lower3
+    }
+    CONSTRAINLOOKFX
+    {
+      targetName = gimbalArm_lower3
+      rotatorsName = gimbalArm_upper3
+    }
+  
+    CONSTRAINLOOKFX
+    {
+      targetName = gimbalArm_upper4
+      rotatorsName = gimbalArm_lower4
+    }
+    CONSTRAINLOOKFX
+    {
+      targetName = gimbalArm_lower4
+      rotatorsName = gimbalArm_upper4
+    }
+  
+    CONSTRAINLOOKFX
+    {
+      targetName = gimbalArm_upper5
+      rotatorsName = gimbalArm_lower5
+    }
+    CONSTRAINLOOKFX
+    {
+      targetName = gimbalArm_lower5
+      rotatorsName = gimbalArm_upper5
+    }
+  
+    CONSTRAINLOOKFX
+    {
+      targetName = gimbalArm_upper6
+      rotatorsName = gimbalArm_lower6
+    }
+    CONSTRAINLOOKFX
+    {
+      targetName = gimbalArm_lower6
+      rotatorsName = gimbalArm_upper6
+    }
+  
+    CONSTRAINLOOKFX
+    {
+      targetName = gimbalArm_upper7
+      rotatorsName = gimbalArm_lower7
+    }
+    CONSTRAINLOOKFX
+    {
+      targetName = gimbalArm_lower7
+      rotatorsName = gimbalArm_upper7
+    }
+  
+    CONSTRAINLOOKFX
+    {
+      targetName = gimbalArm_upper8
+      rotatorsName = gimbalArm_lower8
+    }
+    CONSTRAINLOOKFX
+    {
+      targetName = gimbalArm_lower8
+      rotatorsName = gimbalArm_upper8
+    }
+  }
+  
+  // This is for the weird fork things that hold the gimballing nozzles
+  MODULE
+  {
+    name = ModuleRestockConstraints
+    LOOKATCONSTRAINT
+    {
+      rotatorsName = LFL_Bobcat_GimbalFork_L
+      targetName = pitchTarget
+    }
+    LOOKATCONSTRAINT
+    {
+      rotatorsName = LFL_Bobcat_GimbalFork_R
+      targetName = pitchTarget
+    }
+  }
+}
diff --git a/Distribution/Restock/GameData/ReStock/Plugins/Restock.dll b/Distribution/Restock/GameData/ReStock/Plugins/Restock.dll
index ecbe241d..eed6d611 100644
Binary files a/Distribution/Restock/GameData/ReStock/Plugins/Restock.dll and b/Distribution/Restock/GameData/ReStock/Plugins/Restock.dll differ
diff --git a/Distribution/Restock/GameData/ReStock/Versioning/ReStock.version b/Distribution/Restock/GameData/ReStock/Versioning/ReStock.version
index 50258020..d50fbe8d 100644
--- a/Distribution/Restock/GameData/ReStock/Versioning/ReStock.version
+++ b/Distribution/Restock/GameData/ReStock/Versioning/ReStock.version
@@ -5,8 +5,8 @@
     "VERSION":
     {
         "MAJOR":1,
-        "MINOR":4,
-        "PATCH":6,
+        "MINOR":5,
+        "PATCH":0,
         "BUILD":0
     },
     "KSP_VERSION":
diff --git a/Distribution/Restock/changelog.txt b/Distribution/Restock/changelog.txt
index bed63fc0..2597d589 100644
--- a/Distribution/Restock/changelog.txt
+++ b/Distribution/Restock/changelog.txt
@@ -1,5 +1,8 @@
-v1.4.6
+v1.5.0
 ------
+- New Engine parts
+  - LV-T91 "Cheetah" Liquid Fuel Engine: now has 1.25m Truss, 1.25m Boattail, 1.875m Truss, 1.875m Boattail and Compact variants.
+  - LV-TX87 "Bobcat" Liquid Fuel Engine: now has [VARIANTS]
 - Fixed extra random png texture in the distribution (#1017)
 - Fixed rotation of Mk2 Lander can airlock (#1008)
 - Fixed LT-2 landing leg being weaker than stock (#858)
diff --git a/Distribution/Restock/readme.txt b/Distribution/Restock/readme.txt
index 36ac51f0..599d6bba 100644
--- a/Distribution/Restock/readme.txt
+++ b/Distribution/Restock/readme.txt
@@ -1,5 +1,5 @@
 =============
-RESTOCK 1.4.6
+RESTOCK 1.5.0
 =============
 
 Restock is a project to improve the art of the Kerbal Space Program part set. Some of the revisions are based on the canceled Part Overhaul project by Porkjet.
diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Localization/en-us.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Localization/en-us.cfg
index 999045ea..3b37b290 100644
--- a/Distribution/RestockPlus/GameData/ReStockPlus/Localization/en-us.cfg
+++ b/Distribution/RestockPlus/GameData/ReStockPlus/Localization/en-us.cfg
@@ -60,19 +60,27 @@ Localization
 
     #LOC_RestockPlus_restock-engine-ursa_title = RK-107 'Ursa' Liquid Fuel Engine
     #LOC_RestockPlus_restock-engine-ursa_description = Though the Ursa is bearish on gimbal mechanisms, it is fairly powerful and does simple, effective duty as a booster engine.
-    #LOC_RestockPlus_restock-engine-ursa_tags = fueltank ?lfo liquid oxidizer propellant rocket (ursa restock
+    #LOC_RestockPlus_restock-engine-ursa_tags = ascent main propuls lower  paperclip restock (ursa restock rd-107 rd 107 soyuz
 
     #LOC_RestockPlus_restock-engine-caravel_title = UR-2 'Caravel' Liquid Fuel Engine
     #LOC_RestockPlus_restock-engine-caravel_description = The Caravel easily sails into the winds of interplanetary space with average efficiency and thrust.
-    #LOC_RestockPlus_restock-engine-caravel_tags = fueltank ?lfo liquid oxidizer propellant rocket (caravel paperclip restock
+    #LOC_RestockPlus_restock-engine-caravel_tags = sustain sustainer main propuls lower (caravel paperclip restock J-2 saturn
 
     #LOC_RestockPlus_restock-engine-schnauzer_title = UR-137 'Schnauzer' Liquid Fuel Engine
     #LOC_RestockPlus_restock-engine-schnauzer_description = The Schnauzer has a large snout - er, bell, and as such functions majestically as a upper stage engine.
-    #LOC_RestockPlus_restock-engine-schnauzer_tags = fueltank ?lfo liquid oxidizer propellant rocket paperclip (schanuzer restock
+    #LOC_RestockPlus_restock-engine-schnauzer_tags = orbit vac upper propuls paperclip (schanuzer restock sps apollo aj-10 aj
 
     #LOC_RestockPlus_restock-engine-galleon_title = UR-1 'Galleon' Liquid Fuel Engine
     #LOC_RestockPlus_restock-engine-galleon_description = Set sail on the winds of space with your first stage propelled by the might of the Galleon! A modern ship of the line, this engine is a powerful booster.
     #LOC_RestockPlus_restock-engine-galleon_tags = ascent main propuls lower paperclip restock ur1 (galleon f1 saturn
+	
+	#LOC_RestockPlus_restock-engine-yorkie_title = UR-T91 'Yorkie' Liquid Fuel Engine
+    #LOC_RestockPlus_restock-engine-yorkie_description = The compact and nimble Yorkie will keep you going, and going, and going, and going. Exactly what you will need from an upper stag engine.
+    #LOC_RestockPlus_restock-engine-yorkie_tags = orbit vac upper propuls paperclip restock (yorkie lr-91 lr 91 titan
+	
+	#LOC_RestockPlus_restock-engine-ketch_title = UR-T87 'Ketch' Liquid Fuel Engine
+    #LOC_RestockPlus_restock-engine-ketch_description = This twin masted... ahem... engined, motor will have you tacking through the skies, lifting you off the ground and setting you on your way to space.
+    #LOC_RestockPlus_restock-engine-ketch_tags = ascent main propuls lower paperclip restock (ketch lr-87 lr 87 titan
 
     // 1.25m
     #LOC_RestockPlus_restock-engine-pug_title = LV-303 'Pug' Liquid Fuel Engine
diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/0625/restock-srb-mallet-1.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/0625/restock-srb-mallet-1.cfg
index c2b0da3b..4052be63 100644
--- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/0625/restock-srb-mallet-1.cfg
+++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/0625/restock-srb-mallet-1.cfg
@@ -144,202 +144,6 @@ PART
     maxAmount = 80
   }
   MODULE
-  {
-    name = ModuleTestSubject
-    useStaging = True
-    useEvent = True
-    situationMask = 60
-    CONSTRAINT
-    {
-      // disable all but home
-      type = SITUATION
-      value = 0
-      body = _NotHome
-      prestige = Trivial
-    }
-    CONSTRAINT
-    {
-      // disable all but home
-      type = SITUATION
-      value = 0
-      body = _NotHome
-      prestige = Significant
-    }
-    CONSTRAINT
-    {
-      type = REPEATABILITY
-      value = ALWAYS
-      prestige = Trivial
-    }
-    CONSTRAINT
-    {
-      type = REPEATABILITY
-      value = BODYANDSITUATION
-      prestige = Significant
-    }
-    CONSTRAINT
-    {
-      type = REPEATABILITY
-      value = ONCEPERPART
-      prestige = Exceptional
-    }
-    CONSTRAINT
-    {
-      type = ALTITUDEENV
-      test = GT
-      value = 4000
-      prestige = Trivial
-    }
-    CONSTRAINT
-    {
-      type = ALTITUDEENV
-      test = LT
-      value = 8000
-      prestige = Trivial
-    }
-    CONSTRAINT
-    {
-      type = ALTITUDEENV
-      test = GT
-      value = 2000
-      prestige = Significant
-    }
-    CONSTRAINT
-    {
-      type = ALTITUDEENV
-      test = LT
-      value = 4000
-      prestige = Significant
-    }
-    CONSTRAINT
-    {
-      type = ALTITUDEENV
-      test = GT
-      value = 1000
-      prestige = Exceptional
-    }
-    CONSTRAINT
-    {
-      type = ALTITUDEENV
-      test = LT
-      value = 2000
-      prestige = Exceptional
-    }
-    CONSTRAINT
-    {
-      type = ALTITUDE
-      test = GT
-      value = 0 // this just registers altitude as something to care about
-      situationMask = 8
-    }
-    CONSTRAINT
-    {
-      type = ALTITUDE
-      test = LT
-      value = 300000
-      situationMask = 16
-      body = _NotSun
-    }
-    CONSTRAINT
-    {
-      type = ALTITUDE
-      test = LT
-      value = 600000
-      situationMask = 32
-      body = _NotSun
-    }
-    CONSTRAINT
-    {
-      type = SPEED
-      test = GT
-      value = 0
-      situationMask = 8
-      prestige = Trivial
-    }
-    CONSTRAINT
-    {
-      type = SPEED
-      test = LT
-      value = 600
-      situationMask = 8
-      prestige = Trivial
-    }
-    CONSTRAINT
-    {
-      type = SPEED
-      test = GT
-      value = 0
-      situationMask = 8
-      prestige = Significant
-    }
-    CONSTRAINT
-    {
-      type = SPEED
-      test = LT
-      value = 900
-      situationMask = 8
-      prestige = Significant
-    }
-    CONSTRAINT
-    {
-      type = SPEED
-      test = GT
-      value = 300
-      situationMask = 8
-      prestige = Exceptional
-    }
-    CONSTRAINT
-    {
-      type = SPEED
-      test = LT
-      value = 1200
-      situationMask = 8
-      prestige = Exceptional
-    }
-    CONSTRAINT
-    {
-      type = SPEEDENV
-      test = LT
-      value = 200
-      prestige = Trivial
-    }
-    CONSTRAINT
-    {
-      type = SPEEDENV
-      test = GT
-      value = 100
-      prestige = Trivial
-    }
-    CONSTRAINT
-    {
-      type = SPEEDENV
-      test = LT
-      value = 100
-      prestige = Significant
-    }
-    CONSTRAINT
-    {
-      type = SPEEDENV
-      test = GT
-      value = 50
-      prestige = Significant
-    }
-    CONSTRAINT
-    {
-      type = SPEEDENV
-      test = LT
-      value = 50
-      prestige = Exceptional
-    }
-    CONSTRAINT
-    {
-      type = SPEEDENV
-      test = GT
-      value = 20
-      prestige = Exceptional
-    }
-  }
-  MODULE
   {
     name = ModuleSurfaceFX
     thrustProviderModuleIndex = 0
diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/0625/restock-srb-striker-1.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/0625/restock-srb-striker-1.cfg
index 56177f48..3860905c 100644
--- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/0625/restock-srb-striker-1.cfg
+++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/0625/restock-srb-striker-1.cfg
@@ -145,202 +145,6 @@ PART
     maxAmount = 160
   }
   MODULE
-  {
-    name = ModuleTestSubject
-    useStaging = True
-    useEvent = True
-    situationMask = 60
-    CONSTRAINT
-    {
-      // disable all but home
-      type = SITUATION
-      value = 0
-      body = _NotHome
-      prestige = Trivial
-    }
-    CONSTRAINT
-    {
-      // disable all but home
-      type = SITUATION
-      value = 0
-      body = _NotHome
-      prestige = Significant
-    }
-    CONSTRAINT
-    {
-      type = REPEATABILITY
-      value = ALWAYS
-      prestige = Trivial
-    }
-    CONSTRAINT
-    {
-      type = REPEATABILITY
-      value = BODYANDSITUATION
-      prestige = Significant
-    }
-    CONSTRAINT
-    {
-      type = REPEATABILITY
-      value = ONCEPERPART
-      prestige = Exceptional
-    }
-    CONSTRAINT
-    {
-      type = ALTITUDEENV
-      test = GT
-      value = 4000
-      prestige = Trivial
-    }
-    CONSTRAINT
-    {
-      type = ALTITUDEENV
-      test = LT
-      value = 8000
-      prestige = Trivial
-    }
-    CONSTRAINT
-    {
-      type = ALTITUDEENV
-      test = GT
-      value = 2000
-      prestige = Significant
-    }
-    CONSTRAINT
-    {
-      type = ALTITUDEENV
-      test = LT
-      value = 4000
-      prestige = Significant
-    }
-    CONSTRAINT
-    {
-      type = ALTITUDEENV
-      test = GT
-      value = 1000
-      prestige = Exceptional
-    }
-    CONSTRAINT
-    {
-      type = ALTITUDEENV
-      test = LT
-      value = 2000
-      prestige = Exceptional
-    }
-    CONSTRAINT
-    {
-      type = ALTITUDE
-      test = GT
-      value = 0 // this just registers altitude as something to care about
-      situationMask = 8
-    }
-    CONSTRAINT
-    {
-      type = ALTITUDE
-      test = LT
-      value = 300000
-      situationMask = 16
-      body = _NotSun
-    }
-    CONSTRAINT
-    {
-      type = ALTITUDE
-      test = LT
-      value = 600000
-      situationMask = 32
-      body = _NotSun
-    }
-    CONSTRAINT
-    {
-      type = SPEED
-      test = GT
-      value = 0
-      situationMask = 8
-      prestige = Trivial
-    }
-    CONSTRAINT
-    {
-      type = SPEED
-      test = LT
-      value = 600
-      situationMask = 8
-      prestige = Trivial
-    }
-    CONSTRAINT
-    {
-      type = SPEED
-      test = GT
-      value = 0
-      situationMask = 8
-      prestige = Significant
-    }
-    CONSTRAINT
-    {
-      type = SPEED
-      test = LT
-      value = 900
-      situationMask = 8
-      prestige = Significant
-    }
-    CONSTRAINT
-    {
-      type = SPEED
-      test = GT
-      value = 300
-      situationMask = 8
-      prestige = Exceptional
-    }
-    CONSTRAINT
-    {
-      type = SPEED
-      test = LT
-      value = 1200
-      situationMask = 8
-      prestige = Exceptional
-    }
-    CONSTRAINT
-    {
-      type = SPEEDENV
-      test = LT
-      value = 200
-      prestige = Trivial
-    }
-    CONSTRAINT
-    {
-      type = SPEEDENV
-      test = GT
-      value = 100
-      prestige = Trivial
-    }
-    CONSTRAINT
-    {
-      type = SPEEDENV
-      test = LT
-      value = 100
-      prestige = Significant
-    }
-    CONSTRAINT
-    {
-      type = SPEEDENV
-      test = GT
-      value = 50
-      prestige = Significant
-    }
-    CONSTRAINT
-    {
-      type = SPEEDENV
-      test = LT
-      value = 50
-      prestige = Exceptional
-    }
-    CONSTRAINT
-    {
-      type = SPEEDENV
-      test = GT
-      value = 20
-      prestige = Exceptional
-    }
-  }
-  MODULE
   {
     name = ModuleSurfaceFX
     thrustProviderModuleIndex = 0
diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/1875/restock-engine-yorkie.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/1875/restock-engine-yorkie.cfg
new file mode 100644
index 00000000..83e5eda5
--- /dev/null
+++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/1875/restock-engine-yorkie.cfg
@@ -0,0 +1,991 @@
+// ReStock+ 1.5.0
+// 1.875m sustainer engine
+PART
+{
+  name = restock-engine-yorkie-1
+  module = Part
+  author = Kavaeric
+  rescaleFactor = 1.0
+  MODEL
+  {
+    model = ReStock/Assets/Engine/restock-engine-cheetah-2
+  }
+  EFFECTS
+  {
+    engage
+    {
+      AUDIO
+      {
+        channel = Ship
+        clip = sound_vent_medium
+        volume = 1.0
+        pitch = 2.0
+        loop = false
+      }
+    }
+    flameout
+    {
+      AUDIO
+      {
+        channel = Ship
+        clip = sound_explosion_low
+        volume = 1.0
+        pitch = 2.0
+        loop = false
+      }
+    }
+    fx-cheetah-running
+    {
+      AUDIO
+      {
+        channel = Ship
+        clip = sound_rocket_hard
+        volume = 0.0 0.0
+        volume = 0.01 0.2
+        volume = 1.0 0.8
+        pitch = 0.0 0.1
+        pitch = 0.01 0.2
+        pitch = 1.0 0.7
+        loop = true
+      }
+      MODEL_MULTI_PARTICLE
+      {
+        name = core
+        modelName = ReStock/FX/restock-fx-wolfhound-core
+        transformName = fxTransformCore
+        emission = 0.0 0.0
+        emission = 0.01 0.1
+        emission = 0.075 0.25
+        emission = 1.0 1.0
+        speed = 0.0 0.8
+        speed = 1.0 1.0
+      }
+      MODEL_MULTI_PARTICLE
+      {
+        name = plume
+        modelName = ReStock/FX/restock-fx-wolfhound-plume
+        transformName = fxTransformPlume
+        emission = 0.0 0.0
+        emission = 0.01 0.1
+        emission = 0.075 0.25
+        emission = 1.0 1.0
+        speed = 0.0 0.8
+        speed = 1.0 1.0
+      }
+      MODEL_MULTI_PARTICLE
+      {
+        name = vernier
+        modelName = ReStock/FX/restock-fx-reliant-turbo-1
+        transformName = vernier_fxTransform
+        emission = 0.0 0.0
+        emission = 0.01 0.1
+        emission = 0.075 0.25
+        emission = 1.0 1.0
+        speed = 0.0 0.8
+        speed = 1.0 1.0
+        localRotation = 0, 0, -180
+      }
+      PREFAB_PARTICLE
+      {
+        prefabName = fx_smokeTrail_light
+        transformName = fxTransformPlume
+        emission = 0.0 0.0
+        emission = 0.05 0.0
+        emission = 0.075 0.25
+        emission = 1.0 1.25
+        speed = 0.0 0.25
+        speed = 1.0 1.0
+      }
+    }
+  }
+  node_stack_top = 0.0, 0.84028, 0.0, 0.0, 1.0, 0.0, 2
+  node_stack_bottom = 0.0, -1.11945, 0.0, 0.0, -1.0, 0.0, 2
+  node_attach = 0.0, 0.84028, 0.0, 0.0, 1.0, 0.0, 2
+  /// Flag to disable this part if MH is installed
+  MHReplacement = True
+  TechRequired = heavierRocketry
+  entryCost = 3400
+  cost = 850
+  category = Engine
+  subcategory = 0
+  title = #LOC_RestockPlus_restock-engine-yorkie_title
+  manufacturer = #LOC_RestockPlus_agency_paperclips
+  description = #LOC_RestockPlus_restock-engine-yorkie_description
+  attachRules = 1, 1, 1, 1, 0
+  mass = 1.0
+  dragModelType = default
+  maximum_drag = 0.2
+  minimum_drag = 0.3
+  angularDrag = 2
+  crashTolerance = 7
+  breakingForce = 150
+  breakingTorque = 150
+  maxTemp = 2000 // = 3000
+  fuelCrossFeed = True
+  bulkheadProfiles = size1, size1p5, srf
+  tags = #LOC_RestockPlus_restock-engine-yorkie_tags
+  MODULE
+  {
+    name = ModuleEnginesFX
+    thrustVectorTransformName = thrustTransform
+    runningEffectName = fx-cheetah-running
+    exhaustDamage = True
+    ignitionThreshold = 0.1
+    minThrust = 0
+    maxThrust = 125
+    heatProduction = 175
+    fxOffset = 0, 0, 0.1
+    EngineType = LiquidFuel
+    exhaustDamageDistanceOffset = 0.35
+    PROPELLANT
+    {
+      name = LiquidFuel
+      ratio = 0.9
+      DrawGauge = True
+    }
+    PROPELLANT
+    {
+      name = Oxidizer
+      ratio = 1.1
+    }
+    atmosphereCurve
+    {
+      key = 0 355
+      key = 1 150
+      key = 9 0.001
+    }
+    transformMultipliers
+    {
+      trf0 = 0.96
+      trf1 = 0.01
+      trf2 = 0.01
+      trf3 = 0.01
+      trf4 = 0.01
+    }
+  }
+  MODULE
+  {
+    name = ModuleAlternator
+    RESOURCE
+    {
+      name = ElectricCharge
+      rate = 5.0
+    }
+  }
+  MODULE
+  {
+    name = ModuleGimbal
+    gimbalTransformName = gimbal
+    gimbalRange = 2
+    gimbalResponseSpeed = 15
+    useGimbalResponseSpeed = true
+  }
+  MODULE
+  {
+    name = ModuleGimbal
+    gimbalTransformName = vernier_gimbal
+    gimbalRangeXP = 10
+    gimbalRangeXN = 10
+    gimbalRangeYP = 0
+    gimbalRangeYN = 0
+    gimbalResponseSpeed = 20
+    useGimbalResponseSpeed = true
+    enablePitch = false
+    enableRoll = true
+    enableYaw = false
+  }
+  MODULE
+  {
+    name = ModulePartVariants
+    baseVariant = Cap
+    VARIANT
+    {
+      name = Size1p5
+      displayName = #LOC_Restock_variant-engine_size1p5_white
+      primaryColor = #999999
+      secondaryColor = #ffffff
+      GAMEOBJECTS
+      {
+        // Size 12 ring mount
+        LFD_Cheetah_12_Mount = false
+        LFD_Cheetah_Shroud_12 = false
+        LFD_Cheetah_Shroud_12Alt = false
+        // Size 12 boattail
+        LFD_Cheetah_12_Boattail = false
+        LFD_Cheetah_12_BoattailAlt = false
+        LFD_Cheetah_12_BoattailAlt2 = false
+        LFD_Cheetah_Shroud_12Boattail = false
+        LFD_Cheetah_Shroud_12BoattailAlt = false
+        // Size 12 trusses--enable for all s12 variants
+        LFD_Cheetah_12_MountTruss = false
+        // Size 18 ring mount
+        LFD_Cheetah_18_Mount = true
+        LFD_Cheetah_Shroud_18 = true
+        LFD_Cheetah_Shroud_18Alt = false
+        // Size 18 boattail
+        LFD_Cheetah_18_Boattail = false
+        LFD_Cheetah_18_BoattailAlt = false
+        LFD_Cheetah_18_BoattailAlt2 = false
+        LFD_Cheetah_Shroud_18Boattail = false
+        LFD_Cheetah_Shroud_18BoattailAlt = false
+        // Size 18 trusses--enable for all s18 variants
+        LFD_Cheetah_18_MountTruss = true
+        // Truss for verniers--only disabled on s12 boattail
+        LFD_Cheetah_GimbalTruss = true
+      }
+    }
+    VARIANT
+    {
+      name = Size1p5Alt
+      displayName = #LOC_Restock_variant-engine_size1p5_grey-orange
+      primaryColor = #666666
+      secondaryColor = #f69449
+      GAMEOBJECTS
+      {
+        // Size 12 ring mount
+        LFD_Cheetah_12_Mount = false
+        LFD_Cheetah_Shroud_12 = false
+        LFD_Cheetah_Shroud_12Alt = false
+        // Size 12 boattail
+        LFD_Cheetah_12_Boattail = false
+        LFD_Cheetah_12_BoattailAlt = false
+        LFD_Cheetah_12_BoattailAlt2 = false
+        LFD_Cheetah_Shroud_12Boattail = false
+        LFD_Cheetah_Shroud_12BoattailAlt = false
+        // Size 12 trusses--enable for all s12 variants
+        LFD_Cheetah_12_MountTruss = false
+        // Size 18 ring mount
+        LFD_Cheetah_18_Mount = true
+        LFD_Cheetah_Shroud_18 = false
+        LFD_Cheetah_Shroud_18Alt = true
+        // Size 18 boattail
+        LFD_Cheetah_18_Boattail = false
+        LFD_Cheetah_18_BoattailAlt = false
+        LFD_Cheetah_18_BoattailAlt2 = false
+        LFD_Cheetah_Shroud_18Boattail = false
+        LFD_Cheetah_Shroud_18BoattailAlt = false
+        // Size 18 trusses--enable for all s18 variants
+        LFD_Cheetah_18_MountTruss = true
+        // Truss for verniers--only disabled on s12 boattail
+        LFD_Cheetah_GimbalTruss = true
+      }
+    }
+    VARIANT
+    {
+      name = Cap // Size1p5Boat
+      displayName = #LOC_Restock_variant-engine_boattail_size1p5
+      primaryColor = #000000
+      secondaryColor = #ffffff
+      GAMEOBJECTS
+      {
+        // Size 12 ring mount
+        LFD_Cheetah_12_Mount = false
+        LFD_Cheetah_Shroud_12 = false
+        LFD_Cheetah_Shroud_12Alt = false
+        // Size 12 boattail
+        LFD_Cheetah_12_Boattail = false
+        LFD_Cheetah_12_BoattailAlt = false
+        LFD_Cheetah_12_BoattailAlt2 = false
+        LFD_Cheetah_Shroud_12Boattail = false
+        LFD_Cheetah_Shroud_12BoattailAlt = false
+        // Size 12 trusses--enable for all s12 variants
+        LFD_Cheetah_12_MountTruss = false
+        // Size 18 ring mount
+        LFD_Cheetah_18_Mount = false
+        LFD_Cheetah_Shroud_18 = false
+        LFD_Cheetah_Shroud_18Alt = false
+        // Size 18 boattail
+        LFD_Cheetah_18_Boattail = true
+        LFD_Cheetah_18_BoattailAlt = false
+        LFD_Cheetah_18_BoattailAlt2 = false
+        LFD_Cheetah_Shroud_18Boattail = true
+        LFD_Cheetah_Shroud_18BoattailAlt = false
+        // Size 18 trusses--enable for all s18 variants
+        LFD_Cheetah_18_MountTruss = true
+        // Truss for verniers--only disabled on s12 boattail
+        LFD_Cheetah_GimbalTruss = true
+      }
+      NODES
+      {
+        node_stack_bottom = 0.0, -1.635, 0.0, 0.0, -1.0, 0.0, 2
+      }
+    }
+    VARIANT
+    {
+      name = Size1p5BoatAlt
+      displayName = #LOC_Restock_variant-engine_boattail_size1p5_white
+      primaryColor = #ffffff
+      secondaryColor = #ffffff
+      GAMEOBJECTS
+      {
+        // Size 12 ring mount
+        LFD_Cheetah_12_Mount = false
+        LFD_Cheetah_Shroud_12 = false
+        LFD_Cheetah_Shroud_12Alt = false
+        // Size 12 boattail
+        LFD_Cheetah_12_Boattail = false
+        LFD_Cheetah_12_BoattailAlt = false
+        LFD_Cheetah_12_BoattailAlt2 = false
+        LFD_Cheetah_Shroud_12Boattail = false
+        LFD_Cheetah_Shroud_12BoattailAlt = false
+        // Size 12 trusses--enable for all s12 variants
+        LFD_Cheetah_12_MountTruss = false
+        // Size 18 ring mount
+        LFD_Cheetah_18_Mount = false
+        LFD_Cheetah_Shroud_18 = false
+        LFD_Cheetah_Shroud_18Alt = false
+        // Size 18 boattail
+        LFD_Cheetah_18_Boattail = false
+        LFD_Cheetah_18_BoattailAlt = false
+        LFD_Cheetah_18_BoattailAlt2 = true
+        LFD_Cheetah_Shroud_18Boattail = true
+        LFD_Cheetah_Shroud_18BoattailAlt = false
+        // Size 18 trusses--enable for all s18 variants
+        LFD_Cheetah_18_MountTruss = true
+        // Truss for verniers--only disabled on s12 boattail
+        LFD_Cheetah_GimbalTruss = true
+      }
+      NODES
+      {
+        node_stack_bottom = 0.0, -1.635, 0.0, 0.0, -1.0, 0.0, 2
+      }
+    }
+    VARIANT
+    {
+      name = Size1p5BoatAlt2
+      displayName = #LOC_Restock_variant-engine_boattail_size1p5_grey-orange
+      primaryColor = #666666
+      secondaryColor = #f69449
+      GAMEOBJECTS
+      {
+        // Size 12 ring mount
+        LFD_Cheetah_12_Mount = false
+        LFD_Cheetah_Shroud_12 = false
+        LFD_Cheetah_Shroud_12Alt = false
+        // Size 12 boattail
+        LFD_Cheetah_12_Boattail = false
+        LFD_Cheetah_12_BoattailAlt = false
+        LFD_Cheetah_12_BoattailAlt2 = false
+        LFD_Cheetah_Shroud_12Boattail = false
+        LFD_Cheetah_Shroud_12BoattailAlt = false
+        // Size 12 trusses--enable for all s12 variants
+        LFD_Cheetah_12_MountTruss = false
+        // Size 18 ring mount
+        LFD_Cheetah_18_Mount = false
+        LFD_Cheetah_Shroud_18 = false
+        LFD_Cheetah_Shroud_18Alt = false
+        // Size 18 boattail
+        LFD_Cheetah_18_Boattail = false
+        LFD_Cheetah_18_BoattailAlt = true
+        LFD_Cheetah_18_BoattailAlt2 = false
+        LFD_Cheetah_Shroud_18Boattail = false
+        LFD_Cheetah_Shroud_18BoattailAlt = true
+        // Size 18 trusses--enable for all s18 variants
+        LFD_Cheetah_18_MountTruss = true
+        // Truss for verniers--only disabled on s12 boattail
+        LFD_Cheetah_GimbalTruss = true
+      }
+      NODES
+      {
+        node_stack_bottom = 0.0, -1.635, 0.0, 0.0, -1.0, 0.0, 2
+      }
+    }
+    VARIANT
+    {
+      name = Size1
+      displayName = #LOC_Restock_variant-engine_size1_white
+      primaryColor = #999999
+      secondaryColor = #ffffff
+      GAMEOBJECTS
+      {
+        // Size 12 ring mount
+        LFD_Cheetah_12_Mount = true
+        LFD_Cheetah_Shroud_12 = true
+        LFD_Cheetah_Shroud_12Alt = false
+        // Size 12 boattail
+        LFD_Cheetah_12_Boattail = false
+        LFD_Cheetah_12_BoattailAlt = false
+        LFD_Cheetah_12_BoattailAlt2 = false
+        LFD_Cheetah_Shroud_12Boattail = false
+        LFD_Cheetah_Shroud_12BoattailAlt = false
+        // Size 12 trusses--enable for all s12 variants
+        LFD_Cheetah_12_MountTruss = true
+        // Size 18 ring mount
+        LFD_Cheetah_18_Mount = false
+        LFD_Cheetah_Shroud_18 = false
+        LFD_Cheetah_Shroud_18Alt = false
+        // Size 18 boattail
+        LFD_Cheetah_18_Boattail = false
+        LFD_Cheetah_18_BoattailAlt = false
+        LFD_Cheetah_18_BoattailAlt2 = false
+        LFD_Cheetah_Shroud_18Boattail = false
+        LFD_Cheetah_Shroud_18BoattailAlt = false
+        // Size 18 trusses--enable for all s18 variants
+        LFD_Cheetah_18_MountTruss = false
+        // Truss for verniers--only disabled on s12 boattail
+        LFD_Cheetah_GimbalTruss = true
+      }
+      NODES
+      {
+        node_stack_bottom = 0.0, -1.66, 0.0, 0.0, -1.0, 0.0, 2
+      }
+    }
+    VARIANT
+    {
+      name = Size1Alt
+      displayName = #LOC_Restock_variant-engine_size1_grey-orange
+      primaryColor = #666666
+      secondaryColor = #f69449
+      GAMEOBJECTS
+      {
+        // Size 12 ring mount
+        LFD_Cheetah_12_Mount = true
+        LFD_Cheetah_Shroud_12 = false
+        LFD_Cheetah_Shroud_12Alt = true
+        // Size 12 boattail
+        LFD_Cheetah_12_Boattail = false
+        LFD_Cheetah_12_BoattailAlt = false
+        LFD_Cheetah_12_BoattailAlt2 = false
+        LFD_Cheetah_Shroud_12Boattail = false
+        LFD_Cheetah_Shroud_12BoattailAlt = false
+        // Size 12 trusses--enable for all s12 variants
+        LFD_Cheetah_12_MountTruss = true
+        // Size 18 ring mount
+        LFD_Cheetah_18_Mount = false
+        LFD_Cheetah_Shroud_18 = false
+        LFD_Cheetah_Shroud_18Alt = false
+        // Size 18 boattail
+        LFD_Cheetah_18_Boattail = false
+        LFD_Cheetah_18_BoattailAlt = false
+        LFD_Cheetah_18_BoattailAlt2 = false
+        LFD_Cheetah_Shroud_18Boattail = false
+        LFD_Cheetah_Shroud_18BoattailAlt = false
+        // Size 18 trusses--enable for all s18 variants
+        LFD_Cheetah_18_MountTruss = false
+        // Truss for verniers--only disabled on s12 boattail
+        LFD_Cheetah_GimbalTruss = true
+      }
+      NODES
+      {
+        node_stack_bottom = 0.0, -1.66, 0.0, 0.0, -1.0, 0.0, 2
+      }
+    }
+    VARIANT
+    {
+      name = Size1Boat
+      displayName = #LOC_Restock_variant-engine_boattail_size1
+      primaryColor = #000000
+      secondaryColor = #ffffff
+      GAMEOBJECTS
+      {
+        // Size 12 ring mount
+        LFD_Cheetah_12_Mount = false
+        LFD_Cheetah_Shroud_12 = false
+        LFD_Cheetah_Shroud_12Alt = false
+        // Size 12 boattail
+        LFD_Cheetah_12_Boattail = true
+        LFD_Cheetah_12_BoattailAlt = false
+        LFD_Cheetah_12_BoattailAlt2 = false
+        LFD_Cheetah_Shroud_12Boattail = true
+        LFD_Cheetah_Shroud_12BoattailAlt = false
+        // Size 12 trusses--enable for all s12 variants
+        LFD_Cheetah_12_MountTruss = true
+        // Size 18 ring mount
+        LFD_Cheetah_18_Mount = false
+        LFD_Cheetah_Shroud_18 = false
+        LFD_Cheetah_Shroud_18Alt = false
+        // Size 18 boattail
+        LFD_Cheetah_18_Boattail = false
+        LFD_Cheetah_18_BoattailAlt = false
+        LFD_Cheetah_18_BoattailAlt2 = false
+        LFD_Cheetah_Shroud_18Boattail = false
+        LFD_Cheetah_Shroud_18BoattailAlt = false
+        // Size 18 trusses--enable for all s18 variants
+        LFD_Cheetah_18_MountTruss = false
+        // Truss for verniers--only disabled on s12 boattail
+        LFD_Cheetah_GimbalTruss = false
+      }
+    }
+    VARIANT
+    {
+      name = Size1BoatAlt
+      displayName = #LOC_Restock_variant-engine_boattail_size1_white
+      primaryColor = #ffffff
+      secondaryColor = #ffffff
+      GAMEOBJECTS
+      {
+        // Size 12 ring mount
+        LFD_Cheetah_12_Mount = false
+        LFD_Cheetah_Shroud_12 = false
+        LFD_Cheetah_Shroud_12Alt = false
+        // Size 12 boattail
+        LFD_Cheetah_12_Boattail = false
+        LFD_Cheetah_12_BoattailAlt = false
+        LFD_Cheetah_12_BoattailAlt2 = true
+        LFD_Cheetah_Shroud_12Boattail = true
+        LFD_Cheetah_Shroud_12BoattailAlt = false
+        // Size 12 trusses--enable for all s12 variants
+        LFD_Cheetah_12_MountTruss = true
+        // Size 18 ring mount
+        LFD_Cheetah_18_Mount = false
+        LFD_Cheetah_Shroud_18 = false
+        LFD_Cheetah_Shroud_18Alt = false
+        // Size 18 boattail
+        LFD_Cheetah_18_Boattail = false
+        LFD_Cheetah_18_BoattailAlt = false
+        LFD_Cheetah_18_BoattailAlt2 = false
+        LFD_Cheetah_Shroud_18Boattail = false
+        LFD_Cheetah_Shroud_18BoattailAlt = false
+        // Size 18 trusses--enable for all s18 variants
+        LFD_Cheetah_18_MountTruss = false
+        // Truss for verniers--only disabled on s12 boattail
+        LFD_Cheetah_GimbalTruss = false
+      }
+    }
+    VARIANT
+    {
+      name = Size1BoatAlt2
+      displayName = #LOC_Restock_variant-engine_boattail_size1_grey-orange
+      primaryColor = #666666
+      secondaryColor = #f69449
+      GAMEOBJECTS
+      {
+        // Size 12 ring mount
+        LFD_Cheetah_12_Mount = false
+        LFD_Cheetah_Shroud_12 = false
+        LFD_Cheetah_Shroud_12Alt = false
+        // Size 12 boattail
+        LFD_Cheetah_12_Boattail = false
+        LFD_Cheetah_12_BoattailAlt = true
+        LFD_Cheetah_12_BoattailAlt2 = false
+        LFD_Cheetah_Shroud_12Boattail = false
+        LFD_Cheetah_Shroud_12BoattailAlt = true
+        // Size 12 trusses--enable for all s12 variants
+        LFD_Cheetah_12_MountTruss = true
+        // Size 18 ring mount
+        LFD_Cheetah_18_Mount = false
+        LFD_Cheetah_Shroud_18 = false
+        LFD_Cheetah_Shroud_18Alt = false
+        // Size 18 boattail
+        LFD_Cheetah_18_Boattail = false
+        LFD_Cheetah_18_BoattailAlt = false
+        LFD_Cheetah_18_BoattailAlt2 = false
+        LFD_Cheetah_Shroud_18Boattail = false
+        LFD_Cheetah_Shroud_18BoattailAlt = false
+        // Size 18 trusses--enable for all s18 variants
+        LFD_Cheetah_18_MountTruss = false
+        // Truss for verniers--only disabled on s12 boattail
+        LFD_Cheetah_GimbalTruss = false
+      }
+    }
+    VARIANT
+    {
+      name = Bare
+      displayName = #LOC_Restock_variant-engine_compact_white
+      themeName = Bare
+      primaryColor = #666666
+      secondaryColor = #ffffff
+      GAMEOBJECTS
+      {
+        // Size 12 ring mount
+        LFD_Cheetah_12_Mount = false
+        LFD_Cheetah_Shroud_12 = true
+        LFD_Cheetah_Shroud_12Alt = false
+        // Size 12 boattail
+        LFD_Cheetah_12_Boattail = false
+        LFD_Cheetah_12_BoattailAlt = false
+        LFD_Cheetah_12_BoattailAlt2 = false
+        LFD_Cheetah_Shroud_12Boattail = false
+        LFD_Cheetah_Shroud_12BoattailAlt = false
+        // Size 12 trusses--enable for all s12 variants
+        LFD_Cheetah_12_MountTruss = false
+        // Size 18 ring mount
+        LFD_Cheetah_18_Mount = false
+        LFD_Cheetah_Shroud_18 = false
+        LFD_Cheetah_Shroud_18Alt = false
+        // Size 18 boattail
+        LFD_Cheetah_18_Boattail = false
+        LFD_Cheetah_18_BoattailAlt = false
+        LFD_Cheetah_18_BoattailAlt2 = false
+        LFD_Cheetah_Shroud_18Boattail = false
+        LFD_Cheetah_Shroud_18BoattailAlt = false
+        // Size 18 trusses--enable for all s18 variants
+        LFD_Cheetah_18_MountTruss = false
+        // Truss for verniers--only disabled on s12 boattail
+        LFD_Cheetah_GimbalTruss = true
+      }
+      NODES
+      {
+        node_stack_bottom = 0.0, -1.66, 0.0, 0.0, -1.0, 0.0, 2
+      }
+    }
+    VARIANT
+    {
+      name = BareAlt
+      displayName = #LOC_Restock_variant-engine_compact_grey-orange
+      themeName = Bare
+      primaryColor = #666666
+      secondaryColor = #ffffff
+      GAMEOBJECTS
+      {
+        // Size 12 ring mount
+        LFD_Cheetah_12_Mount = false
+        LFD_Cheetah_Shroud_12 = false
+        LFD_Cheetah_Shroud_12Alt = true
+        // Size 12 boattail
+        LFD_Cheetah_12_Boattail = false
+        LFD_Cheetah_12_BoattailAlt = false
+        LFD_Cheetah_12_BoattailAlt2 = false
+        LFD_Cheetah_Shroud_12Boattail = false
+        LFD_Cheetah_Shroud_12BoattailAlt = false
+        // Size 12 trusses--enable for all s12 variants
+        LFD_Cheetah_12_MountTruss = false
+        // Size 18 ring mount
+        LFD_Cheetah_18_Mount = false
+        LFD_Cheetah_Shroud_18 = false
+        LFD_Cheetah_Shroud_18Alt = false
+        // Size 18 boattail
+        LFD_Cheetah_18_Boattail = false
+        LFD_Cheetah_18_BoattailAlt = false
+        LFD_Cheetah_18_BoattailAlt2 = false
+        LFD_Cheetah_Shroud_18Boattail = false
+        LFD_Cheetah_Shroud_18BoattailAlt = false
+        // Size 18 trusses--enable for all s18 variants
+        LFD_Cheetah_18_MountTruss = false
+        // Truss for verniers--only disabled on s12 boattail
+        LFD_Cheetah_GimbalTruss = true
+      }
+      NODES
+      {
+        node_stack_bottom = 0.0, -1.66, 0.0, 0.0, -1.0, 0.0, 2
+      }
+    }
+  }
+  MODULE
+  {
+    name = ModuleJettison
+    jettisonName = LFD_Cheetah_Shrouds
+    bottomNodeName = bottom
+    isFairing = True
+    jettisonedObjectMass = 0.1
+    jettisonForce = 5
+    jettisonDirection = 0 0 1
+    useMultipleDragCubes = false
+  }
+  MODULE
+  {
+    name = ModuleSurfaceFX
+    thrustProviderModuleIndex = 0
+    fxMax = 1
+    maxDistance = 80
+    falloff = 2
+    thrustTransformName = thrustTransform
+  }
+  MODULE
+  {
+    name = ModuleTestSubject
+    useStaging = True
+    useEvent = True
+    situationMask = 127
+    CONSTRAINT
+    {
+      type = REPEATABILITY
+      value = ALWAYS
+      prestige = Trivial
+    }
+    CONSTRAINT
+    {
+      type = REPEATABILITY
+      value = BODYANDSITUATION
+      prestige = Significant
+    }
+    CONSTRAINT
+    {
+      type = REPEATABILITY
+      value = ONCEPERPART
+      prestige = Exceptional
+    }
+    CONSTRAINT
+    {
+      type = ALTITUDEENV
+      test = GT
+      value = 4000
+      prestige = Trivial
+    }
+    CONSTRAINT
+    {
+      type = ALTITUDEENV
+      test = LT
+      value = 8000
+      prestige = Trivial
+    }
+    CONSTRAINT
+    {
+      type = ALTITUDEENV
+      test = GT
+      value = 2000
+      prestige = Significant
+    }
+    CONSTRAINT
+    {
+      type = ALTITUDEENV
+      test = LT
+      value = 4000
+      prestige = Significant
+    }
+    CONSTRAINT
+    {
+      type = ALTITUDEENV
+      test = GT
+      value = 1000
+      prestige = Exceptional
+    }
+    CONSTRAINT
+    {
+      type = ALTITUDEENV
+      test = LT
+      value = 2000
+      prestige = Exceptional
+    }
+    CONSTRAINT
+    {
+      type = ALTITUDE
+      test = GT
+      value = 0 // this just registers altitude as something to care about
+      situationMask = 8
+    }
+    CONSTRAINT
+    {
+      type = ALTITUDE
+      test = LT
+      value = 300000
+      situationMask = 16
+      body = _NotSun
+    }
+    CONSTRAINT
+    {
+      type = ALTITUDE
+      test = LT
+      value = 600000
+      situationMask = 32
+      body = _NotSun
+    }
+    CONSTRAINT
+    {
+      type = SPEED
+      test = GT
+      value = 0
+      situationMask = 8
+      prestige = Trivial
+    }
+    CONSTRAINT
+    {
+      type = SPEED
+      test = LT
+      value = 600
+      situationMask = 8
+      prestige = Trivial
+    }
+    CONSTRAINT
+    {
+      type = SPEED
+      test = GT
+      value = 300
+      situationMask = 8
+      prestige = Significant
+    }
+    CONSTRAINT
+    {
+      type = SPEED
+      test = LT
+      value = 1200
+      situationMask = 8
+      prestige = Significant
+    }
+    CONSTRAINT
+    {
+      type = SPEED
+      test = GT
+      value = 600
+      situationMask = 8
+      prestige = Exceptional
+    }
+    CONSTRAINT
+    {
+      type = SPEED
+      test = LT
+      value = 2500
+      situationMask = 8
+      prestige = Exceptional
+    }
+    CONSTRAINT
+    {
+      type = SPEEDENV
+      test = LT
+      value = 200
+      prestige = Trivial
+    }
+    CONSTRAINT
+    {
+      type = SPEEDENV
+      test = GT
+      value = 100
+      prestige = Trivial
+    }
+    CONSTRAINT
+    {
+      type = SPEEDENV
+      test = LT
+      value = 100
+      prestige = Significant
+    }
+    CONSTRAINT
+    {
+      type = SPEEDENV
+      test = GT
+      value = 50
+      prestige = Significant
+    }
+    CONSTRAINT
+    {
+      type = SPEEDENV
+      test = LT
+      value = 50
+      prestige = Exceptional
+    }
+    CONSTRAINT
+    {
+      type = SPEEDENV
+      test = GT
+      value = 20
+      prestige = Exceptional
+    }
+  }
+  MODULE
+  {
+    name = FXModuleThrottleEffects
+    fxModuleNames = heatColor
+    responseSpeed = 1.0
+    dependOnEngineState = True
+    dependOnThrottle = True
+  }
+  MODULE
+  {
+    name = FXModuleThrottleEffects
+    fxModuleNames = throttleColor
+    responseSpeed = 1.0
+    dependOnEngineState = True
+    dependOnThrottle = True
+  }
+  MODULE
+  {
+    name = ModuleColorChanger
+    moduleID = heatColor
+    animRate = 0.025
+    shaderProperty = _EmissiveColor
+    excludedRenderer = EngineCore
+    toggleInEditor = false
+    toggleInFlight = false
+    redCurve
+    {
+      key = 0 0 1 1
+      key = 1 1 1 1
+    }
+    greenCurve
+    {
+      key = 0 0 1 1
+      key = 1 1 1 1
+    }
+    blueCurve
+    {
+      key = 0 0 1 1
+      key = 1 1 1 1
+    }
+    alphaCurve
+    {
+      key = 0 0 1 1
+      key = 1 1 1 1
+    }
+  }
+  MODULE
+  {
+    name = ModuleColorChanger
+    moduleID = throttleColor
+    animRate = 1
+    shaderProperty = _TintColor
+    includedRenderer = EngineCore
+    toggleInEditor = false
+    toggleInFlight = false
+    redCurve
+    {
+      key = 0 0
+      key = 1 1
+    }
+    greenCurve
+    {
+      key = 0 0
+      key = 1 1
+    }
+    blueCurve
+    {
+      key = 0 0
+      key = 1 1
+    }
+    alphaCurve
+    {
+      key = 0 0
+      key = 1 1
+    }
+  }
+  MODULE
+  {
+    name = FXModuleLookAtConstraint
+    CONSTRAINLOOKFX
+    {
+      targetName = gimbalArm_upper1
+      rotatorsName = gimbalArm_lower1
+    }
+    CONSTRAINLOOKFX
+    {
+      targetName = gimbalArm_lower1
+      rotatorsName = gimbalArm_upper1
+    }
+    CONSTRAINLOOKFX
+    {
+      targetName = gimbalArm_upper2
+      rotatorsName = gimbalArm_lower2
+    }
+    CONSTRAINLOOKFX
+    {
+      targetName = gimbalArm_lower2
+      rotatorsName = gimbalArm_upper2
+    }
+    CONSTRAINLOOKFX
+    {
+      targetName = gimbalArm_upper3
+      rotatorsName = gimbalArm_lower3
+    }
+    CONSTRAINLOOKFX
+    {
+      targetName = gimbalArm_lower3
+      rotatorsName = gimbalArm_upper3
+    }
+    CONSTRAINLOOKFX
+    {
+      targetName = gimbalArm_upper4
+      rotatorsName = gimbalArm_lower4
+    }
+    CONSTRAINLOOKFX
+    {
+      targetName = gimbalArm_lower4
+      rotatorsName = gimbalArm_upper4
+    }
+  }
+  MODULE
+  {
+    name = ModuleCargoPart
+    stackableQuantity = 1
+    packedVolume = -1
+  }
+}
+		
\ No newline at end of file
diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/1875/restock-srb-anvil.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/1875/restock-srb-anvil.cfg
index de3403a6..fb1e9481 100644
--- a/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/1875/restock-srb-anvil.cfg
+++ b/Distribution/RestockPlus/GameData/ReStockPlus/Parts/Engine/1875/restock-srb-anvil.cfg
@@ -153,202 +153,6 @@ PART
     useGimbalResponseSpeed = true
   }
   MODULE
-  {
-    name = ModuleTestSubject
-    useStaging = True
-    useEvent = True
-    situationMask = 60
-    CONSTRAINT
-    {
-      // disable all but home
-      type = SITUATION
-      value = 0
-      body = _NotHome
-      prestige = Trivial
-    }
-    CONSTRAINT
-    {
-      // disable all but home
-      type = SITUATION
-      value = 0
-      body = _NotHome
-      prestige = Significant
-    }
-    CONSTRAINT
-    {
-      type = REPEATABILITY
-      value = ALWAYS
-      prestige = Trivial
-    }
-    CONSTRAINT
-    {
-      type = REPEATABILITY
-      value = BODYANDSITUATION
-      prestige = Significant
-    }
-    CONSTRAINT
-    {
-      type = REPEATABILITY
-      value = ONCEPERPART
-      prestige = Exceptional
-    }
-    CONSTRAINT
-    {
-      type = ALTITUDEENV
-      test = GT
-      value = 4000
-      prestige = Trivial
-    }
-    CONSTRAINT
-    {
-      type = ALTITUDEENV
-      test = LT
-      value = 8000
-      prestige = Trivial
-    }
-    CONSTRAINT
-    {
-      type = ALTITUDEENV
-      test = GT
-      value = 2000
-      prestige = Significant
-    }
-    CONSTRAINT
-    {
-      type = ALTITUDEENV
-      test = LT
-      value = 4000
-      prestige = Significant
-    }
-    CONSTRAINT
-    {
-      type = ALTITUDEENV
-      test = GT
-      value = 1000
-      prestige = Exceptional
-    }
-    CONSTRAINT
-    {
-      type = ALTITUDEENV
-      test = LT
-      value = 2000
-      prestige = Exceptional
-    }
-    CONSTRAINT
-    {
-      type = ALTITUDE
-      test = GT
-      value = 0 // this just registers altitude as something to care about
-      situationMask = 8
-    }
-    CONSTRAINT
-    {
-      type = ALTITUDE
-      test = LT
-      value = 300000
-      situationMask = 16
-      body = _NotSun
-    }
-    CONSTRAINT
-    {
-      type = ALTITUDE
-      test = LT
-      value = 600000
-      situationMask = 32
-      body = _NotSun
-    }
-    CONSTRAINT
-    {
-      type = SPEED
-      test = GT
-      value = 0
-      situationMask = 8
-      prestige = Trivial
-    }
-    CONSTRAINT
-    {
-      type = SPEED
-      test = LT
-      value = 600
-      situationMask = 8
-      prestige = Trivial
-    }
-    CONSTRAINT
-    {
-      type = SPEED
-      test = GT
-      value = 0
-      situationMask = 8
-      prestige = Significant
-    }
-    CONSTRAINT
-    {
-      type = SPEED
-      test = LT
-      value = 900
-      situationMask = 8
-      prestige = Significant
-    }
-    CONSTRAINT
-    {
-      type = SPEED
-      test = GT
-      value = 300
-      situationMask = 8
-      prestige = Exceptional
-    }
-    CONSTRAINT
-    {
-      type = SPEED
-      test = LT
-      value = 1200
-      situationMask = 8
-      prestige = Exceptional
-    }
-    CONSTRAINT
-    {
-      type = SPEEDENV
-      test = LT
-      value = 200
-      prestige = Trivial
-    }
-    CONSTRAINT
-    {
-      type = SPEEDENV
-      test = GT
-      value = 100
-      prestige = Trivial
-    }
-    CONSTRAINT
-    {
-      type = SPEEDENV
-      test = LT
-      value = 100
-      prestige = Significant
-    }
-    CONSTRAINT
-    {
-      type = SPEEDENV
-      test = GT
-      value = 50
-      prestige = Significant
-    }
-    CONSTRAINT
-    {
-      type = SPEEDENV
-      test = LT
-      value = 50
-      prestige = Exceptional
-    }
-    CONSTRAINT
-    {
-      type = SPEEDENV
-      test = GT
-      value = 20
-      prestige = Exceptional
-    }
-  }
-  MODULE
   {
     name = ModuleSurfaceFX
     thrustProviderModuleIndex = 0
diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Patches/Engine/restock-engine-cheetah-gimbal.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Patches/Engine/restock-engine-cheetah-gimbal.cfg
new file mode 100644
index 00000000..43238701
--- /dev/null
+++ b/Distribution/RestockPlus/GameData/ReStockPlus/Patches/Engine/restock-engine-cheetah-gimbal.cfg
@@ -0,0 +1,39 @@
+// Enables gimbal on the vernier thrusters for the Cheetah
+
+@PART[LiquidEngineLV-T91]:AFTER[000_ReStock]
+{
+  !MODEL,* {}
+  MODEL
+  {
+    model = ReStock/Assets/Engine/restock-engine-cheetah-2
+  }
+  @MODULE[ModuleGimbal]
+  {
+    @gimbalRange = 2
+  }
+  @MODULE[ModuleEnginesFX]
+  {
+    transformMultipliers
+    {
+      trf0 = 0.96
+      trf1 = 0.01
+      trf2 = 0.01
+	  trf3 = 0.01
+	  trf4 = 0.01
+    }
+  }
+  MODULE
+  {
+    name = ModuleGimbal
+    gimbalTransformName = vernier_gimbal
+    gimbalRangeXP = 12
+    gimbalRangeXN = 12
+    gimbalRangeYP = 0
+    gimbalRangeYN = 0
+    gimbalResponseSpeed = 20
+    useGimbalResponseSpeed = true
+    enablePitch = false
+    enableRoll = true
+    enableYaw = false
+  }
+}
\ No newline at end of file
diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Patches/Engine/restock-engine-les-decoupler.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Patches/Engine/restock-engine-les-decoupler.cfg
index a747642e..76991c57 100644
--- a/Distribution/RestockPlus/GameData/ReStockPlus/Patches/Engine/restock-engine-les-decoupler.cfg
+++ b/Distribution/RestockPlus/GameData/ReStockPlus/Patches/Engine/restock-engine-les-decoupler.cfg
@@ -1,6 +1,6 @@
 // Adds a built in decoupler to the launch escape system
 
-@PART[LaunchEscapeSystem]
+@PART[LaunchEscapeSystem]:AFTER[000_ReStock]
 {
   fx_gasBurst_white = 0.0, -1.372544, 0.0, 0.0, -1.0, 0.0, decouple
   sound_decoupler_fire = decouple
diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Patches/Engine/restock-engine-mammoth-node.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Patches/Engine/restock-engine-mammoth-node.cfg
index 52ecc9f0..a172f587 100644
--- a/Distribution/RestockPlus/GameData/ReStockPlus/Patches/Engine/restock-engine-mammoth-node.cfg
+++ b/Distribution/RestockPlus/GameData/ReStockPlus/Patches/Engine/restock-engine-mammoth-node.cfg
@@ -1,6 +1,6 @@
 // Adds a bottom node to the mammoth
 
-@PART[Size3EngineCluster]
+@PART[Size3EngineCluster]:AFTER[000_ReStock]
 {
   node_stack_bottom = 0.0, -1.204, 0.0, 0.0, -1.0, 0.0, 1
 }
diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Patches/Engine/restock-engine-srb-gimbal.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Patches/Engine/restock-engine-srb-gimbal.cfg
index 0a107ab3..7e2f5ef5 100644
--- a/Distribution/RestockPlus/GameData/ReStockPlus/Patches/Engine/restock-engine-srb-gimbal.cfg
+++ b/Distribution/RestockPlus/GameData/ReStockPlus/Patches/Engine/restock-engine-srb-gimbal.cfg
@@ -1,7 +1,7 @@
 // Adds gimballing to SRBs
 
 // Kickback
-@PART[MassiveBooster]:NEEDS[!BetterSRBs]
+@PART[MassiveBooster]:AFTER[000_ReStock]:NEEDS[!BetterSRBs]
 {
   MODULE
   {
@@ -14,7 +14,7 @@
 }
 
 // Pollux
-@PART[Pollux]:NEEDS[!BetterSRBs]
+@PART[Pollux]:AFTER[000_ReStock]:NEEDS[!BetterSRBs]
 {
   MODULE
   {
@@ -51,7 +51,7 @@
 }
 
 // Thumper
-@PART[solidBooster1-1]:NEEDS[!BetterSRBs]
+@PART[solidBooster1-1]:AFTER[000_ReStock]:NEEDS[!BetterSRBs]
 {
   MODULE
   {
@@ -64,7 +64,7 @@
 }
 
 // Hammer
-@PART[solidBooster_v2]:NEEDS[!BetterSRBs]
+@PART[solidBooster_v2]:AFTER[000_ReStock]:NEEDS[!BetterSRBs]
 {
   MODULE
   {
@@ -77,7 +77,7 @@
 }
 
 // Flea
-@PART[solidBooster_sm_v2]:NEEDS[!BetterSRBs]
+@PART[solidBooster_sm_v2]:AFTER[000_ReStock]:NEEDS[!BetterSRBs]
 {
   MODULE
   {
diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Patches/Structural/restock-launch-clamp-extensions.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Patches/Structural/restock-launch-clamp-extensions.cfg
index 737d6365..b92442ed 100644
--- a/Distribution/RestockPlus/GameData/ReStockPlus/Patches/Structural/restock-launch-clamp-extensions.cfg
+++ b/Distribution/RestockPlus/GameData/ReStockPlus/Patches/Structural/restock-launch-clamp-extensions.cfg
@@ -1,7 +1,7 @@
 // Allows extending and retracting of launch clamps
 
 // TT18-A Launch Stability Enhancer
-@PART[launchClamp1]
+@PART[launchClamp1]:AFTER[000_ReStock]
 {
   MODULE
   {
diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Patches/Structural/restock-mh-spr-panel-com-offset.cfg b/Distribution/RestockPlus/GameData/ReStockPlus/Patches/Structural/restock-mh-spr-panel-com-offset.cfg
index 289ab6b2..c4519c3d 100644
--- a/Distribution/RestockPlus/GameData/ReStockPlus/Patches/Structural/restock-mh-spr-panel-com-offset.cfg
+++ b/Distribution/RestockPlus/GameData/ReStockPlus/Patches/Structural/restock-mh-spr-panel-com-offset.cfg
@@ -1,25 +1,25 @@
 // Offsets the Center of Mass for the SP-R Triangle Panels to correctly locate the centroid.
 
 // SP-R06 Structural Panel
-@PART[Triangle0]
+@PART[Triangle0]:AFTER[000_ReStock]
 {
   CoMOffset = 0.1042, 0, 0.1042
 }
 
 // SP-R12 Structural Panel
-@PART[Triangle1]
+@PART[Triangle1]:AFTER[000_ReStock]
 {
   CoMOffset = 0.2083, 0, 0.2083
 }
 
 // SP-R18 Structural Panel
-@PART[Triangle1p5]
+@PART[Triangle1p5]:AFTER[000_ReStock]
 {
   CoMOffset = 0.3125, 0, 0.3125
 }
 
 // SP-R25 Structural Panel
-@PART[Triangle2]
+@PART[Triangle2]:AFTER[000_ReStock]
 {
   CoMOffset = 0.4167, 0, 0.4167
 }
diff --git a/Distribution/RestockPlus/GameData/ReStockPlus/Versioning/ReStockPlus.version b/Distribution/RestockPlus/GameData/ReStockPlus/Versioning/ReStockPlus.version
index cb3ab475..2c4d2edc 100644
--- a/Distribution/RestockPlus/GameData/ReStockPlus/Versioning/ReStockPlus.version
+++ b/Distribution/RestockPlus/GameData/ReStockPlus/Versioning/ReStockPlus.version
@@ -5,8 +5,8 @@
     "VERSION":
     {
         "MAJOR":1,
-        "MINOR":4,
-        "PATCH":6,
+        "MINOR":5,
+        "PATCH":0,
         "BUILD":0
     },
     "KSP_VERSION":
diff --git a/Distribution/RestockPlus/changelog.txt b/Distribution/RestockPlus/changelog.txt
index ef5f35ae..f092ea6b 100644
--- a/Distribution/RestockPlus/changelog.txt
+++ b/Distribution/RestockPlus/changelog.txt
@@ -1,6 +1,11 @@
-v1.4.6
+v1.5.0
 ------
+- Introduced patch to give roll control gimbal to Making History LV-T91 "Cheetah" Liquid Fuel Engine
+- New Engine parts
+  - PLACEHOLDER FOR RS+ CHEETAH-ALIKE (Kavaeric): LR-91 engine with 1.25m Truss, 1.25m Boattail, 1.875m Truss, 1.875m Boattail and Compact variants. Disabled if Making History is installed.
+  - PLACEHOLDER FOR RS+ BOBCAT-ALIKE (Kavaeric): LR-87 engine with [VARIANTS]. Disabled if Making History is installed.
 - Added VABOrganizer support
+- Added Russian language localization (BalaurGD)
 
 v1.4.5
 ------
diff --git a/Distribution/RestockPlus/readme.txt b/Distribution/RestockPlus/readme.txt
index 8f67f525..a9ad1200 100644
--- a/Distribution/RestockPlus/readme.txt
+++ b/Distribution/RestockPlus/readme.txt
@@ -1,5 +1,5 @@
 ==============
-RESTOCK+ 1.4.6
+RESTOCK+ 1.5.0
 ==============
 
 Restock+ is a complement to Restock which adds useful parts that we feel are missing from the base game. Functionally, these parts additions allow better flexibility in craft construction and not add new gameplay systems or form factors. Some examples might include:
@@ -23,7 +23,7 @@ DEPENDENCIES
 ============
 
 Required:
-- Restock (1.4.6)
+- Restock (1.5.0)
 - ModuleManager (4.2.3)
 
 =============
diff --git a/Source/Restock/Constraints/LookAtConstraint.cs b/Source/Restock/Constraints/LookAtConstraint.cs
index 31a43761..0942dd12 100644
--- a/Source/Restock/Constraints/LookAtConstraint.cs
+++ b/Source/Restock/Constraints/LookAtConstraint.cs
@@ -1,3 +1,4 @@
+using System;
 using UnityEngine;
 
 namespace Restock.Constraints
@@ -21,15 +22,21 @@ namespace Restock.Constraints
             node.TryGetValue("targetName", ref targetName);
             
             rotator = p.FindModelTransform(rotatorsName);
+            if (rotator == null)
+            {
+                throw new Exception($"Missing rotator transform {rotator}");
+            }
             target = p.FindModelTransform(targetName);
+            if (target == null)
+            {
+                throw new Exception($"Missing target transform {target}");
+            }
         }
         
         public void Update()
         {
-            if (rotator == null || target == null) return;
-            
             var lookPos = target.position - rotator.position;
-            var rotation = Quaternion.LookRotation(lookPos, target.up);
+            var rotation = Quaternion.LookRotation(lookPos, rotator.up);
             rotator.rotation = rotation;
         }
     }
diff --git a/Source/Restock/ModuleRestockConstraints.cs b/Source/Restock/ModuleRestockConstraints.cs
index 38e68816..9ba5de01 100644
--- a/Source/Restock/ModuleRestockConstraints.cs
+++ b/Source/Restock/ModuleRestockConstraints.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Linq;
 using Restock.Constraints;
 
@@ -6,67 +7,77 @@ namespace Restock
 {
     public class ModuleRestockConstraints : PartModule
     {
-        public List<IConstraint> constraints;
+        private List<IConstraint> _constraints;
 
         public override void OnLoad(ConfigNode node)
         {
             base.OnLoad(node);
             
-            constraints = new List<IConstraint>();
+            _constraints = new List<IConstraint>();
             var cnodes = node.GetNodes();
             this.Log($"Loading {cnodes.Length} constraints");
 
             foreach (var cnode in cnodes)
             {
-                switch (cnode.name)
+                try
                 {
-                    //LookAtConstraint
-                    case "CONSTRAINLOOKFX":
-                    case "LOOKATCONSTRAINT":
-                        constraints.Add(new LookAtConstraint(cnode, this.part));
-                        break;
+                    switch (cnode.name)
+                    {
+                        //LookAtConstraint
+                        case "CONSTRAINLOOKFX":
+                        case "LOOKATCONSTRAINT":
+                            _constraints.Add(new LookAtConstraint(cnode, this.part));
+                            break;
 
-                    //CopyPositionConstraint
-                    case "COPYPOSITIONCONSTRAINT":
-                        constraints.Add(new CopyPositionConstraint(cnode, this.part));
-                        break;
+                        //CopyPositionConstraint
+                        case "COPYPOSITIONCONSTRAINT":
+                            _constraints.Add(new CopyPositionConstraint(cnode, this.part));
+                            break;
 
-                    //CopyRotationConstraint
-                    case "COPYROTATIONCONSTRAINT":
-                        constraints.Add(new CopyRotationConstraint(cnode, this.part));
-                        break;
+                        //CopyRotationConstraint
+                        case "COPYROTATIONCONSTRAINT":
+                            _constraints.Add(new CopyRotationConstraint(cnode, this.part));
+                            break;
+                    }
+                }
+                catch(Exception e)
+                {
+                    this.LogError($"Exception while loading {cnode.name} Node: {e}");
                 }
             }
 
-            this.Log($"Loaded {constraints.Count} constraints");
+            this.Log($"Loaded {_constraints.Count} constraints");
         }
 
         public override void OnStart(StartState state)
         {
-            if (HighLogic.LoadedSceneIsFlight || HighLogic.LoadedSceneIsEditor)
+            if (!HighLogic.LoadedSceneIsFlight && !HighLogic.LoadedSceneIsEditor) return;
+            if (_constraints != null && _constraints.Count != 0) return;
+
+            // I have no idea why this is here but I'm scared to remove it
+            foreach (var pNode in GameDatabase.Instance.GetConfigs("PART"))
             {
-                if (constraints == null || constraints.Count == 0)
-                {
-                    foreach (UrlDir.UrlConfig pNode in GameDatabase.Instance.GetConfigs("PART"))
-                    {
-                        if (pNode.name.Replace("_", ".") == part.partInfo.name)
-                        {
-                            var cfg = pNode.config;
-                            var node = cfg.GetNodes("MODULE").Single(n => n.GetValue("name") == moduleName);
-                            OnLoad(node);
-                        }
-                    }
-                }
+                if (pNode.name.Replace("_", ".") != part.partInfo.name) continue;
+                var cfg = pNode.config;
+                var node = cfg.GetNodes("MODULE").Single(n => n.GetValue("name") == moduleName);
+                OnLoad(node);
             }
         }
 
         private void LateUpdate()
         {
-            if (constraints == null) return;
-            
-            foreach (var constraint in constraints)
+            for (var i = 0; i < _constraints.Count; i++)
             {
-                constraint.Update();
+                try
+                {
+                    _constraints[i].Update();
+                }
+                catch (Exception e)
+                {
+                    this.LogError($"Encountered exception in constraint. Removing the constraint to prevent further errors\n {e}");
+                    _constraints.RemoveAt(i--);
+                }
+
             }
         }
     }
diff --git a/Source/Restock/ModuleRestockHeatEffects.cs b/Source/Restock/ModuleRestockHeatEffects.cs
index 94c23b3e..8700ed49 100644
--- a/Source/Restock/ModuleRestockHeatEffects.cs
+++ b/Source/Restock/ModuleRestockHeatEffects.cs
@@ -43,6 +43,7 @@ namespace Restock
         [KSPField] public bool disableBlackbody = false;
 
         public List<Renderer> renderers = new List<Renderer>();
+        public List<string> excludedRendererNames = new List<string>();
 
         private readonly string _shaderBlackbody = "_TemperatureColor";
 
@@ -103,22 +104,12 @@ namespace Restock
         {
             if (HighLogic.LoadedSceneIsEditor || HighLogic.LoadedSceneIsFlight) return;
 
-            renderers = base.part.FindModelComponents<Renderer>();
-
             if (node.HasValue("excludedRenderer"))
             {
-                var excludedRenderers = new List<string>();
-
-                excludedRenderers.AddRange(node.GetValues("excludedRenderer"));
-
-                for (int i = renderers.Count - 1; i >= 0; i--)
-                {
-                    if (renderers[i] == null || excludedRenderers.Contains(renderers[i].name))
-                    {
-                        renderers.RemoveAt(i);
-                    }
-                }
+                excludedRendererNames = new List<string>(node.GetValues("excludedRenderer"));
             }
+
+            FindRenderers();
         }
 
         public void LateUpdate()
@@ -140,7 +131,7 @@ namespace Restock
                     temp = useSkinTemp ? base.part.skinTemperature : base.part.temperature;
                 }
 
-                var temp2 = (float) ((temp - draperPoint) / _lerpRange);
+                var temp2 = (float)((temp - draperPoint) / _lerpRange);
                 temp2 = Mathf.Clamp01(temp2);
 
                 _emissiveColor.r = redCurve.Evaluate(temp2);
@@ -156,9 +147,35 @@ namespace Restock
                 _propertyBlock.SetColor(_shaderBlackbodyID, Color.black);
             }
 
+            try
+            {
+                UpdateRenderers(_propertyBlock);
+            } catch(NullReferenceException)
+            {
+                // if any renderers are null, rebuild renderer list
+                // any bonus renderers will just have to be ignored I guess
+                FindRenderers();
+                UpdateRenderers(_propertyBlock);
+            }
+        }
+
+        private void UpdateRenderers(MaterialPropertyBlock mpb)
+        {
             for (var i = 0; i < renderers.Count; i++)
             {
-                renderers[i].SetPropertyBlock(_propertyBlock);
+                renderers[i].SetPropertyBlock(mpb);
+            }
+        }
+
+        private void  FindRenderers()
+        {
+            renderers= part.FindModelComponents<Renderer>();
+
+            renderers.RemoveAll(renderer => renderer == null);
+
+            if( excludedRendererNames.Count != 0)
+            {
+                renderers.RemoveAll(renderer => excludedRendererNames.Contains(renderer.name));
             }
         }
     }
diff --git a/Source/Restock/Properties/AssemblyInfo.cs b/Source/Restock/Properties/AssemblyInfo.cs
deleted file mode 100644
index 8a0cb45c..00000000
--- a/Source/Restock/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("Restock")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Porktober Revolution")]
-[assembly: AssemblyProduct("Restock")]
-[assembly: AssemblyCopyright("Copyright © Porktober Revolution 2018")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("0a087745-0e2b-4d11-9431-c2d4191dd510")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.1.0.0")]
-[assembly: AssemblyFileVersion("0.1.0.0")]
-
-[assembly: KSPAssembly("Restock", 0, 1, 0)]
diff --git a/Source/Restock/Restock.csproj b/Source/Restock/Restock.csproj
index 8baab36c..47ee40bd 100644
--- a/Source/Restock/Restock.csproj
+++ b/Source/Restock/Restock.csproj
@@ -1,17 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{0A087745-0E2B-4D11-9431-C2D4191DD510}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Restock</RootNamespace>
-    <AssemblyName>Restock</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <Deterministic>true</Deterministic>
+    <TargetFramework>net48</TargetFramework>
+    <LangVersion>8</LangVersion>
+    <IsPackable>false</IsPackable>
+    <PlatformTarget>x64</PlatformTarget>
+    <NoWarn>1701;1702;CS0649;CS1591</NoWarn>
+    <AssemblyVersion>1.0.0.0</AssemblyVersion>
+    <AssemblyTitle>Restock</AssemblyTitle>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -43,33 +40,6 @@
       <Private>False</Private>
     </Reference>
   </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Constraints\CopyPositionConstraint.cs" />
-    <Compile Include="Constraints\CopyRotationConstraint.cs" />
-    <Compile Include="Constraints\IConstraint.cs" />
-    <Compile Include="Constraints\LookAtConstraint.cs" />
-    <Compile Include="InstallChecker.cs" />
-    <Compile Include="LaunchClampGirderFactory.cs" />
-    <Compile Include="MaterialModifiers\ColorPropertyMaterialModifier.cs" />
-    <Compile Include="MaterialModifiers\FloatPropertyMaterialModifier.cs" />
-    <Compile Include="MaterialModifiers\IMaterialModifier.cs" />
-    <Compile Include="MaterialModifiers\MaterialModifierParser.cs" />
-    <Compile Include="MaterialModifiers\TexturePropertyMaterialModifier.cs" />
-    <Compile Include="ModuleRestockDeployableMeshHider.cs" />
-    <Compile Include="ModuleRestockLaunchClamp.cs" />
-    <Compile Include="ModuleRestockEnhancedLight.cs" />
-    <Compile Include="ModuleRestockRCSGlow.cs" />
-    <Compile Include="ModuleRestockLinkedMesh.cs" />
-    <Compile Include="ModuleRestockDepthMask.cs" />
-    <Compile Include="ModuleRestockHeatEffects.cs" />
-    <Compile Include="ModuleRestockISRUAnimation.cs" />
-    <Compile Include="ModuleRestockConstraints.cs" />
-    <Compile Include="ModuleRestockModifyFairingMaterials.cs" />
-    <Compile Include="ModuleRestockModifyMaterials.cs" />
-    <Compile Include="PartModuleExtensions.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="ResourceBlacklist.cs" />
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PostBuildEvent>sh -e -c "cp -v '$(TargetPath)' '$(SolutionDir)/../Distribution/Restock/GameData/ReStock/Plugins'"</PostBuildEvent>