diff --git a/app/game/localization/TIDriveTemplate.en b/app/game/localization/TIDriveTemplate.en
index a3adf0c..7708cd5 100644
--- a/app/game/localization/TIDriveTemplate.en
+++ b/app/game/localization/TIDriveTemplate.en
@@ -244,7 +244,7 @@ TIDriveTemplate.displayName.AdvancedPulsarDrivex4=Advanced Pulsar Drive x4
 TIDriveTemplate.displayName.AdvancedPulsarDrivex5=Advanced Pulsar Drive x5
 TIDriveTemplate.displayName.AdvancedPulsarDrivex6=Advanced Pulsar Drive x6
 TIDriveTemplate.displayName.PebbleDrivex1=Pebble Drive x1
-TIDriveTemplate.description.PebbleDrivex1=Propellant is run through small spheres composed of graphite and nuclear fuel, operating at high temperatures allowing high thrust.
+TIDriveTemplate.description.PebbleDrivex1=Propellant is run through a bed of small spheres composed of graphite and nuclear fuel, operating at temperatures that allow high thrust.
 TIDriveTemplate.displayName.PebbleDrivex2=Pebble Drive x2
 TIDriveTemplate.displayName.PebbleDrivex3=Pebble Drive x3
 TIDriveTemplate.displayName.PebbleDrivex4=Pebble Drive x4
@@ -264,6 +264,13 @@ TIDriveTemplate.displayName.LarsDrivex3=Lars Drive x3
 TIDriveTemplate.displayName.LarsDrivex4=Lars Drive x4
 TIDriveTemplate.displayName.LarsDrivex5=Lars Drive x5
 TIDriveTemplate.displayName.LarsDrivex6=Lars Drive x6
+TIDriveTemplate.displayName.TeardropDrivex1=Teardrop Drive x1
+TIDriveTemplate.description.TeardropDrivex1=A mist of fissioning uranium heats hydrogen propellant.
+TIDriveTemplate.displayName.TeardropDrivex2=Teardrop Drive x2
+TIDriveTemplate.displayName.TeardropDrivex3=Teardrop Drive x3
+TIDriveTemplate.displayName.TeardropDrivex4=Teardrop Drive x4
+TIDriveTemplate.displayName.TeardropDrivex5=Teardrop Drive x5
+TIDriveTemplate.displayName.TeardropDrivex6=Teardrop Drive x6
 TIDriveTemplate.displayName.FissionSpinnerDrivex1=Fission Spinner Drive x1
 TIDriveTemplate.description.FissionSpinnerDrivex1=Propellant is injected into a rotating nuclear core of liquid refractory metals.
 TIDriveTemplate.displayName.FissionSpinnerDrivex2=Fission Spinner Drive x2
@@ -272,7 +279,7 @@ TIDriveTemplate.displayName.FissionSpinnerDrivex4=Fission Spinner Drive x4
 TIDriveTemplate.displayName.FissionSpinnerDrivex5=Fission Spinner Drive x5
 TIDriveTemplate.displayName.FissionSpinnerDrivex6=Fission Spinner Drive x6
 TIDriveTemplate.displayName.PegasusDrivex1=Pegasus Drive x1
-TIDriveTemplate.description.PegasusDrivex1=An advanced version of the Fission Spinner drive that offers a higher exhaust velocity.
+TIDriveTemplate.description.PegasusDrivex1=An advanced version of the Fission Spinner drive that offers incredible amounts of thrust.
 TIDriveTemplate.displayName.PegasusDrivex2=Pegasus Drive x2
 TIDriveTemplate.displayName.PegasusDrivex3=Pegasus Drive x3
 TIDriveTemplate.displayName.PegasusDrivex4=Pegasus Drive x4
@@ -327,15 +334,15 @@ TIDriveTemplate.displayName.PharosDrivex3=Pharos Drive x3
 TIDriveTemplate.displayName.PharosDrivex4=Pharos Drive x4
 TIDriveTemplate.displayName.PharosDrivex5=Pharos Drive x5
 TIDriveTemplate.displayName.PharosDrivex6=Pharos Drive x6
-TIDriveTemplate.displayName.FissionLanternx1=Fission Lantern x1
-TIDriveTemplate.description.FissionLanternx1=High-power nuclear gas core drive capable of extremely high thrust for a fission regime.
-TIDriveTemplate.displayName.FissionLanternx2=Fission Lantern x2
-TIDriveTemplate.displayName.FissionLanternx3=Fission Lantern x3
-TIDriveTemplate.displayName.FissionLanternx4=Fission Lantern x4
-TIDriveTemplate.displayName.FissionLanternx5=Fission Lantern x5
-TIDriveTemplate.displayName.FissionLanternx6=Fission Lantern x6
+TIDriveTemplate.displayName.LodestarFissionLanternx1=Lodestar Fission Lantern x1
+TIDriveTemplate.description.LodestarFissionLanternx1=High-power nuclear gas core drive capable of extremely high thrust for a fission regime.
+TIDriveTemplate.displayName.LodestarFissionLanternx2=Lodestar Fission Lantern x2
+TIDriveTemplate.displayName.LodestarFissionLanternx3=Lodestar Fission Lantern x3
+TIDriveTemplate.displayName.LodestarFissionLanternx4=Lodestar Fission Lantern x4
+TIDriveTemplate.displayName.LodestarFissionLanternx5=Lodestar Fission Lantern x5
+TIDriveTemplate.displayName.LodestarFissionLanternx6=Lodestar Fission Lantern x6
 TIDriveTemplate.displayName.FissionFragDrivex1=Fission Frag Drive x1
-TIDriveTemplate.description.FissionFragDrivex1=Weak but efficient nuclear gas core drive directly expels fissioned atoms as reaction mass.
+TIDriveTemplate.description.FissionFragDrivex1=Weak but efficient nuclear drive directly expels fissioned atoms as reaction mass.
 TIDriveTemplate.displayName.FissionFragDrivex2=Fission Frag Drive x2
 TIDriveTemplate.displayName.FissionFragDrivex3=Fission Frag Drive x3
 TIDriveTemplate.displayName.FissionFragDrivex4=Fission Frag Drive x4
@@ -362,20 +369,20 @@ TIDriveTemplate.displayName.FlareDrivex3=Flare Drive x3
 TIDriveTemplate.displayName.FlareDrivex4=Flare Drive x4
 TIDriveTemplate.displayName.FlareDrivex5=Flare Drive x5
 TIDriveTemplate.displayName.FlareDrivex6=Flare Drive x6
-TIDriveTemplate.displayName.FirestarDrivex1=Firestar Drive x1
-TIDriveTemplate.description.FirestarDrivex1=The most powerful gas core fission rocket we can design.
-TIDriveTemplate.displayName.FirestarDrivex2=Firestar Drive x2
-TIDriveTemplate.displayName.FirestarDrivex3=Firestar Drive x3
-TIDriveTemplate.displayName.FirestarDrivex4=Firestar Drive x4
-TIDriveTemplate.displayName.FirestarDrivex5=Firestar Drive x5
-TIDriveTemplate.displayName.FirestarDrivex6=Firestar Drive x6
-TIDriveTemplate.displayName.NeutronFluxDrivex1=Neutron Flux Drive x1
-TIDriveTemplate.description.NeutronFluxDrivex1=A powerful drive relying on a steady nuclear detonation using enriched uranium tetrabromide.
-TIDriveTemplate.displayName.NeutronFluxDrivex2=Neutron Flux Drive x2
-TIDriveTemplate.displayName.NeutronFluxDrivex3=Neutron Flux Drive x3
-TIDriveTemplate.displayName.NeutronFluxDrivex4=Neutron Flux Drive x4
-TIDriveTemplate.displayName.NeutronFluxDrivex5=Neutron Flux Drive x5
-TIDriveTemplate.displayName.NeutronFluxDrivex6=Neutron Flux Drive x6
+TIDriveTemplate.displayName.FirestarFissionLanternx1=Firestar Fission Lantern x1
+TIDriveTemplate.description.FirestarFissionLanternx1=The most powerful gas core fission rocket we can design.
+TIDriveTemplate.displayName.FirestarFissionLanternx2=Firestar Fission Lantern x2
+TIDriveTemplate.displayName.FirestarFissionLanternx3=Firestar Fission Lantern x3
+TIDriveTemplate.displayName.FirestarFissionLanternx4=Firestar Fission Lantern x4
+TIDriveTemplate.displayName.FirestarFissionLanternx5=Firestar Fission Lantern x5
+TIDriveTemplate.displayName.FirestarFissionLanternx6=Firestar Fission Lantern x6
+TIDriveTemplate.displayName.NeutronFluxLanternx1=Neutron Flux Lantern x1
+TIDriveTemplate.description.NeutronFluxLanternx1=A powerful drive relying on a steady nuclear detonation using enriched uranium tetrabromide.
+TIDriveTemplate.displayName.NeutronFluxLanternx2=Neutron Flux Lantern x2
+TIDriveTemplate.displayName.NeutronFluxLanternx3=Neutron Flux Lantern x3
+TIDriveTemplate.displayName.NeutronFluxLanternx4=Neutron Flux Lantern x4
+TIDriveTemplate.displayName.NeutronFluxLanternx5=Neutron Flux Lantern x5
+TIDriveTemplate.displayName.NeutronFluxLanternx6=Neutron Flux Lantern x6
 TIDriveTemplate.displayName.NeutronFluxTorchx1=Neutron Flux Torch x1
 TIDriveTemplate.description.NeutronFluxTorchx1=An advanced nuclear salt water rocket that can go anywhere in the Solar System and beyond.
 TIDriveTemplate.displayName.NeutronFluxTorchx2=Neutron Flux Torch x2
@@ -397,55 +404,28 @@ TIDriveTemplate.displayName.OrionDrivex1=Orion Drive
 TIDriveTemplate.description.OrionDrivex1=They said it was madness, but the dream of detonating nuclear bombs to push a ship through space can be realized.
 TIDriveTemplate.displayName.AdvancedOrionDrivex1=H-Orion Drive
 TIDriveTemplate.description.AdvancedOrionDrivex1=If fission bombs can make our ships go places, why can't thermonuclear warheads?
-TIDriveTemplate.displayName.TritonPulseDrivex1=Triton Pulse Drive x1
-TIDriveTemplate.description.TritonPulseDrivex1=We utilize Z-pinched fusion of tritium and deuterium to provide thrust.
-TIDriveTemplate.displayName.TritonPulseDrivex2=Triton Pulse Drive x2
-TIDriveTemplate.displayName.TritonPulseDrivex3=Triton Pulse Drive x3
-TIDriveTemplate.displayName.TritonPulseDrivex4=Triton Pulse Drive x4
-TIDriveTemplate.displayName.TritonPulseDrivex5=Triton Pulse Drive x5
-TIDriveTemplate.displayName.TritonPulseDrivex6=Triton Pulse Drive x6
-TIDriveTemplate.displayName.FireflyTorchx1=Firefly Torch x1
-TIDriveTemplate.description.FireflyTorchx1=Z-Pinched deuterium fusion and high-speed plasma provide incredible thrust and a drive that can go anywhere.
-TIDriveTemplate.displayName.FireflyTorchx2=Firefly Torch x2
-TIDriveTemplate.displayName.FireflyTorchx3=Firefly Torch x3
-TIDriveTemplate.displayName.FireflyTorchx4=Firefly Torch x4
-TIDriveTemplate.displayName.FireflyTorchx5=Firefly Torch x5
-TIDriveTemplate.displayName.FireflyTorchx6=Firefly Torch x6
-TIDriveTemplate.displayName.LithiumFusionLanternx1=Lithium Fusion Lantern x1
-TIDriveTemplate.description.LithiumFusionLanternx1=Electrostatic forces accelerate products from Lithium-6 and Hydrogen fusion.
-TIDriveTemplate.displayName.LithiumFusionLanternx2=Lithium Fusion Lantern x2
-TIDriveTemplate.displayName.LithiumFusionLanternx3=Lithium Fusion Lantern x3
-TIDriveTemplate.displayName.LithiumFusionLanternx4=Lithium Fusion Lantern x4
-TIDriveTemplate.displayName.LithiumFusionLanternx5=Lithium Fusion Lantern x5
-TIDriveTemplate.displayName.LithiumFusionLanternx6=Lithium Fusion Lantern x6
-TIDriveTemplate.displayName.HybridFusionDrivex1=Hybrid Fusion Drive x1
-TIDriveTemplate.description.HybridFusionDrivex1=Combining multiple plasma confinement techniques allow for an efficient fusion drive with modest thrust.
-TIDriveTemplate.displayName.HybridFusionDrivex2=Hybrid Fusion Drive x2
-TIDriveTemplate.displayName.HybridFusionDrivex3=Hybrid Fusion Drive x3
-TIDriveTemplate.displayName.HybridFusionDrivex4=Hybrid Fusion Drive x4
-TIDriveTemplate.displayName.HybridFusionDrivex5=Hybrid Fusion Drive x5
-TIDriveTemplate.displayName.HybridFusionDrivex6=Hybrid Fusion Drive x6
-TIDriveTemplate.displayName.IcarusDrivex1=Icarus Drive x1
-TIDriveTemplate.description.IcarusDrivex1=A second-generation hybrid fusion drive shows amazing improvements to both thrust and efficiency.
-TIDriveTemplate.displayName.IcarusDrivex2=Icarus Drive x2
-TIDriveTemplate.displayName.IcarusDrivex3=Icarus Drive x3
-TIDriveTemplate.displayName.IcarusDrivex4=Icarus Drive x4
-TIDriveTemplate.displayName.IcarusDrivex5=Icarus Drive x5
-TIDriveTemplate.displayName.IcarusDrivex6=Icarus Drive x6
-TIDriveTemplate.displayName.IcarusTorchx1=Icarus Torch x1
-TIDriveTemplate.description.IcarusTorchx1=A true fusion torch that can go anywhere in the Solar System and beyond.
-TIDriveTemplate.displayName.IcarusTorchx2=Icarus Torch x2
-TIDriveTemplate.displayName.IcarusTorchx3=Icarus Torch x3
-TIDriveTemplate.displayName.IcarusTorchx4=Icarus Torch x4
-TIDriveTemplate.displayName.IcarusTorchx5=Icarus Torch x5
-TIDriveTemplate.displayName.IcarusTorchx6=Icarus Torch x6
-TIDriveTemplate.displayName.TritonTorusDrivex1=Triton Torus Drive x1
-TIDriveTemplate.description.TritonTorusDrivex1=Tokamak-derived fusion drive relying on tritium fusion to heat propellant.
-TIDriveTemplate.displayName.TritonTorusDrivex2=Triton Torus Drive x2
-TIDriveTemplate.displayName.TritonTorusDrivex3=Triton Torus Drive x3
-TIDriveTemplate.displayName.TritonTorusDrivex4=Triton Torus Drive x4
-TIDriveTemplate.displayName.TritonTorusDrivex5=Triton Torus Drive x5
-TIDriveTemplate.displayName.TritonTorusDrivex6=Triton Torus Drive x6
+
+TIDriveTemplate.displayName.TritonFusorDrivex1=Triton Fusor Drive x1
+TIDriveTemplate.description.TritonFusorDrivex1=Powerful electric fields induce fusion in this small but efficient drive.
+TIDriveTemplate.displayName.TritonFusorDrivex2=Triton Fusor Drive x2
+TIDriveTemplate.displayName.TritonFusorDrivex3=Triton Fusor Drive x3
+TIDriveTemplate.displayName.TritonFusorDrivex4=Triton Fusor Drive x4
+TIDriveTemplate.displayName.TritonFusorDrivex5=Triton Fusor Drive x5
+TIDriveTemplate.displayName.TritonFusorDrivex6=Triton Fusor Drive x6
+TIDriveTemplate.displayName.DeuteronFusorDrivex1=Deuteron Fusor Drive x1
+TIDriveTemplate.description.DeuteronFusorDrivex1=A second-generation electrostatic drive produces more energy from Deuterium-Deuterium fusion.
+TIDriveTemplate.displayName.DeuteronFusorDrivex2=Deuteron Fusor Drive x2
+TIDriveTemplate.displayName.DeuteronFusorDrivex3=Deuteron Fusor Drive x3
+TIDriveTemplate.displayName.DeuteronFusorDrivex4=Deuteron Fusor Drive x4
+TIDriveTemplate.displayName.DeuteronFusorDrivex5=Deuteron Fusor Drive x5
+TIDriveTemplate.displayName.DeuteronFusorDrivex6=Deuteron Fusor Drive x6
+TIDriveTemplate.displayName.ProtiumFusorDrivex1=Protium Fusor Drive x1
+TIDriveTemplate.description.ProtiumFusorDrivex1=This marvel of engineering drive emulates stellar fusion in a tiny bottle.
+TIDriveTemplate.displayName.ProtiumFusorDrivex2=Protium Fusor Drive x2
+TIDriveTemplate.displayName.ProtiumFusorDrivex3=Protium Fusor Drive x3
+TIDriveTemplate.displayName.ProtiumFusorDrivex4=Protium Fusor Drive x4
+TIDriveTemplate.displayName.ProtiumFusorDrivex5=Protium Fusor Drive x5
+TIDriveTemplate.displayName.ProtiumFusorDrivex6=Protium Fusor Drive x6
 TIDriveTemplate.displayName.TritonReflexDrivex1=Triton Reflex Drive x1
 TIDriveTemplate.description.TritonReflexDrivex1=Mirror-cell magnetic confinement fusion of tritium and deuterium offers the opportunity for low but constant thrust over long distances.
 TIDriveTemplate.displayName.TritonReflexDrivex2=Triton Reflex Drive x2
@@ -453,20 +433,13 @@ TIDriveTemplate.displayName.TritonReflexDrivex3=Triton Reflex Drive x3
 TIDriveTemplate.displayName.TritonReflexDrivex4=Triton Reflex Drive x4
 TIDriveTemplate.displayName.TritonReflexDrivex5=Triton Reflex Drive x5
 TIDriveTemplate.displayName.TritonReflexDrivex6=Triton Reflex Drive x6
-TIDriveTemplate.displayName.HelionTorusDrivex1=Helion Torus Drive x1
-TIDriveTemplate.description.HelionTorusDrivex1=Deuterium and Helium-3 fused in a magnetic torus provide moderate thrust and efficiency.
-TIDriveTemplate.displayName.HelionTorusDrivex2=Helion Torus Drive x2
-TIDriveTemplate.displayName.HelionTorusDrivex3=Helion Torus Drive x3
-TIDriveTemplate.displayName.HelionTorusDrivex4=Helion Torus Drive x4
-TIDriveTemplate.displayName.HelionTorusDrivex5=Helion Torus Drive x5
-TIDriveTemplate.displayName.HelionTorusDrivex6=Helion Torus Drive x6
-TIDriveTemplate.displayName.AdvancedHelionTorusDrivex1=Advanced Helion Torus Drive x1
-TIDriveTemplate.description.AdvancedHelionTorusDrivex1=Augmented Deuterium-Helium-3 fusion drive using magnetic plasma containment.
-TIDriveTemplate.displayName.AdvancedHelionTorusDrivex2=Advanced Helion Torus Drive x2
-TIDriveTemplate.displayName.AdvancedHelionTorusDrivex3=Advanced Helion Torus Drive x3
-TIDriveTemplate.displayName.AdvancedHelionTorusDrivex4=Advanced Helion Torus Drive x4
-TIDriveTemplate.displayName.AdvancedHelionTorusDrivex5=Advanced Helion Torus Drive x5
-TIDriveTemplate.displayName.AdvancedHelionTorusDrivex6=Advanced Helion Torus Drive x6
+TIDriveTemplate.displayName.DeuteronReflexDrivex1=Deuteron Reflex Drive x1
+TIDriveTemplate.description.DeuteronReflexDrivex1=Advanced materials allow hotter fusion temperatures and higher thrust.
+TIDriveTemplate.displayName.DeuteronReflexDrivex2=Deuteron Reflex Drive x2
+TIDriveTemplate.displayName.DeuteronReflexDrivex3=Deuteron Reflex Drive x3
+TIDriveTemplate.displayName.DeuteronReflexDrivex4=Deuteron Reflex Drive x4
+TIDriveTemplate.displayName.DeuteronReflexDrivex5=Deuteron Reflex Drive x5
+TIDriveTemplate.displayName.DeuteronReflexDrivex6=Deuteron Reflex Drive x6
 TIDriveTemplate.displayName.HelionReflexDrivex1=Helion Reflex Drive x1
 TIDriveTemplate.description.HelionReflexDrivex1=Mirror-cell fusion of Deuterium and Helium-3 provides clean power for ship propulsion.
 TIDriveTemplate.displayName.HelionReflexDrivex2=Helion Reflex Drive x2
@@ -474,85 +447,141 @@ TIDriveTemplate.displayName.HelionReflexDrivex3=Helion Reflex Drive x3
 TIDriveTemplate.displayName.HelionReflexDrivex4=Helion Reflex Drive x4
 TIDriveTemplate.displayName.HelionReflexDrivex5=Helion Reflex Drive x5
 TIDriveTemplate.displayName.HelionReflexDrivex6=Helion Reflex Drive x6
-TIDriveTemplate.displayName.AdvancedHelionReflexDrivex1=Advanced Helion Reflex Drive x1
-TIDriveTemplate.description.AdvancedHelionReflexDrivex1=Advanced materials allow hotter fusion temperatures and higher thrust.
-TIDriveTemplate.displayName.AdvancedHelionReflexDrivex2=Advanced Helion Reflex Drive x2
-TIDriveTemplate.displayName.AdvancedHelionReflexDrivex3=Advanced Helion Reflex Drive x3
-TIDriveTemplate.displayName.AdvancedHelionReflexDrivex4=Advanced Helion Reflex Drive x4
-TIDriveTemplate.displayName.AdvancedHelionReflexDrivex5=Advanced Helion Reflex Drive x5
-TIDriveTemplate.displayName.AdvancedHelionReflexDrivex6=Advanced Helion Reflex Drive x6
-TIDriveTemplate.displayName.ZetaHelionDrivex1=Zeta Helion Drive x1
-TIDriveTemplate.description.ZetaHelionDrivex1=Zeta-pinched Deuterium-Helium-3 fusion plasma is stabilized to provide efficient, long-range travel.
-TIDriveTemplate.displayName.ZetaHelionDrivex2=Zeta Helion Drive x2
-TIDriveTemplate.displayName.ZetaHelionDrivex3=Zeta Helion Drive x3
-TIDriveTemplate.displayName.ZetaHelionDrivex4=Zeta Helion Drive x4
-TIDriveTemplate.displayName.ZetaHelionDrivex5=Zeta Helion Drive x5
-TIDriveTemplate.displayName.ZetaHelionDrivex6=Zeta Helion Drive x6
-TIDriveTemplate.displayName.ZetaBoronFusionDrivex1=Zeta Boron Fusion Drive x1
-TIDriveTemplate.description.ZetaBoronFusionDrivex1=Boron-11 is fused with a stream of protons in a clean reaction to provide a powerful propulsion system.
-TIDriveTemplate.displayName.ZetaBoronFusionDrivex2=Zeta Boron Fusion Drive x2
-TIDriveTemplate.displayName.ZetaBoronFusionDrivex3=Zeta Boron Fusion Drive x3
-TIDriveTemplate.displayName.ZetaBoronFusionDrivex4=Zeta Boron Fusion Drive x4
-TIDriveTemplate.displayName.ZetaBoronFusionDrivex5=Zeta Boron Fusion Drive x5
-TIDriveTemplate.displayName.ZetaBoronFusionDrivex6=Zeta Boron Fusion Drive x6
-TIDriveTemplate.displayName.MagProtiumFusionDrivex1=Mag Protium Fusion Drive x1
-TIDriveTemplate.description.MagProtiumFusionDrivex1=Incredible magnetic forces are used to fuse free protons in a reaction previously only thought possible in stellar cores.
-TIDriveTemplate.displayName.MagProtiumFusionDrivex2=Mag Protium Fusion Drive x2
-TIDriveTemplate.displayName.MagProtiumFusionDrivex3=Mag Protium Fusion Drive x3
-TIDriveTemplate.displayName.MagProtiumFusionDrivex4=Mag Protium Fusion Drive x4
-TIDriveTemplate.displayName.MagProtiumFusionDrivex5=Mag Protium Fusion Drive x5
-TIDriveTemplate.displayName.MagProtiumFusionDrivex6=Mag Protium Fusion Drive x6
-TIDriveTemplate.displayName.TritonHopeInertialDrivex1=Triton Hope Inertial Drive x1
-TIDriveTemplate.description.TritonHopeInertialDrivex1=Laser pulses induce deuterium-tritum fusion, which heats hydrogen propellant in this first attempt at new type of fusion drive.
-TIDriveTemplate.displayName.TritonHopeInertialDrivex2=Triton Hope Inertial Drive x2
-TIDriveTemplate.displayName.TritonHopeInertialDrivex3=Triton Hope Inertial Drive x3
-TIDriveTemplate.displayName.TritonHopeInertialDrivex4=Triton Hope Inertial Drive x4
-TIDriveTemplate.displayName.TritonHopeInertialDrivex5=Triton Hope Inertial Drive x5
-TIDriveTemplate.displayName.TritonHopeInertialDrivex6=Triton Hope Inertial Drive x6
-TIDriveTemplate.displayName.TritonVistaInertialDrivex1=Triton Vista Inertial Drive x1
-TIDriveTemplate.description.TritonVistaInertialDrivex1=Refined inertial confinement techniques offer much higher thrust in a new generation of fusion drives.
-TIDriveTemplate.displayName.TritonVistaInertialDrivex2=Triton Vista Inertial Drive x2
-TIDriveTemplate.displayName.TritonVistaInertialDrivex3=Triton Vista Inertial Drive x3
-TIDriveTemplate.displayName.TritonVistaInertialDrivex4=Triton Vista Inertial Drive x4
-TIDriveTemplate.displayName.TritonVistaInertialDrivex5=Triton Vista Inertial Drive x5
-TIDriveTemplate.displayName.TritonVistaInertialDrivex6=Triton Vista Inertial Drive x6
-TIDriveTemplate.displayName.HelionInertialDrivex1=Helion Inertial Drive x1
-TIDriveTemplate.description.HelionInertialDrivex1=A cleaner and more efficient fusion reaction can power medium-range spacecraft.
-TIDriveTemplate.displayName.HelionInertialDrivex2=Helion Inertial Drive x2
-TIDriveTemplate.displayName.HelionInertialDrivex3=Helion Inertial Drive x3
-TIDriveTemplate.displayName.HelionInertialDrivex4=Helion Inertial Drive x4
-TIDriveTemplate.displayName.HelionInertialDrivex5=Helion Inertial Drive x5
-TIDriveTemplate.displayName.HelionInertialDrivex6=Helion Inertial Drive x6
-TIDriveTemplate.displayName.DaedelusTorchx1=Daedalus Torch x1
-TIDriveTemplate.description.DaedelusTorchx1=An advanced Deuterium-Helium-3 terawatt-capable drive.
-TIDriveTemplate.displayName.DaedelusTorchx2=Daedalus Torch x2
-TIDriveTemplate.displayName.DaedelusTorchx3=Daedalus Torch x3
-TIDriveTemplate.displayName.DaedelusTorchx4=Daedalus Torch x4
-TIDriveTemplate.displayName.DaedelusTorchx5=Daedalus Torch x5
-TIDriveTemplate.displayName.DaedelusTorchx6=Daedalus Torch x6
-TIDriveTemplate.displayName.BoronInertialDrivex1=Boron Inertial Drive x1
-TIDriveTemplate.description.BoronInertialDrivex1=Clean proton-boron inertial confinement fusion powers modest thrust and efficiency in a fusion regime.
-TIDriveTemplate.displayName.BoronInertialDrivex2=Boron Inertial Drive x2
-TIDriveTemplate.displayName.BoronInertialDrivex3=Boron Inertial Drive x3
-TIDriveTemplate.displayName.BoronInertialDrivex4=Boron Inertial Drive x4
-TIDriveTemplate.displayName.BoronInertialDrivex5=Boron Inertial Drive x5
-TIDriveTemplate.displayName.BoronInertialDrivex6=Boron Inertial Drive x6
-TIDriveTemplate.displayName.BoronInertialTorchx1=Boron Inertial Torch x1
-TIDriveTemplate.description.BoronInertialTorchx1=A breakthrough in proton-boron fusion enables hugely efficient propulsion.
-TIDriveTemplate.displayName.BoronInertialTorchx2=Boron Inertial Torch x2
-TIDriveTemplate.displayName.BoronInertialTorchx3=Boron Inertial Torch x3
-TIDriveTemplate.displayName.BoronInertialTorchx4=Boron Inertial Torch x4
-TIDriveTemplate.displayName.BoronInertialTorchx5=Boron Inertial Torch x5
-TIDriveTemplate.displayName.BoronInertialTorchx6=Boron Inertial Torch x6
-TIDriveTemplate.displayName.ProtiumInertialTorchx1=Protium Inertial Torch x1
-TIDriveTemplate.description.ProtiumInertialTorchx1=Direct proton-proton fusion provides a powerful propulsion system.
-TIDriveTemplate.displayName.ProtiumInertialTorchx2=Protium Inertial Torch x2
-TIDriveTemplate.displayName.ProtiumInertialTorchx3=Protium Inertial Torch x3
-TIDriveTemplate.displayName.ProtiumInertialTorchx4=Protium Inertial Torch x4
-TIDriveTemplate.displayName.ProtiumInertialTorchx5=Protium Inertial Torch x5
-TIDriveTemplate.displayName.ProtiumInertialTorchx6=Protium Inertial Torch x6
+TIDriveTemplate.displayName.TritonTorusDrivex1=Triton Torus Drive x1
+TIDriveTemplate.description.TritonTorusDrivex1=Tokamak-derived fusion drive relying on tritium fusion to heat propellant.
+TIDriveTemplate.displayName.TritonTorusDrivex2=Triton Torus Drive x2
+TIDriveTemplate.displayName.TritonTorusDrivex3=Triton Torus Drive x3
+TIDriveTemplate.displayName.TritonTorusDrivex4=Triton Torus Drive x4
+TIDriveTemplate.displayName.TritonTorusDrivex5=Triton Torus Drive x5
+TIDriveTemplate.displayName.TritonTorusDrivex6=Triton Torus Drive x6
+TIDriveTemplate.displayName.DeuteronTorusDrivex1=Deuteron Torus Drive x1
+TIDriveTemplate.description.DeuteronTorusDrivex1=Augmented Deuterium-Deuterium fusion drive using magnetic plasma containment.
+TIDriveTemplate.displayName.DeuteronTorusDrivex2=Deuteron Torus Drive x2
+TIDriveTemplate.displayName.DeuteronTorusDrivex3=Deuteron Torus Drive x3
+TIDriveTemplate.displayName.DeuteronTorusDrivex4=Deuteron Torus Drive x4
+TIDriveTemplate.displayName.DeuteronTorusDrivex5=Deuteron Torus Drive x5
+TIDriveTemplate.displayName.DeuteronTorusDrivex6=Deuteron Torus Drive x6
+TIDriveTemplate.displayName.HelionTorusLanternx1=Helion Torus Lantern x1
+TIDriveTemplate.description.HelionTorusLanternx1=Deuterium and Helium-3 fused in a magnetic torus provide moderate thrust and efficiency.
+TIDriveTemplate.displayName.HelionTorusLanternx2=Helion Torus Lantern x2
+TIDriveTemplate.displayName.HelionTorusLanternx3=Helion Torus Lantern x3
+TIDriveTemplate.displayName.HelionTorusLanternx4=Helion Torus Lantern x4
+TIDriveTemplate.displayName.HelionTorusLanternx5=Helion Torus Lantern x5
+TIDriveTemplate.displayName.HelionTorusLanternx6=Helion Torus Lantern x6
+TIDriveTemplate.displayName.ProtiumTorusLanternx1=Protium Torus Fusion Lantern x1
+TIDriveTemplate.description.ProtiumTorusLanternx1=Incredible magnetic forces are used to fuse free protons in a reaction previously only possible in stellar cores.
+TIDriveTemplate.displayName.ProtiumTorusLanternx2=Protium Torus Fusion Lantern x2
+TIDriveTemplate.displayName.ProtiumTorusLanternx3=Protium Torus Fusion Lantern x3
+TIDriveTemplate.displayName.ProtiumTorusLanternx4=Protium Torus Fusion Lantern x4
+TIDriveTemplate.displayName.ProtiumTorusLanternx5=Protium Torus Fusion Lantern x5
+TIDriveTemplate.displayName.ProtiumTorusLanternx6=Protium Torus Fusion Lantern x6
+TIDriveTemplate.displayName.TritonPolywellDrivex1=Triton Polywell Drive x1
+TIDriveTemplate.description.TritonPolywellDrivex1=Combining multiple plasma confinement techniques allow for an efficient fusion drive with modest thrust.
+TIDriveTemplate.displayName.TritonPolywellDrivex2=Triton Polywell Drive x2
+TIDriveTemplate.displayName.TritonPolywellDrivex3=Triton Polywell Drive x3
+TIDriveTemplate.displayName.TritonPolywellDrivex4=Triton Polywell Drive x4
+TIDriveTemplate.displayName.TritonPolywellDrivex5=Triton Polywell Drive x5
+TIDriveTemplate.displayName.TritonPolywellDrivex6=Triton Polywell Drive x6
+TIDriveTemplate.displayName.DeuteronPolywellDrivex1=Deuteron Polywell Drive x1
+TIDriveTemplate.description.DeuteronPolywellDrivex1=A second-generation hybrid fusion drive shows amazing improvements to both thrust and efficiency.
+TIDriveTemplate.displayName.DeuteronPolywellDrivex2=Deuteron Polywell Drive x2
+TIDriveTemplate.displayName.DeuteronPolywellDrivex3=Deuteron Polywell Drive x3
+TIDriveTemplate.displayName.DeuteronPolywellDrivex4=Deuteron Polywell Drive x4
+TIDriveTemplate.displayName.DeuteronPolywellDrivex5=Deuteron Polywell Drive x5
+TIDriveTemplate.displayName.DeuteronPolywellDrivex6=Deuteron Polywell Drive x6
+TIDriveTemplate.displayName.HelionPlasmajetLanternx1=Helion Plasmajet Fusion Lantern x1
+TIDriveTemplate.description.HelionPlasmajetLanternx1=Incorporating rudimentary inertial confinement techniques into our hybrid drives allows for greater thrust and efficiency.
+TIDriveTemplate.displayName.HelionPlasmajetLanternx2=Helion Plasmajet Fusion Lantern x2
+TIDriveTemplate.displayName.HelionPlasmajetLanternx3=Helion Plasmajet Fusion Lantern x3
+TIDriveTemplate.displayName.HelionPlasmajetLanternx4=Helion Plasmajet Fusion Lantern x4
+TIDriveTemplate.displayName.HelionPlasmajetLanternx5=Helion Plasmajet Fusion Lantern x5
+TIDriveTemplate.displayName.HelionPlasmajetLanternx6=Helion Plasmajet Fusion Lantern x6
+TIDriveTemplate.displayName.BoranePlasmajetTorchx1=Borane Plasmajet Fusion Torch x1
+TIDriveTemplate.description.BoranePlasmajetTorchx1=A powerful hybrid confinement propulsion system relying on the fusion of boron-11 and protons.
+TIDriveTemplate.displayName.BoranePlasmajetTorchx2=Borane Plasmajet Fusion Torch x2
+TIDriveTemplate.displayName.BoranePlasmajetTorchx3=Borane Plasmajet Fusion Torch x3
+TIDriveTemplate.displayName.BoranePlasmajetTorchx4=Borane Plasmajet Fusion Torch x4
+TIDriveTemplate.displayName.BoranePlasmajetTorchx5=Borane Plasmajet Fusion Torch x5
+TIDriveTemplate.displayName.BoranePlasmajetTorchx6=Borane Plasmajet Fusion Torch x6
+TIDriveTemplate.displayName.ZetaTritonDrivex1=Zeta Triton Drive x1
+TIDriveTemplate.description.ZetaTritonDrivex1=We utilize Z-pinched fusion of tritium and deuterium to provide thrust.
+TIDriveTemplate.displayName.ZetaTritonDrivex2=Zeta Triton Drive x2
+TIDriveTemplate.displayName.ZetaTritonDrivex3=Zeta Triton Drive x3
+TIDriveTemplate.displayName.ZetaTritonDrivex4=Zeta Triton Drive x4
+TIDriveTemplate.displayName.ZetaTritonDrivex5=Zeta Triton Drive x5
+TIDriveTemplate.displayName.ZetaTritonDrivex6=Zeta Triton Drive x6
+TIDriveTemplate.displayName.ZetaDeuteronDrivex1=Zeta Deuteron Drive x1
+TIDriveTemplate.description.ZetaDeuteronDrivex1=Z-pinched Deuterium fusion powers this highly efficient drive.
+TIDriveTemplate.displayName.ZetaDeuteronDrivex2=Zeta Deuteron Drive x2
+TIDriveTemplate.displayName.ZetaDeuteronDrivex3=Zeta Deuteron Drive x3
+TIDriveTemplate.displayName.ZetaDeuteronDrivex4=Zeta Deuteron Drive x4
+TIDriveTemplate.displayName.ZetaDeuteronDrivex5=Zeta Deuteron Drive x5
+TIDriveTemplate.displayName.ZetaDeuteronDrivex6=Zeta Deuteron Drive x6
+TIDriveTemplate.displayName.ZetaDeuteronTorchx1=Zeta Deuteron Fusion Torch x1
+TIDriveTemplate.description.ZetaDeuteronTorchx1=Nicknamed the "Firefly," this drive uses Z-pinched deuterium fusion and high-speed plasma to provide incredible performance.
+TIDriveTemplate.displayName.ZetaDeuteronTorchx2=Zeta Deuteron Fusion Torch x2
+TIDriveTemplate.displayName.ZetaDeuteronTorchx3=Zeta Deuteron Fusion Torch x3
+TIDriveTemplate.displayName.ZetaDeuteronTorchx4=Zeta Deuteron Fusion Torch x4
+TIDriveTemplate.displayName.ZetaDeuteronTorchx5=Zeta Deuteron Fusion Torch x5
+TIDriveTemplate.displayName.ZetaDeuteronTorchx6=Zeta Deuteron Fusion Torch x6
+TIDriveTemplate.displayName.ZetaHelionLanternx1=Zeta Helion Fusion Lantern x1
+TIDriveTemplate.description.ZetaHelionLanternx1=Zeta-pinched Deuterium-Helium-3 fusion plasma is stabilized to provide efficient, long-range travel.
+TIDriveTemplate.displayName.ZetaHelionLanternx2=Zeta Helion Fusion Lantern x2
+TIDriveTemplate.displayName.ZetaHelionLanternx3=Zeta Helion Fusion Lantern x3
+TIDriveTemplate.displayName.ZetaHelionLanternx4=Zeta Helion Fusion Lantern x4
+TIDriveTemplate.displayName.ZetaHelionLanternx5=Zeta Helion Fusion Lantern x5
+TIDriveTemplate.displayName.ZetaHelionLanternx6=Zeta Helion Fusion Lantern x6
+TIDriveTemplate.displayName.ZetaBoraneLanternx1=Zeta Borane Fusion Lantern x1
+TIDriveTemplate.description.ZetaBoraneLanternx1=Boron-11 is fused with a stream of protons in a clean reaction to provide a powerful propulsion system.
+TIDriveTemplate.displayName.ZetaBoraneLanternx2=Zeta Borane Fusion Lantern x2
+TIDriveTemplate.displayName.ZetaBoraneLanternx3=Zeta Borane Fusion Lantern x3
+TIDriveTemplate.displayName.ZetaBoraneLanternx4=Zeta Borane Fusion Lantern x4
+TIDriveTemplate.displayName.ZetaBoraneLanternx5=Zeta Borane Fusion Lantern x5
+TIDriveTemplate.displayName.ZetaBoraneLanternx6=Zeta Borane Fusion Lantern x6
+TIDriveTemplate.displayName.TritonNovaDrivex1=Triton Nova Drive x1
+TIDriveTemplate.description.TritonNovaDrivex1=Laser pulses induce deuterium-tritum fusion, which heats hydrogen propellant in this first attempt at new type of fusion drive.
+TIDriveTemplate.displayName.TritonNovaDrivex2=Triton Nova Drive x2
+TIDriveTemplate.displayName.TritonNovaDrivex3=Triton Nova Drive x3
+TIDriveTemplate.displayName.TritonNovaDrivex4=Triton Nova Drive x4
+TIDriveTemplate.displayName.TritonNovaDrivex5=Triton Nova Drive x5
+TIDriveTemplate.displayName.TritonNovaDrivex6=Triton Nova Drive x6
+TIDriveTemplate.displayName.DeuteronNovaLanternx1=Deuteron Nova Fusion Lantern x1
+TIDriveTemplate.description.DeuteronNovaLanternx1=Refined inertial confinement techniques offer much higher thrust in a new generation of fusion drives.
+TIDriveTemplate.displayName.DeuteronNovaLanternx2=Deuteron Nova Fusion Lantern x2
+TIDriveTemplate.displayName.DeuteronNovaLanternx3=Deuteron Nova Fusion Lantern x3
+TIDriveTemplate.displayName.DeuteronNovaLanternx4=Deuteron Nova Fusion Lantern x4
+TIDriveTemplate.displayName.DeuteronNovaLanternx5=Deuteron Nova Fusion Lantern x5
+TIDriveTemplate.displayName.DeuteronNovaLanternx6=Deuteron Nova Fusion Lantern x6
+TIDriveTemplate.displayName.HelionNovaLanternx1=Helion Nova Lantern x1
+TIDriveTemplate.description.HelionNovaLanternx1=A cleaner and more efficient Deuterium and Helium-3 fusion reaction can power medium-range spacecraft.
+TIDriveTemplate.displayName.HelionNovaLanternx2=Helion Nova Lantern x2
+TIDriveTemplate.displayName.HelionNovaLanternx3=Helion Nova Lantern x3
+TIDriveTemplate.displayName.HelionNovaLanternx4=Helion Nova Lantern x4
+TIDriveTemplate.displayName.HelionNovaLanternx5=Helion Nova Lantern x5
+TIDriveTemplate.displayName.HelionNovaLanternx6=Helion Nova Lantern x6
+TIDriveTemplate.displayName.HelionNovaTorchx1=Helion Nova Fusion Torch x1
+TIDriveTemplate.description.HelionNovaTorchx1=Engineers nicknamed this advanced Deuterium-Helium-3 terawatt-capable drive "Daedalus."
+TIDriveTemplate.displayName.HelionNovaTorchx2=Helion Nova Fusion Torch x2
+TIDriveTemplate.displayName.HelionNovaTorchx3=Helion Nova Fusion Torch x3
+TIDriveTemplate.displayName.HelionNovaTorchx4=Helion Nova Fusion Torch x4
+TIDriveTemplate.displayName.HelionNovaTorchx5=Helion Nova Fusion Torch x5
+TIDriveTemplate.displayName.HelionNovaTorchx6=Helion Nova Fusion Torch x6
+TIDriveTemplate.displayName.BoraneNovaLanternx1=Borane Nova Lantern x1
+TIDriveTemplate.description.BoraneNovaLanternx1=Clean proton-boron inertial confinement fusion powers powerful and efficient propulsion.
+TIDriveTemplate.displayName.BoraneNovaLanternx2=Borane Nova Lantern x2
+TIDriveTemplate.displayName.BoraneNovaLanternx3=Borane Nova Lantern x3
+TIDriveTemplate.displayName.BoraneNovaLanternx4=Borane Nova Lantern x4
+TIDriveTemplate.displayName.BoraneNovaLanternx5=Borane Nova Lantern x5
+TIDriveTemplate.displayName.BoraneNovaLanternx6=Borane Nova Lantern x6
+TIDriveTemplate.displayName.ProtiumNovaTorchx1=Protium Nova Torch x1
+TIDriveTemplate.description.ProtiumNovaTorchx1=Direct proton-proton fusion provides a powerful propulsion system.
+TIDriveTemplate.displayName.ProtiumNovaTorchx2=Protium Nova Torch x2
+TIDriveTemplate.displayName.ProtiumNovaTorchx3=Protium Nova Torch x3
+TIDriveTemplate.displayName.ProtiumNovaTorchx4=Protium Nova Torch x4
+TIDriveTemplate.displayName.ProtiumNovaTorchx5=Protium Nova Torch x5
+TIDriveTemplate.displayName.ProtiumNovaTorchx6=Protium Nova Torch x6
 TIDriveTemplate.displayName.ProtiumConverterTorchx1=Protium Converter Torch x1
-TIDriveTemplate.description.ProtiumConverterTorchx1=Something not unlike a miniature sun powers a half-petawatt drive that could conceivably take us to other star systems.
+TIDriveTemplate.description.ProtiumConverterTorchx1=Something not unlike a miniature sun powers a sub-petawatt drive that could conceivably take us to other star systems.
 TIDriveTemplate.displayName.ProtiumConverterTorchx2=Protium Converter Torch x2
 TIDriveTemplate.displayName.ProtiumConverterTorchx3=Protium Converter Torch x3
 TIDriveTemplate.displayName.ProtiumConverterTorchx4=Protium Converter Torch x4
@@ -572,27 +601,27 @@ TIDriveTemplate.displayName.AntimatterGasCoreDrivex3=Antimatter Gas Core Drive x
 TIDriveTemplate.displayName.AntimatterGasCoreDrivex4=Antimatter Gas Core Drive x4
 TIDriveTemplate.displayName.AntimatterGasCoreDrivex5=Antimatter Gas Core Drive x5
 TIDriveTemplate.displayName.AntimatterGasCoreDrivex6=Antimatter Gas Core Drive x6
-TIDriveTemplate.displayName.AntimatterPulsedPlasmaCoreDrivex1=Antimatter Pulsed Plasma Core Drive x1
-TIDriveTemplate.description.AntimatterPulsedPlasmaCoreDrivex1=Heat from bottled matter-antimatter explosions is transferred to hydrogen propellant.
-TIDriveTemplate.displayName.AntimatterPulsedPlasmaCoreDrivex2=Antimatter Pulsed Plasma Core Drive x2
-TIDriveTemplate.displayName.AntimatterPulsedPlasmaCoreDrivex3=Antimatter Pulsed Plasma Core Drive x3
-TIDriveTemplate.displayName.AntimatterPulsedPlasmaCoreDrivex4=Antimatter Pulsed Plasma Core Drive x4
-TIDriveTemplate.displayName.AntimatterPulsedPlasmaCoreDrivex5=Antimatter Pulsed Plasma Core Drive x5
-TIDriveTemplate.displayName.AntimatterPulsedPlasmaCoreDrivex6=Antimatter Pulsed Plasma Core Drive x6
-TIDriveTemplate.displayName.AntimatterPlasmaCoreDrivex1=Antimatter Plasma Core Drive x1
-TIDriveTemplate.description.AntimatterPlasmaCoreDrivex1=Matter-antimatter plasma is used to heat hydrogen propellant.
-TIDriveTemplate.displayName.AntimatterPlasmaCoreDrivex2=Antimatter Plasma Core Drive x2
-TIDriveTemplate.displayName.AntimatterPlasmaCoreDrivex3=Antimatter Plasma Core Drive x3
-TIDriveTemplate.displayName.AntimatterPlasmaCoreDrivex4=Antimatter Plasma Core Drive x4
-TIDriveTemplate.displayName.AntimatterPlasmaCoreDrivex5=Antimatter Plasma Core Drive x5
-TIDriveTemplate.displayName.AntimatterPlasmaCoreDrivex6=Antimatter Plasma Core Drive x6
-TIDriveTemplate.displayName.AdvancedAntimatterPlasmaCoreDrivex1=Advanced Antimatter Plasma Core Drive x1
-TIDriveTemplate.description.AdvancedAntimatterPlasmaCoreDrivex1=Stronger magnetic containment fields allows for higher plasma densities and temperatures.
-TIDriveTemplate.displayName.AdvancedAntimatterPlasmaCoreDrivex2=Advanced Antimatter Plasma Core Drive x2
-TIDriveTemplate.displayName.AdvancedAntimatterPlasmaCoreDrivex3=Advanced Antimatter Plasma Core Drive x3
-TIDriveTemplate.displayName.AdvancedAntimatterPlasmaCoreDrivex4=Advanced Antimatter Plasma Core Drive x4
-TIDriveTemplate.displayName.AdvancedAntimatterPlasmaCoreDrivex5=Advanced Antimatter Plasma Core Drive x5
-TIDriveTemplate.displayName.AdvancedAntimatterPlasmaCoreDrivex6=Advanced Antimatter Plasma Core Drive x6
+TIDriveTemplate.displayName.AntimatterPulsedPlasmaCoreLanternx1=Antimatter Pulsed Plasma Core Lantern x1
+TIDriveTemplate.description.AntimatterPulsedPlasmaCoreLanternx1=Heat from bottled matter-antimatter explosions is transferred to hydrogen propellant.
+TIDriveTemplate.displayName.AntimatterPulsedPlasmaCoreLanternx2=Antimatter Pulsed Plasma Core Lantern x2
+TIDriveTemplate.displayName.AntimatterPulsedPlasmaCoreLanternx3=Antimatter Pulsed Plasma Core Lantern x3
+TIDriveTemplate.displayName.AntimatterPulsedPlasmaCoreLanternx4=Antimatter Pulsed Plasma Core Lantern x4
+TIDriveTemplate.displayName.AntimatterPulsedPlasmaCoreLanternx5=Antimatter Pulsed Plasma Core Lantern x5
+TIDriveTemplate.displayName.AntimatterPulsedPlasmaCoreLanternx6=Antimatter Pulsed Plasma Core Lantern x6
+TIDriveTemplate.displayName.AntimatterPlasmaCoreTorchx1=Antimatter Plasma Core Torch x1
+TIDriveTemplate.description.AntimatterPlasmaCoreTorchx1=Matter-antimatter plasma is used to heat hydrogen propellant.
+TIDriveTemplate.displayName.AntimatterPlasmaCoreTorchx2=Antimatter Plasma Core Torch x2
+TIDriveTemplate.displayName.AntimatterPlasmaCoreTorchx3=Antimatter Plasma Core Torch x3
+TIDriveTemplate.displayName.AntimatterPlasmaCoreTorchx4=Antimatter Plasma Core Torch x4
+TIDriveTemplate.displayName.AntimatterPlasmaCoreTorchx5=Antimatter Plasma Core Torch x5
+TIDriveTemplate.displayName.AntimatterPlasmaCoreTorchx6=Antimatter Plasma Core Torch x6
+TIDriveTemplate.displayName.AdvancedAntimatterPlasmaCoreTorchx1=Advanced Antimatter Plasma Core Torch x1
+TIDriveTemplate.description.AdvancedAntimatterPlasmaCoreTorchx1=Stronger magnetic containment fields allows for higher plasma densities and temperatures.
+TIDriveTemplate.displayName.AdvancedAntimatterPlasmaCoreTorchx2=Advanced Antimatter Plasma Core Torch x2
+TIDriveTemplate.displayName.AdvancedAntimatterPlasmaCoreTorchx3=Advanced Antimatter Plasma Core Torch x3
+TIDriveTemplate.displayName.AdvancedAntimatterPlasmaCoreTorchx4=Advanced Antimatter Plasma Core Torch x4
+TIDriveTemplate.displayName.AdvancedAntimatterPlasmaCoreTorchx5=Advanced Antimatter Plasma Core Torch x5
+TIDriveTemplate.displayName.AdvancedAntimatterPlasmaCoreTorchx6=Advanced Antimatter Plasma Core Torch x6
 TIDriveTemplate.displayName.PionTorchx1=Pion Torch x1
 TIDriveTemplate.description.PionTorchx1=Steady antiproton-hydrogen reactions generate charged pions that are guided by a magnetic field, generating tremendous thrust.
 TIDriveTemplate.displayName.PionTorchx2=Pion Torch x2
@@ -614,6 +643,13 @@ TIDriveTemplate.displayName.AlienFusionTorchx3=Alien Fusion Torch x3
 TIDriveTemplate.displayName.AlienFusionTorchx4=Alien Fusion Torch x4
 TIDriveTemplate.displayName.AlienFusionTorchx5=Alien Fusion Torch x5
 TIDriveTemplate.displayName.AlienFusionTorchx6=Alien Fusion Torch x6
+TIDriveTemplate.displayName.AdvancedAlienFusionTorchx1=Advanced Alien Fusion Torch x1
+TIDriveTemplate.description.AdvancedAlienFusionTorchx1=The alien thrusters seem to rely on some kind of powerful fusion reaction.
+TIDriveTemplate.displayName.AdvancedAlienFusionTorchx2=Advanced Alien Fusion Torch x2
+TIDriveTemplate.displayName.AdvancedAlienFusionTorchx3=Advanced Alien Fusion Torch x3
+TIDriveTemplate.displayName.AdvancedAlienFusionTorchx4=Advanced Alien Fusion Torch x4
+TIDriveTemplate.displayName.AdvancedAlienFusionTorchx5=Advanced Alien Fusion Torch x5
+TIDriveTemplate.displayName.AdvancedAlienFusionTorchx6=Advanced Alien Fusion Torch x6
 TIDriveTemplate.ReactionProducts=Reaction Products
 TIDriveTemplate.Anything=Anything
 TIDriveTemplate.Hydrogen=Hydrogen
@@ -627,4 +663,5 @@ TIDriveTemplate.Efficiency=Power Use Efficiency:<rcol>{0}</rcol>
 TIDriveTemplate.RequiredPowerPlant=Required Power Plant:<rcol>{0}</rcol>
 TIDriveTemplate.CombatThrust=Combat Thrust:<rcol>{0}x ({1} Newtons)</rcol>
 TIDriveTemplate.OpenCycle=This drive uses <h>open-cycle cooling</h>, meaning its heat is expelled through the propellant. A ship with this drive will require minimal radiators to operate safely. High-thrust, low-exhaust velocity drives tend to be open-cycle.
-TIDriveTemplate.ClosedCycle=This drive uses <h>closed-cycle cooling</h>, meaning it requires heavy radiators to expel waste heat. Drives with high exhaust velocity tend to require this to function.
\ No newline at end of file
+TIDriveTemplate.ClosedCycle=This drive uses <h>closed-cycle cooling</h>, meaning it requires heavy radiators to expel waste heat. Drives with high exhaust velocity tend to require this to function.
+TIDriveTemplate.ISRU=This drive can be reloaded with propellant from unimproved hab sites with no special equipment.
\ No newline at end of file
diff --git a/app/game/localization/TIEffectTemplate.en b/app/game/localization/TIEffectTemplate.en
index 7ef92fe..85434c6 100644
--- a/app/game/localization/TIEffectTemplate.en
+++ b/app/game/localization/TIEffectTemplate.en
@@ -6,7 +6,8 @@ TIEffectTemplate.description.Effect_DetectAllOperations=-Allows detection of all
 TIEffectTemplate.description.Effect_DetectAlienMovements=-Allows direct detection of alien operatives
 TIEffectTemplate.description.Effect_Skywatch=-Allows all factions to track alien vessels and structures that are inside the orbit of Saturn
 TIEffectTemplate.description.Effect_DeepSkywatch=-Allows faction to track alien vessels and structures anywhere in the Solar System
-TIEffectTemplate.description.Effect_ExploreInnerPlanets=-Allows sending probes to Mercury and the construction of habitats there and around Venus
+TIEffectTemplate.description.Effect_ExploreVenus=-Allows the construction of stations above Venus
+TIEffectTemplate.description.Effect_ExploreInnerPlanets=-Allows sending probes to Mercury and the construction of habitats there
 TIEffectTemplate.description.Effect_ExploreLuna=-Allows sending probes to Earth's moon and construction of habitats on the Lunar surface
 TIEffectTemplate.description.Effect_ExploreMars=-Allows sending probes to Mars and inner-system asteroids and the construction of habitats at those locations
 TIEffectTemplate.description.Effect_ExploreEarthLagrangePoints=-Allows exploration and construction at the Sun-Earth Lagrange Points and asteroids in the Earth orbital region
@@ -15,6 +16,7 @@ TIEffectTemplate.description.Effect_ExploreJupiter=-Allows sending probes to Jup
 TIEffectTemplate.description.Effect_ExploreSaturn=-Allows sending probes to Saturn and construction of habitats on and around its moons
 TIEffectTemplate.description.Effect_ExploreOuterPlanets=-Allows sending probes to Uranus and Neptune, and construction of habitats in the far Solar System
 TIEffectTemplate.description.Effect_ExploreKuiperBelt=-Allows sending probes to the Kuiper Belt, and construction of habitats there
+TIEffectTemplate.description.Effect_TechProbeSpeed=-Factions that contributed more to this tech will complete scans of the space body faster
 TIEffectTemplate.description.Effect_CanFoundTier1Station=-Allows faction to found platforms
 TIEffectTemplate.description.Effect_CanFoundTier2Station=-Allows faction to found orbitals
 TIEffectTemplate.description.Effect_CanFoundTier3Station=-Allows faction to found rings
@@ -101,21 +103,21 @@ TIEffectTemplate.description.Effect_FreePriorityWelfare50=-{9} will invest much
 TIEffectTemplate.displayName.Effect_FreePriorityWelfare200=Welfare investment
 TIEffectTemplate.description.Effect_FreePriorityWelfare200=-{9} will invest vastly more into social and environmental programs
 TIEffectTemplate.displayName.Effect_FreePriorityKnowledge10=Knowledge investment
-TIEffectTemplate.description.Effect_FreePriorityKnowledge10=-{9} will invest more into training and education programs
+TIEffectTemplate.description.Effect_FreePriorityKnowledge10=-{9} will invest slightly more into training and education programs
 TIEffectTemplate.displayName.Effect_FreePriorityKnowledge20=Knowledge investment
-TIEffectTemplate.description.Effect_FreePriorityKnowledge20=-{9} will invest more into training and education programs
+TIEffectTemplate.description.Effect_FreePriorityKnowledge20=-{9} will invest a considerable amount into training and education programs
 TIEffectTemplate.displayName.Effect_FreePriorityMilitary10=Military investment
-TIEffectTemplate.description.Effect_FreePriorityMilitary10=-{9} will invest more into military training and procurement
+TIEffectTemplate.description.Effect_FreePriorityMilitary10=-{9} will invest slightly more into military training and procurement
 TIEffectTemplate.displayName.Effect_FreePriorityMilitary20=Military investment
-TIEffectTemplate.description.Effect_FreePriorityMilitary20=-{9} will invest more into military training and procurement
+TIEffectTemplate.description.Effect_FreePriorityMilitary20=-{9} will invest a considerable amount into military training and procurement
 TIEffectTemplate.displayName.Effect_SecondaryFreePriorityMilitary20=Military investment
-TIEffectTemplate.description.Effect_SecondaryFreePriorityMilitary20=-{11} will invest more into military training and procurement											
+TIEffectTemplate.description.Effect_SecondaryFreePriorityMilitary20=-{11} will invest a considerable amount into military training and procurement								
 TIEffectTemplate.displayName.Effect_FreePriorityMilitary200=Military investment
-TIEffectTemplate.description.Effect_FreePriorityMilitary200=-{9} will invest more into military training and procurement
+TIEffectTemplate.description.Effect_FreePriorityMilitary200=-{9} will invest vastly more into military training and procurement
 TIEffectTemplate.displayName.Effect_FreePriorityBoost1=Boost investment
 TIEffectTemplate.description.Effect_FreePriorityBoost1=-{9} will invest more into space launch and spaceflight
 TIEffectTemplate.displayName.Effect_FreePriorityBoost2=Boost investment
-TIEffectTemplate.description.Effect_FreePriorityBoost2=-{9} will invest more into space launch and spaceflight
+TIEffectTemplate.description.Effect_FreePriorityBoost2=-{9} will invest considerably into space launch and spaceflight
 TIEffectTemplate.displayName.Effect_FreePriorityFunding1=Funding investment
 TIEffectTemplate.description.Effect_FreePriorityFunding1=-{9} will set aside part of its budget as discretionary funds
 TIEffectTemplate.displayName.Effect_XenoformingReduction=Xenoforms die off
@@ -134,7 +136,7 @@ TIEffectTemplate.displayName.Effect_MinorExposure=Minor Exposure
 TIEffectTemplate.description.Effect_MinorExposure=-Information about {14} will be exposed to our enemies									
 TIEffectTemplate.displayName.Effect_MajorExposure=Major Exposure
 TIEffectTemplate.description.Effect_MajorExposure=-A great deal of information about {14} will be exposed to our enemies
-TIEffectTemplate.displayName.Effect_MajorExposure=Councilor Exposure
+TIEffectTemplate.displayName.Effect_CouncilorExposure=Councilor Exposure
 TIEffectTemplate.description.Effect_CouncilorExposure=-A great deal of information about {1} will be exposed to our enemies
 TIEffectTemplate.description.Effect_SmallDemocracyGain=-{9}'s democracy score changes by {0}																				// 9: 1st nation displayName, 0: value
 TIEffectTemplate.displayName.Effect_SmallDemocracyLoss=Small Democracy Loss
@@ -181,19 +183,19 @@ TIEffectTemplate.description.Effect_MiltechGain03=-{9} gains {0} to its military
 TIEffectTemplate.displayName.Effect_MassiveCohesionLoss=Massive Cohesion Loss
 TIEffectTemplate.description.Effect_MassiveCohesionLoss=-Cohesion {5} changes by {0}																						// 5: 1st nation displayName with location preposition - "in France"
 TIEffectTemplate.displayName.Effect_MajorCohesionGain=Large Cohesion Increase
-TIEffectTemplate.description.Effect_MajorCohesionGain=-Cohesion {5} increases by {0}
+TIEffectTemplate.description.Effect_MajorCohesionGain=-Cohesion {5} increases by {23}
 TIEffectTemplate.displayName.Effect_MajorCohesionLoss=Large Cohesion Decrease
-TIEffectTemplate.description.Effect_MajorCohesionLoss=-Cohesion {5} changes by {0}
+TIEffectTemplate.description.Effect_MajorCohesionLoss=-Cohesion {5} changes by {23}
 TIEffectTemplate.displayName.Effect_MinorCohesionLoss=Cohesion Decreases
-TIEffectTemplate.description.Effect_MinorCohesionLoss=-Cohesion {5} changes by {0}
+TIEffectTemplate.description.Effect_MinorCohesionLoss=-Cohesion {5} changes by {23}
 TIEffectTemplate.displayName.Effect_MinorCohesionGain=Nation gains cohesion
-TIEffectTemplate.description.Effect_MinorCohesionGain=-{9} gains {0} cohesion
+TIEffectTemplate.description.Effect_MinorCohesionGain=-{9} gains {23} cohesion
 TIEffectTemplate.displayName.Effect_SecondaryCohesionGain=Nation gains cohesion
-TIEffectTemplate.description.Effect_SecondaryCohesionGain=-{11} gains {0} cohesion
+TIEffectTemplate.description.Effect_SecondaryCohesionGain=-{11} gains {24} cohesion
 TIEffectTemplate.displayName.Effect_SecondaryCohesionLoss=Cohesion Decreases
-TIEffectTemplate.description.Effect_SecondaryCohesionLoss=-Cohesion {6} changes by {0}
-TIEffectTemplate.description.Effect_MajorCohesionOutward=-Cohesion {5} changes by {0} toward extreme values
-TIEffectTemplate.description.Effect_MinorCohesionOutward=-Cohesion {5} changes by {0} toward extreme values
+TIEffectTemplate.description.Effect_SecondaryCohesionLoss=-Cohesion {6} changes by {24}
+TIEffectTemplate.description.Effect_MajorCohesionOutward=-Cohesion {5} changes by {23} toward extreme values
+TIEffectTemplate.description.Effect_MinorCohesionOutward=-Cohesion {5} changes by {23} toward extreme values
 TIEffectTemplate.description.Effect_MajorGlobalCohesionOutward=-All nations' cohesion moves by {0} toward extreme values
 TIEffectTemplate.description.Effect_MinorGlobalCohesionOutward=-All nations' cohesion moves by {0} toward extreme values
 TIEffectTemplate.displayName.Effect_GlobalCohesionGain=All nations gain cohesion
@@ -237,15 +239,15 @@ TIEffectTemplate.description.Effect_SecondaryMinorUnrestGain_ByFaction=-Unrest {
 TIEffectTemplate.displayName.Effect_SecondaryMinorUnrestLoss_ByFaction=Unrest drops
 TIEffectTemplate.description.Effect_SecondaryMinorUnrestLoss_ByFaction=-Unrest {6} changes by {0}
 TIEffectTemplate.displayName.Effect_MajorInequalityGain=Inequality spikes
-TIEffectTemplate.description.Effect_MajorInequalityGain=-Inequality {5} increases by {0}
+TIEffectTemplate.description.Effect_MajorInequalityGain=-Inequality {5} increases by {23}
 TIEffectTemplate.displayName.Effect_ModerateInequalityGain=Inequality increases
-TIEffectTemplate.description.Effect_ModerateInequalityGain=-Inequality {5} increases by {0}
+TIEffectTemplate.description.Effect_ModerateInequalityGain=-Inequality {5} increases by {23}
 TIEffectTemplate.displayName.Effect_MinorInequalityGain=-Inequality inches up
-TIEffectTemplate.description.Effect_MinorInequalityGain=-Inequality {5} increases by {0}
+TIEffectTemplate.description.Effect_MinorInequalityGain=-Inequality {5} increases by {23}
 TIEffectTemplate.displayName.Effect_MinorInequalityLoss=-Inequality inches down
-TIEffectTemplate.description.Effect_MinorInequalityLoss=-Inequality {5} decreases by {0}
+TIEffectTemplate.description.Effect_MinorInequalityLoss=-Inequality {5} decreases by {23}
 TIEffectTemplate.displayName.Effect_EducationLoss=Brain drain
-TIEffectTemplate.description.Effect_EducationLoss=-Education {5} changes by {0}
+TIEffectTemplate.description.Effect_EducationLoss=-Education {5} changes by {23}
 TIEffectTemplate.displayName.Effect_EducationGain01=Brain gain
 TIEffectTemplate.description.Effect_EducationGain01=-Education {5} changes by {0}
 TIEffectTemplate.displayName.Effect_GDPGain01=Nation's GDP rises
@@ -287,7 +289,7 @@ TIEffectTemplate.description.Effect_LooseNukeAdd1=-The number of loose nukes in
 TIEffectTemplate.description.Effect_LooseNukeAdd3=-The number of loose nukes in the world changes by {0}
 TIEffectTemplate.description.Effect_LooseNukeRemove1=-The number of loose nukes in the world changes by {0}
 TIEffectTemplate.description.Effect_ShipNukeAdd1=-{0} warhead will be added to a nuclear torpedo launcher on board {1}													// 1: 1st target displayName
-TIEffectTemplate.description.Effect_ShipNukeRemove1=-The number of nuclear torpedos on board {1} changes by {0}
+TIEffectTemplate.description.Effect_ShipNukeRemove1=-The number of nuclear torpedoes on board {1} changes by {0}
 TIEffectTemplate.displayName.Effect_UpgradeRelations=Relations improve
 TIEffectTemplate.description.Effect_UpgradeRelations=-Relations between {9} and {11} improve
 TIEffectTemplate.displayName.Effect_DowngradeRelations=Relations worsen
@@ -592,9 +594,9 @@ TIEffectTemplate.description.Effect_CounterXenoforming=-Alien attempts to plant
 TIEffectTemplate.description.Effect_FocusedDefenses=-Our ships take {4} less damage from alien weapons
 TIEffectTemplate.description.Effect_SurvivabilityUpgrades=-Our ships take {4} less damage from enemy weapons in combat
 TIEffectTemplate.displayName.Effect_SeizeSpaceAssetAttack_Griffin=Griffin research
-TIEffectTemplate.description.Effect_SeizeSpaceAssetAttack_Griffin=-Gain +{0} to Seize Space Asset missions
+TIEffectTemplate.description.Effect_SeizeSpaceAssetAttack_Griffin=-Gain +{0} to Assault Enemy Space Asset missions
 TIEffectTemplate.displayName.Effect_SeizeSpaceAssetDefense_Griffin=Griffin research
-TIEffectTemplate.description.Effect_SeizeSpaceAssetDefense_Griffin=-Enemies suffer -{0} to Seize Space Asset missions against us
+TIEffectTemplate.description.Effect_SeizeSpaceAssetDefense_Griffin=-Enemies suffer -{0} to Assault Enemy Space Asset missions against us
 TIEffectTemplate.description.Effect_DamageArmy10=-{1} suffers {3} damage to its current strength
 TIEffectTemplate.description.Effect_DamageArmy15=-{1} suffers {3} damage to its current strength
 TIEffectTemplate.description.Effect_DamageArmy20=-{1} suffers {3} damage to its current strength
@@ -668,21 +670,26 @@ TIEffectTemplate.description.Effect_GainTraitEnemyOfTheState=-{1} gains the {13}
 TIEffectTemplate.description.Effect_GainTraitExtorted=-{1} gains the {13} trait
 TIEffectTemplate.description.Effect_RegionGDPGainSpain=-{13} gains a one-time {3} increase in GDP
 TIEffectTemplate.description.Effect_RegionGDPGainRabat=-{13} gains a one-time {3} increase in GDP
-TIEffectTemplate.description.Effect_RegionGDPGainYemen=-{13} gains a one-time {3} increase in GDP
-TIEffectTemplate.description.Effect_RegionGDPGainMekelle=-{13} gains a one-time {3} increase in GDP
+TIEffectTemplate.description.Effect_RegionGDPGainAden=-{13} gains a one-time {3} increase in GDP
+TIEffectTemplate.description.Effect_RegionGDPGainDjibouti=-{13} gains a one-time {3} increase in GDP
 TIEffectTemplate.description.Effect_RegionGDPGainJava=-{13} gains a one-time {3} increase in GDP
 TIEffectTemplate.description.Effect_RegionGDPGainSumatra=-{13} gains a one-time {3} increase in GDP
 TIEffectTemplate.description.Effect_RegionGDPGainHijaz=-{13} gains a one-time {3} increase in GDP
+TIEffectTemplate.description.Effect_RegionGDPGainCairo=-{13} gains a one-time {3} increase in GDP
 TIEffectTemplate.description.Effect_RegionGDPGainEgypt=-{13} gains a one-time {3} increase in GDP
 TIEffectTemplate.description.Effect_RegionGDPGainAfghanistan=-{13} gains a one-time {3} increase in GDP
 TIEffectTemplate.description.Effect_RegionGDPGainXinjiang=-{13} gains a one-time {3} increase in GDP
 TIEffectTemplate.description.Effect_RegionGDPGainPanama=-{13} gains a one-time {3} increase in GDP
 TIEffectTemplate.description.Effect_RegionGDPGainColombia=-{13} gains a one-time {3} increase in GDP
 TIEffectTemplate.description.Effect_RegionGDPGainTibet=-{13} gains a one-time {3} increase in GDP
-TIEffectTemplate.description.Effect_RegionGDPGainMyanmar=-{13} gains a one-time {3} increase in GDP
+TIEffectTemplate.description.Effect_RegionGDPGainUpperMyanmar=-{13} gains a one-time {3} increase in GDP
 TIEffectTemplate.description.Effect_RegionGDPGainAlaska=-{13} gains a one-time {3} increase in GDP
-TIEffectTemplate.description.Effect_RegionGDPGainRussianFarEast=-{13} gains a one-time {3} increase in GDP
+TIEffectTemplate.description.Effect_RegionGDPGainKamchatka=-{13} gains a one-time {3} increase in GDP
 TIEffectTemplate.description.Effect_RegionGDPGainMalayPeninsula=-{13} gains a one-time {3} increase in GDP
+TIEffectTemplate.description.Effect_RegionGDPGainSriLanka=-{13} gains a one-time {3} increase in GDP
+TIEffectTemplate.description.Effect_RegionGDPGainChennai=-{13} gains a one-time {3} increase in GDP
+TIEffectTemplate.description.Effect_RegionGDPGainScotland=-{13} gains a one-time {3} increase in GDP
+TIEffectTemplate.description.Effect_RegionGDPGainNorthernIreland=-{13} gains a one-time {3} increase in GDP
 TIEffectTemplate.description.Effect_MCUsageMasking=-We estimate we can increase our fleet and hab construction by {18} (as measured by our Mission Control usage) without inviting alien retaliation
 TIEffectTemplate.description.Effect_FreeXenoInvestigations10=-We will gain the equivalent of {0} alien investigations
 TIEffectTemplate.description.Effect_TriggerEventHabRevolt=-Triggers a {13} event for {15}
@@ -736,4 +743,13 @@ TIEffectTemplate.description.Effect_EndInfiltratedChain=-The leak seems to be re
 TIEffectTemplate.description.Effect_GainTraitMarked=-{1} gains the {13} trait
 TIEffectTemplate.description.Effect_GainTraitAce=-{1} gains the {13} trait
 TIEffectTemplate.description.Effect_RemoveLiedAboutInfluence=-Our lies no longer hang over us
-TIEffectTemplate.description.Effect_IncreaseMonthlyProjectTriggerChance01=-All unlocked projects gain +{3} chance to become available to research every month
\ No newline at end of file
+TIEffectTemplate.description.Effect_IncreaseMonthlyProjectTriggerChance01=-All unlocked projects gain +{3} chance to become available to research every month
+TIEffectTemplate.description.Effect_TargetingComputer1=-Our hab modules and surface defenses gain a {3} bonus to overcoming ship ECM.
+TIEffectTemplate.description.Effect_TargetingComputer2=-Our hab modules and surface defenses gain a {3} bonus to overcoming ship ECM.
+TIEffectTemplate.description.Effect_TargetingComputer3=-Our hab modules and surface defenses gain a {3} bonus to overcoming ship ECM.
+TIEffectTemplate.description.Effect_EnvironmentBestSustainabilityValue05=The best sustainability value achievable by nations has improved.
+TIEffectTemplate.description.Effect_EnvironmentBestSustainabilityValue10=The best sustainability value achievable by nations has improved significantly.
+TIEffectTemplate.description.Effect_SpaceMineFreebies1=-The number of habitat mining modules we can support without paying a Mission Control cost increases by {0}.
+TIEffectTemplate.description.Effect_SpaceMineFreebies3=-The number of habitat mining modules we can support without paying a Mission Control cost increases by {0}.
+TIEffectTemplate.description.Effect_SpaceMineFreebies4=-The number of habitat mining modules we can support without paying a Mission Control cost increases by {0}.
+TIEffectTemplate.description.Effect_SpaceMineFreebies6=-The number of habitat mining modules we can support without paying a Mission Control cost increases by {0}.
\ No newline at end of file
diff --git a/app/game/localization/TIGunTemplate.en b/app/game/localization/TIGunTemplate.en
index 009b7e4..cc6f9cd 100644
--- a/app/game/localization/TIGunTemplate.en
+++ b/app/game/localization/TIGunTemplate.en
@@ -1,5 +1,7 @@
 TIGunTemplate.displayName.30mmAutocannon=30mm Autocannon
 TIGunTemplate.description.30mmAutocannon=Rapid-fire autocannon useful in a defensive role.
+TIGunTemplate.displayName.40mmAutocannon=40mm Autocannon
+TIGunTemplate.description.40mmAutocannon=Advanced autocannon optimized for space warfare and capable of operating in both offensive and defensive roles.
 TIGunTemplate.displayName.6-inchCannon=6-inch Cannon
 TIGunTemplate.description.6-inchCannon=A small, short-range naval gun turret adapated for usage on our spacecraft.
 TIGunTemplate.displayName.8-inchCannon=8-inch Cannon
diff --git a/app/game/localization/TIHabModuleTemplate.en b/app/game/localization/TIHabModuleTemplate.en
index d9faa6b..11625a7 100644
--- a/app/game/localization/TIHabModuleTemplate.en
+++ b/app/game/localization/TIHabModuleTemplate.en
@@ -1,3 +1,5 @@
+TIHabModuleTemplate.displayName.AdministrationNode=Administration Node
+TIHabModuleTemplate.description.AdministrationNode=An office suite that increases this hab's economic output and our faction's overall efficiency.
 TIHabModuleTemplate.displayName.AntimatterTrap=Antimatter Trap
 TIHabModuleTemplate.description.AntimatterTrap=A magnetic collector of naturally occurring antimatter in the magnetic fields around large planets.
 TIHabModuleTemplate.displayName.AutomatedFissionPile=Automated Fission Pile
@@ -22,6 +24,8 @@ TIHabModuleTemplate.displayName.FissionPile=Fission Pile
 TIHabModuleTemplate.description.FissionPile=A small fission reactor that provides steady electricity to our hab.
 TIHabModuleTemplate.displayName.FusionPile=Fusion Pile
 TIHabModuleTemplate.description.FusionPile=A basic fusion reactor that provides clean, safe power to our hab.
+TIHabModuleTemplate.displayName.HeavyFusionPile=Heavy Fusion Pile
+TIHabModuleTemplate.description.HeavyFusionPile=An advanced fusion reactor that provides a significant amount of power for our hab.
 TIHabModuleTemplate.displayName.HeavyFissionPile=Heavy Fission Pile
 TIHabModuleTemplate.description.HeavyFissionPile=An advanced, compact fission reactor that provides power to our habs.
 TIHabModuleTemplate.displayName.HydroponicsBay=Hydroponics Bay
@@ -40,6 +44,8 @@ TIHabModuleTemplate.displayName.OutpostCore=Outpost Core
 TIHabModuleTemplate.description.OutpostCore=A basic control center for a small planetary base.
 TIHabModuleTemplate.displayName.OutpostMiningComplex=Outpost Mining Complex
 TIHabModuleTemplate.description.OutpostMiningComplex=A small but critical facility that mines and refines ore, and uses an electromagnetic catapult to deliver the product to our other habs.
+TIHabModuleTemplate.displayName.ParticleCollider=Particle Collider
+TIHabModuleTemplate.description.ParticleCollider=A small particle accelerator that can be used for research and the creation of small amounts of antimatter.
 TIHabModuleTemplate.displayName.PlatformCore=Platform Core
 TIHabModuleTemplate.description.PlatformCore=The control center for a small space station.
 TIHabModuleTemplate.displayName.PointDefenseArray=Point Defense Array
@@ -67,7 +73,7 @@ TIHabModuleTemplate.description.AdministrationTower=Offices dedicated to increas
 TIHabModuleTemplate.displayName.AntimatterHarvester=Antimatter Harvester
 TIHabModuleTemplate.description.AntimatterHarvester=A platform and control center for deploying magnetic loops able to mine antimatter from a planet's magnetic field.
 TIHabModuleTemplate.displayName.Atomsmasher=Atomsmasher
-TIHabModuleTemplate.description.Atomsmasher=A particle collider used for research and the production of small amounts of antimatter.
+TIHabModuleTemplate.description.Atomsmasher=A particle collider used for research and the production of limited amounts of antimatter.
 TIHabModuleTemplate.displayName.CommunicationsHub=Communications Hub
 TIHabModuleTemplate.description.CommunicationsHub=A large broadcast node that tells our story to the world.
 TIHabModuleTemplate.displayName.DeepSpaceTelescope=Deep Space Telescope
@@ -82,6 +88,8 @@ TIHabModuleTemplate.displayName.FusionReactorArray=Fusion Reactor Array
 TIHabModuleTemplate.description.FusionReactorArray=A large fusion reactor that provides a great deal of energy to our habitat.
 TIHabModuleTemplate.displayName.HeavyFissionReactorArray=Heavy Fission Reactor Array
 TIHabModuleTemplate.description.HeavyFissionReactorArray=An advanced fission reactor that provides power for our habs.
+TIHabModuleTemplate.displayName.HeavyFusionReactorArray=Heavy Fusion Reactor Array
+TIHabModuleTemplate.description.HeavyFusionReactorArray=Advanced fusion reactors that provide vast power for our habs.
 TIHabModuleTemplate.displayName.InformationScienceResearchCenter=Information Science Research Center
 TIHabModuleTemplate.description.InformationScienceResearchCenter=A large low-gravity clean room for developing new computer technologies.
 TIHabModuleTemplate.displayName.LayeredDefenseArray=Layered Defense Array
@@ -100,8 +108,8 @@ TIHabModuleTemplate.displayName.OperationsCenter=Operations Center
 TIHabModuleTemplate.description.OperationsCenter=A facility staffed around-the-clock to manage our space assets on this hab and elsewhere.
 TIHabModuleTemplate.displayName.OrbitalCore=Orbital Core
 TIHabModuleTemplate.description.OrbitalCore=Upgrades the Platform to an Orbital, adding two new sectors with four modules each and allowing the construction of Tier 2 modules.
-TIHabModuleTemplate.displayName.OrbitalHospital=Space Hospital
-TIHabModuleTemplate.description.OrbitalHospital=A large medical facility for conducting research and helping paying customers recover from illness and injuries in low or no gravity.
+TIHabModuleTemplate.displayName.OrbitalHospital=Medical Center
+TIHabModuleTemplate.description.OrbitalHospital=A medical facility for conducting research and helping paying customers recover from illness and injuries in low or no gravity.
 TIHabModuleTemplate.displayName.ResearchCampus=Research Campus
 TIHabModuleTemplate.description.ResearchCampus=A general research center run in cooperation with secondary educational institutions on Earth.
 TIHabModuleTemplate.displayName.ResidentialModule=Residential Module
@@ -148,12 +156,14 @@ TIHabModuleTemplate.displayName.Foundry=Foundry
 TIHabModuleTemplate.description.Foundry=A dedicated site for rapid prototyping and development of new technologies.
 TIHabModuleTemplate.displayName.FusionReactorFarm=Fusion Reactor Farm
 TIHabModuleTemplate.description.FusionReactorFarm=A series of high-energy, efficient fusion reactors producing clean energy for our hab.
-TIHabModuleTemplate.displayName.GeriatricsFacility=Geriatrics Facility
-TIHabModuleTemplate.description.GeriatricsFacility=A facility dedicated to extending quality life for high-paying elderly people free from the ravages of Earth's gravity.
-TIHabModuleTemplate.displayName.HeavyFusionReactorFarm=Heavy Fusion Reactor Farm
-TIHabModuleTemplate.description.HeavyFusionReactorFarm=A bank of next-generation, high-power fusion reactors to support our largest habitats.
+TIHabModuleTemplate.displayName.GeriatricsFacility=Space Hospital
+TIHabModuleTemplate.description.GeriatricsFacility=A large medical facility dedicated to specialized treatments only possible in low-gravity environments, with acute and long-term care wings for paying patients.
 TIHabModuleTemplate.displayName.HeavyFissionReactorFarm=Heavy Fission Reactor Farm
 TIHabModuleTemplate.description.HeavyFissionReactorFarm=A sizable cluster of advanced fission reactors to power our habitats. 
+TIHabModuleTemplate.displayName.HeavyFusionReactorFarm=Heavy Fusion Reactor Farm
+TIHabModuleTemplate.description.HeavyFusionReactorFarm=A bank of next-generation, high-power fusion reactors to support our largest habitats.
+TIHabModuleTemplate.displayName.Helium-3Mine=Helium-3 Mine
+TIHabModuleTemplate.description.Helium-3Mine=Harvester drones gather Helium-3 fusion fuel from a gas giant for transport to our assets around the Solar Systems.
 TIHabModuleTemplate.displayName.InformationScienceInstitute=Information Science Institute
 TIHabModuleTemplate.description.InformationScienceInstitute=A high-powered laboratory complex devoted to advances in computer science, data science, and intelligence gathering.
 TIHabModuleTemplate.displayName.InterstellarLaunchingLaser=Interstellar Launch Facility
@@ -240,6 +250,12 @@ TIHabModuleTemplate.displayName.AlienGarrison=Alien Garrison
 TIHabModuleTemplate.description.AlienGarrison=A large military module.
 TIHabModuleTemplate.displayName.AlienCitadel=Alien Citadel
 TIHabModuleTemplate.description.AlienCitadel=A huge military module.
+TIHabModuleTemplate.displayName.AlienObservationPost=Alien Observation Post
+TIHabModuleTemplate.description.AlienObservationPost=An alien surveillance module.
+TIHabModuleTemplate.displayName.AlienSurveillanceArray=Alien Surveillance Array
+TIHabModuleTemplate.description.AlienSurveillanceArray=A large alien surveillance module.
+TIHabModuleTemplate.displayName.AlienWatchtower=Alien Watchtower
+TIHabModuleTemplate.description.AlienWatchtower=A huge alien surveillance module.
 TIHabModuleTemplate.displayName.DestroyedModule11=Destroyed Module
 TIHabModuleTemplate.description.DestroyedModule11=This hab module no longer functions. A new module may be built here.
 TIHabModuleTemplate.displayName.DestroyedModule12=Destroyed Module
@@ -278,7 +294,11 @@ TIHabModuleTemplate.displayName.AlienDestroyedModule33=Destroyed Alien Module
 TIHabModuleTemplate.description.AlienDestroyedModule33=This hab module no longer functions.
 HabModuleSpecialRule.DropTroops=-Supports a councilor assaulting enemy habs from an interface orbit or a friendly hab on the same planet. Combat strength: {0}
 HabModuleSpecialRule.Cost_Scales_With_Gravity=-Construction cost and power consumption scale with escape velocity and distance from home space body
+HabModuleSpecialRule.Shipyard=-Ships launching from shipyards on the surfaces of space bodies will need a minimum combat acceleration and Delta-V to reach orbit. These values increase on larger bodies, and the Delta-V requirement increases from habs at high latitudes.
+HabModuleSpecialRule.Requires_Colonized_Body=-Only allowed in Earth-Luna system or on or above worlds with 10,000 population
 HabModuleSpecialRule.Requires_Inhabited_Body=-Only allowed in Earth-Luna system or on or above worlds with 50,000 population
+HabModuleSpecialRule.Requires_GasGiant_Orbit=-Only allowed in the orbit of a gas giant
+HabModuleSpecialRule.Requires_Interface_Orbit=-Only allowed in interface orbits
 HabModuleSpecialRule.Solar_Power_Variable_Output=-Power output scales up with proximity to Sun
 HabModuleSpecialRule.CanFoundTier1Habs=-Allows founding platforms and outposts
 HabModuleSpecialRule.CanFoundTier2Habs=-Allows founding orbitals and settlements
@@ -315,4 +335,7 @@ HabModuleSpecialRule.AtrocityToKill=-Destroying this module is an atrocity
 HabModuleSpecialRule.AtrocityToKill_Populous=-Destroying this module in the Earth-Luna system or on or above worlds with 50,000 population is an atrocity
 HabModuleSpecialRule.Stability=-Module confers {0} malus to Control Space Asset missions at this hab and costs no money upkeep for module's crew
 HabModuleSpecialRule.Efficiency=-Module confers {1} bonus to hab's production of <color=#FFFFFFFF><sprite name="currency"><sprite name="influence"><sprite name="ops"><sprite name="research"><sprite name="water"><sprite name="metal"><sprite name="metal_noble"><sprite name="volatiles"><sprite name="radioactive"></color>
-TIHabModuleTemplate.OnePerHab=A hab may only have one of this type of module.
\ No newline at end of file
+HabModuleSpecialRule.HarvestHelium3=-When active, all of this faction's Helion fusion drives do not use any fissiles in its propellant load.
+TIHabModuleTemplate.OnePerHab=A hab may only have one of this type of module.
+TIHabModuleTemplate.BaseOnly=This module may only be built on surface bases and not stations.
+TIHabModuleTemplate.StationOnly=This module may only be built on stations and not surface bases.
\ No newline at end of file
diff --git a/app/game/localization/TILaserWeaponTemplate.en b/app/game/localization/TILaserWeaponTemplate.en
index 0c57375..e55cb0a 100644
--- a/app/game/localization/TILaserWeaponTemplate.en
+++ b/app/game/localization/TILaserWeaponTemplate.en
@@ -160,6 +160,20 @@ TILaserWeaponTemplate.displayName.Alien768cmVioletLaserCannon=Alien 768 cm Viole
 TILaserWeaponTemplate.description.Alien768cmVioletLaserCannon=A large alien directed energy weapon.
 TILaserWeaponTemplate.displayName.Alien1024cmVioletLaserCannon=Alien 1024 cm Violet Laser Cannon
 TILaserWeaponTemplate.description.Alien1024cmVioletLaserCannon=A huge alien directed energy weapon.
+TILaserWeaponTemplate.displayName.Alien384cmXaserBattery=Alien 384 cm X-Ray Laser Battery
+TILaserWeaponTemplate.description.Alien384cmXaserBattery=An advanced alien laser weapon.
+TILaserWeaponTemplate.displayName.Alien256cmXaserCannon=Alien 256 cm X-Ray Laser Cannon
+TILaserWeaponTemplate.description.Alien256cmXaserCannon=A small advanced alien laser cannon.
+TILaserWeaponTemplate.displayName.Alien512cmXaserCannon=Alien 512 cm X-Ray Laser Cannon
+TILaserWeaponTemplate.description.Alien512cmXaserCannon=An advanced alien laser cannon.
+TILaserWeaponTemplate.displayName.Alien768cmXaserCannon=Alien 768 cm X-Ray Laser Cannon
+TILaserWeaponTemplate.description.Alien768cmXaserCannon=A large advanced alien laser cannon.
+TILaserWeaponTemplate.displayName.Alien1024cmXaserCannon=Alien 1024 cm X-Ray Laser Cannon
+TILaserWeaponTemplate.description.Alien1024cmXaserCannon=A huge advanced alien laser cannon.
+TILaserWeaponTemplate.displayName.Alien768cmGraserCannon=Alien 768 cm Gamma Ray Laser Cannon
+TILaserWeaponTemplate.description.Alien768cmGraserCannon=A large, exotic alien laser cannon.
+TILaserWeaponTemplate.displayName.Alien1024cmGraserCannon=Alien 1024 cm Gamma Ray Laser Cannon
+TILaserWeaponTemplate.description.Alien1024cmGraserCannon=A huge, exotic alien laser cannon.
 TILaserWeaponTemplate.displayName.RegionDefenseIRLaser=Surface-to-Orbit Infrared Laser Array
 TILaserWeaponTemplate.displayName.RegionDefenseGreenLaser=Surface-to-Orbit Green Laser Array
 TILaserWeaponTemplate.displayName.RegionDefenseIRArcLaser=Surface-to-Orbit Infrared Arc Laser Array
diff --git a/app/game/localization/TIMagneticGunTemplate.en b/app/game/localization/TIMagneticGunTemplate.en
index 6da5a69..c0d9532 100644
--- a/app/game/localization/TIMagneticGunTemplate.en
+++ b/app/game/localization/TIMagneticGunTemplate.en
@@ -65,7 +65,7 @@ TIMagneticGunTemplate.description.LightCoilCannonMk2=An enhanced nose-mount coil
 TIMagneticGunTemplate.displayName.CoilCannonMk2=Coil Cannon Mk2
 TIMagneticGunTemplate.description.CoilCannonMk2=An enhanced spinal-mount coilgun for our larger ships.
 TIMagneticGunTemplate.displayName.HeavyCoilCannonMk2=Heavy Coil Cannon Mk2
-TIMagneticGunTemplate.description.HeavyCoilCannonMk2=An large, enhanced spinal-mount coilgun capable of significant kinetic damage.
+TIMagneticGunTemplate.description.HeavyCoilCannonMk2=A large, enhanced spinal-mount coilgun capable of significant kinetic damage.
 TIMagneticGunTemplate.displayName.SpinalCoilerMk2=Spinal Coiler Mk2
 TIMagneticGunTemplate.description.SpinalCoilerMk2=An enhanced nose-mount coilgun for our largest ships.
 TIMagneticGunTemplate.displayName.LightCoilgunBatteryMk3=Light Coilgun Battery Mk3
@@ -82,6 +82,18 @@ TIMagneticGunTemplate.displayName.HeavyCoilCannonMk3=Heavy Coil Cannon Mk3
 TIMagneticGunTemplate.description.HeavyCoilCannonMk3=An large, advanced spinal-mount coilgun capable of massive kinetic damage to targets.
 TIMagneticGunTemplate.displayName.SpinalCoilerMk3=Spinal Coiler Mk3
 TIMagneticGunTemplate.description.SpinalCoilerMk3=A spinal coilgun of terrible destructive power, suitable for our largest ships.
+TIMagneticGunTemplate.displayName.HeavySiegeCoilerMk1=Heavy Siege Coiler Mk1
+TIMagneticGunTemplate.description.HeavySiegeCoilerMk1=A large spinal-mount coilgun that flings huge projectiles.
+TIMagneticGunTemplate.displayName.HeavySiegeCoilerMk2=Heavy Siege Coiler Mk2
+TIMagneticGunTemplate.description.HeavySiegeCoilerMk2=An enhanced large spinal-mount coilgun that flings huge projectiles.
+TIMagneticGunTemplate.displayName.HeavySiegeCoilerMk3=Heavy Siege Coiler Mk3
+TIMagneticGunTemplate.description.HeavySiegeCoilerMk3=An advanced large spinal-mount coilgun that flings huge projectiles.
+TIMagneticGunTemplate.displayName.SpinalSiegeCoilerMk1=Spinal Siege Coiler Mk1
+TIMagneticGunTemplate.description.SpinalSiegeCoilerMk1=A huge spinal-mount coilgun that flings giant projectiles.
+TIMagneticGunTemplate.displayName.SpinalSiegeCoilerMk2=Spinal Siege Coiler Mk2
+TIMagneticGunTemplate.description.SpinalSiegeCoilerMk2=An enhanced, huge spinal-mount coilgun that flings giant projectiles.
+TIMagneticGunTemplate.displayName.SpinalSiegeCoilerMk3=Spinal Siege Coiler Mk3
+TIMagneticGunTemplate.description.SpinalSiegeCoilerMk3=An advanced, huge spinal-mount coilgun that flings giant projectiles.
 TIMagneticGunTemplate.displayName.AlienLightMagBattery=Alien Light Mag Battery
 TIMagneticGunTemplate.description.AlienLightMagBattery=A small alien mass driver.
 TIMagneticGunTemplate.displayName.AlienMagBattery=Alien Mag Battery
@@ -96,17 +108,32 @@ TIMagneticGunTemplate.displayName.AlienHeavyMagCannon=Alien Heavy Mag Cannon
 TIMagneticGunTemplate.description.AlienHeavyMagCannon=An large alien mass driver.
 TIMagneticGunTemplate.displayName.AlienSpinalMagCannon=Alien Spinal Mag Cannon
 TIMagneticGunTemplate.description.AlienSpinalMagCannon=A huge alien mass driver.
-TIMagneticGunTemplate.displayName.AdvancedAlienLightMagBattery=Advanced Alien Light Mag Battery
+TIMagneticGunTemplate.displayName.AdvancedAlienLightMagBattery=Enhanced Alien Light Mag Battery
 TIMagneticGunTemplate.description.AdvancedAlienLightMagBattery=A small alien mass driver.
-TIMagneticGunTemplate.displayName.AdvancedAlienMagBattery=Advanced Alien Mag Battery
+TIMagneticGunTemplate.displayName.AdvancedAlienMagBattery=Enhanced Alien Mag Battery
 TIMagneticGunTemplate.description.AdvancedAlienMagBattery=An alien mass driver.
-TIMagneticGunTemplate.displayName.AdvancedAlienHeavyMagBattery=Advanced Alien Heavy Mag Battery
+TIMagneticGunTemplate.displayName.AdvancedAlienHeavyMagBattery=Enhanced Alien Heavy Mag Battery
 TIMagneticGunTemplate.description.AdvancedAlienHeavyMagBattery=A large alien mass driver.
-TIMagneticGunTemplate.displayName.AdvancedAlienLightMagCannon=Advanced Alien Light Mag Cannon
+TIMagneticGunTemplate.displayName.AdvancedAlienLightMagCannon=Enhanced Alien Light Mag Cannon
 TIMagneticGunTemplate.description.AdvancedAlienLightMagCannon=A small alien mass driver.
-TIMagneticGunTemplate.displayName.AdvancedAlienMagCannon=Advanced Alien Mag Cannon
+TIMagneticGunTemplate.displayName.AdvancedAlienMagCannon=Enhanced Alien Mag Cannon
 TIMagneticGunTemplate.description.AdvancedAlienMagCannon=An alien mass driver.
-TIMagneticGunTemplate.displayName.AdvancedAlienHeavyMagCannon=Advanced Alien Heavy Mag Cannon
+TIMagneticGunTemplate.displayName.AdvancedAlienHeavyMagCannon=Enhanced Alien Heavy Mag Cannon
 TIMagneticGunTemplate.description.AdvancedAlienHeavyMagCannon=An large alien mass driver.
-TIMagneticGunTemplate.displayName.AdvancedAlienSpinalMagCannon=Advanced Alien Spinal Mag Cannon
+TIMagneticGunTemplate.displayName.AdvancedAlienSpinalMagCannon=Enhanced Alien Spinal Mag Cannon
 TIMagneticGunTemplate.description.AdvancedAlienSpinalMagCannon=A huge alien mass driver.
+TIMagneticGunTemplate.displayName.Gen3AlienLightMagBattery=Advanced Alien Light Mag Battery
+TIMagneticGunTemplate.description.Gen3AlienLightMagBattery=A small alien mass driver.
+TIMagneticGunTemplate.displayName.Gen3AlienMagBattery=Advanced Alien Mag Battery
+TIMagneticGunTemplate.description.Gen3AlienMagBattery=An alien mass driver.
+TIMagneticGunTemplate.displayName.Gen3AlienHeavyMagBattery=Advanced Alien Heavy Mag Battery
+TIMagneticGunTemplate.description.Gen3AlienHeavyMagBattery=A large alien mass driver.
+TIMagneticGunTemplate.displayName.Gen3AlienLightMagCannon=Advanced Alien Light Mag Cannon
+TIMagneticGunTemplate.description.Gen3AlienLightMagCannon=A small alien mass driver.
+TIMagneticGunTemplate.displayName.Gen3AlienMagCannon=Advanced Alien Mag Cannon
+TIMagneticGunTemplate.description.Gen3AlienMagCannon=An alien mass driver.
+TIMagneticGunTemplate.displayName.Gen3AlienHeavyMagCannon=Advanced Alien Heavy Mag Cannon
+TIMagneticGunTemplate.description.Gen3AlienHeavyMagCannon=An large alien mass driver.
+TIMagneticGunTemplate.displayName.Gen3AlienSpinalMagCannon=Advanced Alien Spinal Mag Cannon
+TIMagneticGunTemplate.description.Gen3AlienSpinalMagCannon=A huge alien mass driver.
+
diff --git a/app/game/localization/TIMissileTemplate.en b/app/game/localization/TIMissileTemplate.en
index e6e463c..92ae7aa 100644
--- a/app/game/localization/TIMissileTemplate.en
+++ b/app/game/localization/TIMissileTemplate.en
@@ -7,17 +7,23 @@ TIMissileTemplate.description.CobraMissileBay=A larger anti-ship missile that us
 TIMissileTemplate.displayName.CopperheadMissileBay=Copperhead Missile Bay
 TIMissileTemplate.description.CopperheadMissileBay=Extended-range cruise missiles with explosive warheads using hydrolox fuel.
 TIMissileTemplate.displayName.HarlequinMissileBay=Harlequin Missile Bay
-TIMissileTemplate.description.HarlequinMissileBay=A hypergolic-fuel missile with penetrator warhead.
+TIMissileTemplate.description.HarlequinMissileBay=A hypergolic-fuelled missile with penetrator warhead.
 TIMissileTemplate.displayName.KeelbackMissileBay=Keelback Missile Bay
 TIMissileTemplate.description.KeelbackMissileBay=Penetrator missiles with a large warhead.
 TIMissileTemplate.displayName.LanceheadMissileBay=Lancehead Missile Bay
 TIMissileTemplate.description.LanceheadMissileBay=Long-range penetrator missile using hydrolox fuel.
+TIMissileTemplate.displayName.RacerMissileBay=Racer Missile Bay
+TIMissileTemplate.description.RacerMissileBay=A short-range rapid-fire guided rocket system. Can be fired defensively.
 TIMissileTemplate.displayName.RattlerMissileBay=Rattler Missile Bay
-TIMissileTemplate.description.RattlerMissileBay=Small missile with fragmentation warhead. Can be fired defensively at incoming missiles.
+TIMissileTemplate.description.RattlerMissileBay=Small missile with fragmentation warhead. Can be fired defensively.
 TIMissileTemplate.displayName.RiverjackMissileBay=Riverjack Missile Bay
-TIMissileTemplate.description.RiverjackMissileBay=Large missile with fragmentation warhead. Can be fired defensively at incoming missiles.
+TIMissileTemplate.description.RiverjackMissileBay=Large missile with fragmentation warhead. Can be fired defensively.
 TIMissileTemplate.displayName.ViperMissileBay=Viper Missile Bay
-TIMissileTemplate.description.ViperMissileBay=Long-range missile carrying a fragmentation warhead. Can be fired defensively at incoming missiles.
+TIMissileTemplate.description.ViperMissileBay=Long-range hydrolox missile carrying a fragmentation warhead. Can be fired defensively.
+TIMissileTemplate.displayName.PythonNuclearMissileBay=Python Nuclear Missile Bay
+TIMissileTemplate.description.PythonNuclearMissileBay=Agile hydrolox missile carrying a 50-kiloton tactical nuclear warhead. Can be fired defensively.
+TIMissileTemplate.displayName.SidewinderNuclearMissileBay=Sidewinder Shaped Nuclear Missile Bay
+TIMissileTemplate.description.SidewinderNuclearMissileBay=Agile missile deploying a 100-kiloton nuclear shaped charge warhead that focuses its energy in a narrow cone. Can be fired defensively at incoming missiles.
 TIMissileTemplate.displayName.HeraTorpedoBay=Hera Torpedo Bay
 TIMissileTemplate.description.HeraTorpedoBay=Hypergolic-fuelled torpedo with an explosive warhead.
 TIMissileTemplate.displayName.ArtemisTorpedoBay=Artemis Torpedo Bay
@@ -30,6 +36,8 @@ TIMissileTemplate.displayName.VulcanTorpedoBay=Vulcan Torpedo Bay
 TIMissileTemplate.description.VulcanTorpedoBay=Hydrolox torpedo with improved range and a penetrator warhead.
 TIMissileTemplate.displayName.AresTorpedoBay=Ares Torpedo Bay
 TIMissileTemplate.description.AresTorpedoBay=Penetrator torpedo powered by a nuclear thermal rocket.
+TIMissileTemplate.displayName.PoseidonTorpedoBay=Poseidon Torpedo Bay
+TIMissileTemplate.description.PoseidonTorpedoBay=Penetrator Torpedo that maximizes Delta-V in exchange for a smaller warhead.
 TIMissileTemplate.displayName.CerebrusNuclearTorpedoBay=Cerberus Nuclear Torpedo Bay
 TIMissileTemplate.description.CerebrusNuclearTorpedoBay=Hypergolic-fuelled torpedo with a 300-kiloton thermonuclear warhead.
 TIMissileTemplate.displayName.HadesNuclearTorpedoBay=Hades Nuclear Torpedo Bay
@@ -37,13 +45,26 @@ TIMissileTemplate.description.HadesNuclearTorpedoBay=Hydrolox-fuelled torpedo wi
 TIMissileTemplate.displayName.NemesisNuclearTorpedoBay=Nemesis Nuclear Torpedo Bay
 TIMissileTemplate.description.NemesisNuclearTorpedoBay=Nuclear-powered thermonuclear torpedo with a 1.2-megaton warhead.
 TIMissileTemplate.displayName.OlympusNuclearTorpedoBay=Olympus Shaped Nuclear Torpedo Bay
-TIMissileTemplate.description.OlympusNuclearTorpedoBay=A nuclear thermal rocket torpedo deploying a 1-megaton shaped nuclear weapon that focuses 90% of its energy in a 20-degree cone.
+TIMissileTemplate.description.OlympusNuclearTorpedoBay=A nuclear thermal rocket torpedo deploying a 1-megaton shaped nuclear weapon that focuses its energy in a narrow cone.
+TIMissileTemplate.displayName.AcheronNuclearTorpedoBay=Acheron Shaped Nuclear Torpedo Bay
+TIMissileTemplate.description.AcheronNuclearTorpedoBay=A nuclear thermal rocket torpedo deploying a 1-megaton shaped nuclear weapon that focuses its energy in a very narrow cone.
+TIMissileTemplate.displayName.TartarusNuclearTorpedoBay=Tartarus Shaped Nuclear Torpedo Bay
+TIMissileTemplate.description.TartarusNuclearTorpedoBay=A nuclear thermal rocket torpedo deploying a 1-megaton shaped nuclear weapon that focuses its energy in an extremely narrow cone.
+TIMissileTemplate.displayName.StyxNuclearTorpedoBay=Styx Shaped Nuclear Torpedo Bay
+TIMissileTemplate.description.StyxNuclearTorpedoBay=A nuclear thermal rocket torpedo deploying a 1-megaton shaped nuclear weapon that focuses its energy in a beam extending from its detonation point.
 TIMissileTemplate.displayName.AntimatterTorpedoLauncher=Antimatter Torpedo Launcher
 TIMissileTemplate.description.AntimatterTorpedoLauncher=A nuclear thermal rocket carrying a warhead with a tiny quantity of antimatter.
 TIMissileTemplate.displayName.GlitteringJewelMissileBay=Glittering Jewel Missile Bay
 TIMissileTemplate.description.GlitteringJewelMissileBay=An alien missile system.
 TIMissileTemplate.displayName.IridescentStarTorpedoBay=Iridescent Star Torpedo Bay
 TIMissileTemplate.description.IridescentStarTorpedoBay=An alien heavy torpedo system.
+TIMissileTemplate.displayName.LuminousSwarmMissileBay=Luminous Swarm Missile Bay
+TIMissileTemplate.description.LuminousSwarmMissileBay=A rapid-fire alien missile system.
+TIMissileTemplate.displayName.BrilliantSkyMissileBay=Brilliant Sky Missile Bay
+TIMissileTemplate.description.BrilliantSkyMissileBay=An advanced alien missile system.
+TIMissileTemplate.displayName.PredatoryStarTorpedoBay=Predatory Star Torpedo Bay
+TIMissileTemplate.description.redatoryStarTorpedoBay=An advanced alien heavy torpedo system.
+
 TIMissileTemplate.Warhead=Warhead:<rcol>{0}</rcol>
 TIMissileTemplate.Warhead.Explosive=Explosive ({0} damage to armor)
 TIMissileTemplate.Warhead.Penetrator=Penetrator ({0} damage to armor)
@@ -58,4 +79,7 @@ TIMissileTemplate.WarheadType.Nuclear=Nuclear
 TIMissileTemplate.WarheadType.ShapedNuclear=Shaped Nuclear
 TIMissileTemplate.WarheadType.Antimatter=Antimatter
 TIMissileTemplate.Acc=Acceleration:<rcol>{0} gs</rcol>
-TIMissileTemplate.DV=Delta-V:<rcol>{0} kps</rcol>
\ No newline at end of file
+TIMissileTemplate.DV=Delta-V:<rcol>{0} kps</rcol>
+TIMissileTemplate.ShapedNuclearAngle=Destruction Cone:<rcol>{0} degrees</rcol>
+TIMissileTemplate.EffectiveAOERange_Sphere=Blast Damage Falloff Radius:<rcol>{0} km</rcol>
+TIMissileTemplate.EffectiveAOERange_Cone=Blast Cone Damage Falloff Distance :<rcol>{0} km</rcol>
\ No newline at end of file
diff --git a/app/game/localization/TIParticleWeaponTemplate.en b/app/game/localization/TIParticleWeaponTemplate.en
index e6845eb..47ea992 100644
--- a/app/game/localization/TIParticleWeaponTemplate.en
+++ b/app/game/localization/TIParticleWeaponTemplate.en
@@ -18,17 +18,74 @@ TIParticleWeaponTemplate.displayName.HeavyParticleCannonMk3=Heavy Particle Canno
 TIParticleWeaponTemplate.description.HeavyParticleCannonMk3=A larger particle cannon mount that fires beams of heavy nuclei at targets.
 TIParticleWeaponTemplate.displayName.SpinalParticleCannonMk3=Spinal Particle Cannon Mk3
 TIParticleWeaponTemplate.description.SpinalParticleCannonMk3=The most powerful particle weapon we can devise, suitable only for our largest warships.
+TIParticleWeaponTemplate.displayName.PointDefenseE-Beamer=Point Defense E-Beamer
+TIParticleWeaponTemplate.description.PointDefenseE-Beamer=A rapid-fire electron beam weapon effective against missiles, less so against other projectiles.
+TIParticleWeaponTemplate.displayName.LightE-BeamBattery=Light E-Beam Battery
+TIParticleWeaponTemplate.description.LightE-BeamBattery=A small turreted electron particle weapon that can disrupt enemy electronics and disable crew members.
+TIParticleWeaponTemplate.displayName.E-BeamBattery=E-Beam Battery
+TIParticleWeaponTemplate.description.E-BeamBattery=A turreted electron particle weapon that can disrupt enemy electronics and disable crew members.
+TIParticleWeaponTemplate.displayName.HeavyE-BeamBattery=Heavy E-Beam Battery
+TIParticleWeaponTemplate.description.HeavyE-BeamBattery=A large turreted electron particle weapon that can disrupt enemy electronics and disable crew members.
+TIParticleWeaponTemplate.displayName.ElectronLance=Electron Lance
+TIParticleWeaponTemplate.description.ElectronLance=A nose-mounted electron cannon that can disrupt enemy electronics and disable crew members.
+TIParticleWeaponTemplate.displayName.HeavyElectronLance=Heavy Electron Lance
+TIParticleWeaponTemplate.description.HeavyElectronLance=A large nose-mounted electron cannon that can disrupt enemy electronics and disable crew members.
+TIParticleWeaponTemplate.displayName.SpinalElectronLance=Spinal Electron Lance
+TIParticleWeaponTemplate.description.SpinalElectronLance=A keel-mount electron cannon that can disrupt enemy electronics and disable crew members.
+TIParticleWeaponTemplate.displayName.PointDefenseIonBattery=Point Defense Ion Battery
+TIParticleWeaponTemplate.description.PointDefenseIonBattery=A light, rapid-fire accelerator firing charged particles. It will be extremely effective against missiles but less so against other projectiles.
+TIParticleWeaponTemplate.displayName.LightIonBattery=Light Ion Battery
+TIParticleWeaponTemplate.description.LightIonBattery=A turreted linear accelerator firing pulses of charged particles to disrupt enemy electronics and disable crew members.
+TIParticleWeaponTemplate.displayName.IonBattery=Ion Battery
+TIParticleWeaponTemplate.description.IonBattery=A turreted linear accelerator firing pulses of charged particles to disrupt enemy electronics and disable crew members.
+TIParticleWeaponTemplate.displayName.HeavyIonBattery=Heavy Ion Battery
+TIParticleWeaponTemplate.description.HeavyIonBattery=A large turreted linear accelerator firing pulses of charged particles to disrupt enemy electronics and disable crew members.
+TIParticleWeaponTemplate.displayName.LightIonCannon=Light Ion Cannon
+TIParticleWeaponTemplate.description.LightIonCannon=A small nose-mount linear accelerator firing pulses of charged particles to disrupt enemy electronics and disable crew members.
+TIParticleWeaponTemplate.displayName.IonCannon=Ion Cannon
+TIParticleWeaponTemplate.description.IonCannon=A nose-mounted linear accelerator firing pulses of charged particles to disrupt enemy electronics and disable crew members.
+TIParticleWeaponTemplate.displayName.HeavyIonCannon=Heavy Ion Cannon
+TIParticleWeaponTemplate.description.HeavyIonCannon=A large nose-mounted linear accelerator firing pulses of charged particles to disrupt enemy electronics and disable crew members.
+TIParticleWeaponTemplate.displayName.SpinalIonCannon=Spinal Ion Cannon
+TIParticleWeaponTemplate.description.SpinalIonCannon=A heavy keel-mount linear accelerator firing pulses of charged particles to disrupt enemy electronics and disable crew members.
+TIParticleWeaponTemplate.displayName.ParticleBeamBattery=Particle Beam Battery
+TIParticleWeaponTemplate.description.ParticleBeamBattery=Neutral Particle Beams face much less dispersion over distance than ion beams as they damage enemy electronics and disable crew members at longer ranges.
+TIParticleWeaponTemplate.displayName.HeavyParticleBeamBattery=Heavy Particle Beam Battery
+TIParticleWeaponTemplate.description.HeavyParticleBeamBattery=A large turreted linear accelerator that fires neutralized particles to disrupt enemy electronics and disable crew members.
+TIParticleWeaponTemplate.displayName.LightParticleLance=Light Particle Lance
+TIParticleWeaponTemplate.description.LightParticleLance=A light nose-mount linear accelerator firing neutralized particles to disrupt enemy electronics and disable crew members.
+TIParticleWeaponTemplate.displayName.ParticleLance=Particle Lance
+TIParticleWeaponTemplate.description.ParticleLance=A nose-mount linear accelerator firing neutralized particles to disrupt enemy electronics and disable crew members.
+TIParticleWeaponTemplate.displayName.HeavyParticleLance=Heavy Particle Lance
+TIParticleWeaponTemplate.description.HeavyParticleLance=A large nose-mount linear accelerator firing neutralized particles to disrupt enemy electronics and disable crew members.
+TIParticleWeaponTemplate.displayName.SpinalParticleLance=Spinal Particle Lance
+TIParticleWeaponTemplate.description.SpinalParticleLance=A giant nose-mount linear accelerator firing neutralized particles to disrupt enemy electronics and disable crew members.
+TIParticleWeaponTemplate.displayName.AntimatterParticleCannon=Antimatter Cannon
+TIParticleWeaponTemplate.description.AntimatterParticleCannon=A linear accelerator firing a tight beam of antimatter at a target, which can cause significant thermal and radiation damage.
+TIParticleWeaponTemplate.displayName.HeavyAntimatterParticleCannon=Heavy Antimatter Cannon
+TIParticleWeaponTemplate.description.HeavyAntimatterParticleCannon=A large linear accelerator firing a tight beam of antimatter at a target, which can cause significant thermal and radiation damage.
+TIParticleWeaponTemplate.displayName.SpinalAntimatterParticleCannon=Spinal Antimatter Cannon
+TIParticleWeaponTemplate.description.SpinalAntimatterParticleCannon=A keel-mount accelerator firing a tight beam of antimatter at a target, which can cause significant thermal and radiation damage.
+TIParticleWeaponTemplate.displayName.SpinalNeutronLance=Spinal Neutron Lance
+TIParticleWeaponTemplate.description.SpinalNeutronLance=A keel-mount weapon firing a stream of pure neutrons at a target, which can cause massive damage on ship systems and crew.
 TIParticleWeaponTemplate.displayName.AlienPointDefenseParticleBeam=Alien Point Defense Particle Beam
 TIParticleWeaponTemplate.description.AlienPointDefenseParticleBeam=A small weapon system that appears to be defensive in nature.
-TIParticleWeaponTemplate.displayName.AlienLightParticleCannon=Alien Light Ion Cannon
+TIParticleWeaponTemplate.displayName.AlienLightParticleCannon=Alien Particle Cannon
 TIParticleWeaponTemplate.description.AlienLightParticleCannon=A small particle cannon of alien design.
-TIParticleWeaponTemplate.displayName.AlienParticleCannon=Alien Ion Cannon
+TIParticleWeaponTemplate.displayName.AlienParticleCannon=Alien Particle Cannon
 TIParticleWeaponTemplate.description.AlienParticleCannon=An alien particle cannon.
-TIParticleWeaponTemplate.displayName.AlienHeavyParticleCannon=Alien Heavy Ion Cannon
+TIParticleWeaponTemplate.displayName.AlienHeavyParticleCannon=Alien Heavy Particle Cannon
 TIParticleWeaponTemplate.description.AlienHeavyParticleCannon=A large alien particle cannon.
-TIParticleWeaponTemplate.displayName.AlienSpinalParticleCannon=Alien Spinal Ion Cannon
+TIParticleWeaponTemplate.displayName.AlienSpinalParticleCannon=Alien Spinal Particle Cannon
 TIParticleWeaponTemplate.description.AlienSpinalParticleCannon=A huge alien particle cannon.
-TIParticleWeaponTemplate.displayName.AlienRelativisticParticleCannon=Alien Electron Beam Cannon
-TIParticleWeaponTemplate.description.AlienRelativisticParticleCannon=A long-range electron particle weapon of alien design.
+TIParticleWeaponTemplate.displayName.AlienRelativisticParticleCannon=Alien Heavy Spinal Particle Cannon
+TIParticleWeaponTemplate.description.AlienRelativisticParticleCannon=A long-range particle weapon of alien design.
 
 TIParticleWeaponTemplate.DamageAtRange=Damage:<rcol>{0} MJ at {1} km ({2} damage)</rcol>
+TIParticleWeaponTemplate.DamageExplainer=Particle Weapons divide damage between thermal, x-ray, and baryonic damage. As forms of radiation, X-Rays and Baryons penetrate armor in ways other weapons can't. Baryonic damage is many times more harmful to crew and internal components than X-Rays. Totals of greater than 100% of input energy are possible when the beams cause energetic reactions on a target ship's hull.
+TIParticleWeaponTemplate.HeatDamage=Thermal Damage:<rcol>{0}</rcol>
+TIParticleWeaponTemplate.XRayDamage=X-Ray Damage (radiation):<rcol>{0}</rcol>
+TIParticleWeaponTemplate.BaryonicDamage=Baryonic Damage (radiation), {0}x to internals:<rcol>{1}</rcol>
+
+TIParticleWeaponTemplate.Defense.MissilesOnly=<h>Defensive fire will only target missiles.</h>
+TIParticleWeaponTemplate.Defense.ReducedEffectiveness=<h>Defensive fire against non-missile targets will have reduced effectiveness</h>
diff --git a/app/game/localization/TIPlasmaWeaponTemplate.en b/app/game/localization/TIPlasmaWeaponTemplate.en
index b4b990e..b3717a0 100644
--- a/app/game/localization/TIPlasmaWeaponTemplate.en
+++ b/app/game/localization/TIPlasmaWeaponTemplate.en
@@ -1,26 +1,26 @@
-TIPlasmaWeaponTemplate.displayName.PlasmaBatteryMk1=Plasma Battery Mk 1
-TIPlasmaWeaponTemplate.description.PlasmaBatteryMk1=Energetic toroids of dense plasma are propelled by a magentic pulse toward a target, causing damage at long range.
-TIPlasmaWeaponTemplate.displayName.HeavyPlasmaBatteryMk1=Heavy Plasma Battery Mk 1
-TIPlasmaWeaponTemplate.description.HeavyPlasmaBatteryMk1=Heavy plasma systems are some of the longest-range weapons we can develop.
-TIPlasmaWeaponTemplate.displayName.PlasmaCannonMk1=Plasma Cannon Mk 1
-TIPlasmaWeaponTemplate.description.PlasmaCannonMk1=A more powerful nose mount plasma weapon that requires manuever to keep a target within a limited field of fire.
-TIPlasmaWeaponTemplate.displayName.HeavyPlasmaCannonMk1=Heavy Plasma Cannon Mk 1
+TIPlasmaWeaponTemplate.displayName.PlasmaBatteryMk1=Plasma Battery Mk1
+TIPlasmaWeaponTemplate.description.PlasmaBatteryMk1=Energetic toroids of dense plasma are propelled by a magnetic pulse toward a target, leading to destruction of enemy armor.
+TIPlasmaWeaponTemplate.displayName.HeavyPlasmaBatteryMk1=Heavy Plasma Battery Mk1
+TIPlasmaWeaponTemplate.description.HeavyPlasmaBatteryMk1=Heavy plasma weapons can significantly degrade enemy armor.
+TIPlasmaWeaponTemplate.displayName.PlasmaCannonMk1=Heavy Plasma Cannon Mk1
+TIPlasmaWeaponTemplate.description.PlasmaCannonMk1=A powerful nose mount plasma weapon that requires manuever to keep a target within a limited field of fire.
+TIPlasmaWeaponTemplate.displayName.HeavyPlasmaCannonMk1=Superheavy Plasma Cannon Mk1
 TIPlasmaWeaponTemplate.description.HeavyPlasmaCannonMk1=A large nose-mount plasma emitter that can damage targets all over a battlefield once brought to bear.
-TIPlasmaWeaponTemplate.displayName.PlasmaBatteryMk2=Plasma Battery Mk 2
+TIPlasmaWeaponTemplate.displayName.PlasmaBatteryMk2=Plasma Battery Mk2
 TIPlasmaWeaponTemplate.description.PlasmaBatteryMk2=An enhanced turreted plasma weapon.
-TIPlasmaWeaponTemplate.displayName.HeavyPlasmaBatteryMk2=Heavy Plasma Battery Mk 2
+TIPlasmaWeaponTemplate.displayName.HeavyPlasmaBatteryMk2=Heavy Plasma Battery Mk2
 TIPlasmaWeaponTemplate.description.HeavyPlasmaBatteryMk2=An enhanced turreted plasma weapon for mounting on our largest craft.
-TIPlasmaWeaponTemplate.displayName.PlasmaCannonMk2=Plasma Cannon Mk 2
+TIPlasmaWeaponTemplate.displayName.PlasmaCannonMk2=Heavy Plasma Cannon Mk2
 TIPlasmaWeaponTemplate.description.PlasmaCannonMk2=An enhanced nose-mount plasma emitter.
-TIPlasmaWeaponTemplate.displayName.HeavyPlasmaCannonMk2=Heavy Plasma Cannon Mk 2
+TIPlasmaWeaponTemplate.displayName.HeavyPlasmaCannonMk2=Superheavy Plasma Cannon Mk2
 TIPlasmaWeaponTemplate.description.HeavyPlasmaCannonMk2=A large plasma weapon suitable for our largest ships.
-TIPlasmaWeaponTemplate.displayName.PlasmaBatteryMk3=Plasma Battery Mk 3
-TIPlasmaWeaponTemplate.description.PlasmaBatteryMk3=An advanced plasma turret capable of immense damage at range.
-TIPlasmaWeaponTemplate.displayName.HeavyPlasmaBatteryMk3=Heavy Plasma Battery Mk 3
+TIPlasmaWeaponTemplate.displayName.PlasmaBatteryMk3=Plasma Battery Mk3
+TIPlasmaWeaponTemplate.description.PlasmaBatteryMk3=An advanced plasma turret capable of significant damage against any target in range.
+TIPlasmaWeaponTemplate.displayName.HeavyPlasmaBatteryMk3=Heavy Plasma Battery Mk3
 TIPlasmaWeaponTemplate.description.HeavyPlasmaBatteryMk3=An advanced plasma turret suitable for our largest ships.
-TIPlasmaWeaponTemplate.displayName.PlasmaCannonMk3=Plasma Cannon Mk 3
+TIPlasmaWeaponTemplate.displayName.PlasmaCannonMk3=Heavy Plasma Cannon Mk3
 TIPlasmaWeaponTemplate.description.PlasmaCannonMk3=An advanced nose-mount plasma emitter.
-TIPlasmaWeaponTemplate.displayName.HeavyPlasmaCannonMk3=Heavy Plasma Cannon Mk 3
+TIPlasmaWeaponTemplate.displayName.HeavyPlasmaCannonMk3=Superheavy Plasma Cannon Mk3
 TIPlasmaWeaponTemplate.description.HeavyPlasmaCannonMk3=An advanced plasma cannon for mounting on our largest warships.
 TIPlasmaWeaponTemplate.displayName.AlienPlasmaBattery=Alien Plasma Battery
 TIPlasmaWeaponTemplate.description.AlienPlasmaBattery=An alien plasma projectile weapon.
diff --git a/app/game/localization/TIPowerPlantTemplate.en b/app/game/localization/TIPowerPlantTemplate.en
index 153ceb2..cb92133 100644
--- a/app/game/localization/TIPowerPlantTemplate.en
+++ b/app/game/localization/TIPowerPlantTemplate.en
@@ -24,6 +24,10 @@ TIPowerPlantTemplate.displayName.SolidCoreFissionReactorIX=Compact Solid Core Fi
 TIPowerPlantTemplate.description.SolidCoreFissionReactorIX=A miniaturized fission reactor offers space and mass-savings for our ships.
 TIPowerPlantTemplate.displayName.SolidCoreFissionReactorX=Compact Solid Core Fission Reactor V
 TIPowerPlantTemplate.description.SolidCoreFissionReactorX=A miniaturized fission reactor offers space and mass-savings for our ships.
+TIPowerPlantTemplate.displayName.MoltenSaltFissionReactorI=Molten Salt Fission Reactor I
+TIPowerPlantTemplate.description.MoltenSaltFissionReactorI=Complex but efficient fission reactor that uses molten salts as coolant and supports solid- or liquid-core drives.
+TIPowerPlantTemplate.displayName.MoltenSaltFissionReactorII=Molten Salt Fission Reactor II
+TIPowerPlantTemplate.description.MoltenSaltFissionReactorII=Complex but efficient fission reactor that uses molten salts as coolant and supports solid- or liquid-core drives.
 TIPowerPlantTemplate.displayName.MoltenCoreFissionReactorI=Molten Core Fission Reactor I
 TIPowerPlantTemplate.description.MoltenCoreFissionReactorI=A spinning fission reaction chamber filled with liquid tantalum or rhenium allows operating temperatures of around 5,000 degrees Celsius.
 TIPowerPlantTemplate.displayName.MoltenCoreFissionReactorII=Molten Core Fission Reactor II
@@ -48,30 +52,30 @@ TIPowerPlantTemplate.displayName.GasCoreFissionReactorV=Terawatt Gas Core Fissio
 TIPowerPlantTemplate.description.GasCoreFissionReactorV=Stronger materials allow us to achieve massive power output from nuclear fission.
 TIPowerPlantTemplate.displayName.GasCoreFissionReactorVI=Terawatt Gas Core Fission Reactor III
 TIPowerPlantTemplate.description.GasCoreFissionReactorVI=Stronger materials allow us to achieve massive power output from nuclear fission.
-TIPowerPlantTemplate.displayName.SaltWaterCoreReactorI=Salt Water Core Reactor I
-TIPowerPlantTemplate.description.SaltWaterCoreReactorI=A reactor design that allows us to maintain and draw power from a continuous nuclear explosion.
-TIPowerPlantTemplate.displayName.SaltWaterCoreReactorII=Salt Water Core Reactor II
-TIPowerPlantTemplate.description.SaltWaterCoreReactorII=A reactor design that allows us to maintain and draw power from a continuous nuclear explosion.
 TIPowerPlantTemplate.displayName.ElectrostaticConfinementFusionReactorI=Electrostatic Confinement Fusion Reactor I
-TIPowerPlantTemplate.description.ElectrostaticConfinementFusionReactorI=Hydrogen and Lithium-6 are fused by an electron beam to create a compact fusion reactor.
+TIPowerPlantTemplate.description.ElectrostaticConfinementFusionReactorI=An electron beam fuses fusion fuel in this compact reactor.
 TIPowerPlantTemplate.displayName.ElectrostaticConfinementFusionReactorII=Electrostatic Confinement Fusion Reactor II
-TIPowerPlantTemplate.description.ElectrostaticConfinementFusionReactorII=Hydrogen and Lithium-6 are fused by an electron beam to create a compact fusion reactor.
+TIPowerPlantTemplate.description.ElectrostaticConfinementFusionReactorII=An electron beam fuses fusion fuel in this compact reactor.
 TIPowerPlantTemplate.displayName.ElectrostaticConfinementFusionReactorIII=Electrostatic Confinement Fusion Reactor III
-TIPowerPlantTemplate.description.ElectrostaticConfinementFusionReactorIII=Hydrogen and Lithium-6 are fused by an electron beam to create a compact fusion reactor.
+TIPowerPlantTemplate.description.ElectrostaticConfinementFusionReactorIII=An electron beam fuses fusion fuel in this compact reactor.
 TIPowerPlantTemplate.displayName.ZPinchFusionReactorI=Z-Pinch Fusion Reactor I
 TIPowerPlantTemplate.description.ZPinchFusionReactorI=Nuclear fusion is maintained by a Zeta-pinch magnetic field that compresses reaction plasma.
 TIPowerPlantTemplate.displayName.ZPinchFusionReactorII=Z-Pinch Fusion Reactor II
 TIPowerPlantTemplate.description.ZPinchFusionReactorII=Nuclear fusion is maintained by a Zeta-pinch magnetic field that compresses reaction plasma.
 TIPowerPlantTemplate.displayName.ZPinchFusionReactorIII=Z-Pinch Fusion Reactor III
 TIPowerPlantTemplate.description.ZPinchFusionReactorIII=Nuclear fusion is maintained by a Zeta-pinch magnetic field that compresses reaction plasma.
+TIPowerPlantTemplate.displayName.ZPinchFusionReactorIV=Z-Pinch Fusion Reactor IV
+TIPowerPlantTemplate.description.ZPinchFusionReactorIV=Nuclear fusion is maintained by a Zeta-pinch magnetic field that compresses reaction plasma.
 TIPowerPlantTemplate.displayName.HybridConfinementFusionReactorI=Hybrid Confinement Fusion Reactor I
-TIPowerPlantTemplate.description.HybridConfinementFusionReactorI=Multiple plasma confinement techniques are combined to create a high-energy fusion Deuterium-based reactor.
+TIPowerPlantTemplate.description.HybridConfinementFusionReactorI=Electrostatic and magnetic plasma confinement techniques are combined to create a high-energy fusion reactor.
 TIPowerPlantTemplate.displayName.HybridConfinementFusionReactorII=Hybrid Confinement Fusion Reactor II
-TIPowerPlantTemplate.description.HybridConfinementFusionReactorII=Multiple plasma confinement techniques are combined to create a high-energy fusion Deuterium-based reactor.
+TIPowerPlantTemplate.description.HybridConfinementFusionReactorII=Electrostatic and magnetic plasma confinement techniques are combined to create a high-energy fusion reactor.
 TIPowerPlantTemplate.displayName.HybridConfinementFusionReactorIII=Hybrid Confinement Fusion Reactor III
-TIPowerPlantTemplate.description.HybridConfinementFusionReactorIII=Multiple plasma confinement techniques are combined to create a high-energy fusion Deuterium-based reactor.
-TIPowerPlantTemplate.displayName.AlienHybridConfinementFusionReactor=Alien Hybrid Confinement Fusion Reactor
-TIPowerPlantTemplate.description.AlienHybridConfinementFusionReactor=The aliens appear to use a mix of electrostatic and inertial containment techniques for their powerful fusion reactors.
+TIPowerPlantTemplate.description.HybridConfinementFusionReactorIII=Electrostatic, magnetic, and inertial plasma confinement techniques are combined to create a high-energy fusion reactor.
+TIPowerPlantTemplate.displayName.HybridConfinementFusionReactorIV=Hybrid Confinement Fusion Reactor IV
+TIPowerPlantTemplate.description.HybridConfinementFusionReactorIV=Electrostatic, magnetic, and inertial plasma confinement techniques are combined to create a high-energy fusion reactor.
+TIPowerPlantTemplate.displayName.FlowStabilizedZPinchFusionReactor=Flow-Stabilized Z-Pinch Fusion Reactor
+TIPowerPlantTemplate.description.FlowStabilizedZPinchFusionReactor=Z-Pinch fusion plasma is stabilized by sheared flow, allowing for terawatt-grade reactors.
 TIPowerPlantTemplate.displayName.FusionTokamakI=Fusion Tokamak I
 TIPowerPlantTemplate.description.FusionTokamakI=A toroidal magnetic field holds fusion plasma and gathers charged particles to generate power.
 TIPowerPlantTemplate.displayName.FusionTokamakII=Fusion Tokamak II
@@ -82,8 +86,6 @@ TIPowerPlantTemplate.displayName.FusionTokamakIV=Fusion Tokamak IV
 TIPowerPlantTemplate.description.FusionTokamakIV=A toroidal magnetic field holds fusion plasma and gathers charged particles to generate power.
 TIPowerPlantTemplate.displayName.FusionTokamakV=Fusion Tokamak V
 TIPowerPlantTemplate.description.FusionTokamakV=A toroidal magnetic field holds fusion plasma and gathers charged particles to generate power.
-TIPowerPlantTemplate.displayName.FlowStabilizedZPinchFusionReactor=Flow-Stabilized Z-Pinch Fusion Reactor
-TIPowerPlantTemplate.description.FlowStabilizedZPinchFusionReactor=Z-Pinch fusion plasma is stabilized by sheared flow, allowing for terawatt-grade reactors.
 TIPowerPlantTemplate.displayName.MirrorCellFusionReactorI=Mirror Cell Fusion Reactor I
 TIPowerPlantTemplate.description.MirrorCellFusionReactorI=A linear fusion reactor that uses magnetic mirrors to contain and direct plasma.
 TIPowerPlantTemplate.displayName.MirrorCellFusionReactorII=Mirror Cell Fusion Reactor II
@@ -96,14 +98,20 @@ TIPowerPlantTemplate.displayName.InertialConfinementFusionReactorII=Inertial Con
 TIPowerPlantTemplate.description.InertialConfinementFusionReactorII=Powerful lasers induce a sustained nuclear fusion reaction.
 TIPowerPlantTemplate.displayName.InertialConfinementFusionReactorIII=Inertial Confinement Fusion Reactor III
 TIPowerPlantTemplate.description.InertialConfinementFusionReactorIII=Powerful lasers induce a sustained nuclear fusion reaction.
-TIPowerPlantTemplate.displayName.InertialConfinementFusionReactorIV=Heavy Inertial Confinement Fusion Reactor
+TIPowerPlantTemplate.displayName.InertialConfinementFusionReactorIV=Inertial Confinement Fusion Reactor IV
 TIPowerPlantTemplate.description.InertialConfinementFusionReactorIV=Powerful lasers induce a sustained nuclear fusion reaction.
-TIPowerPlantTemplate.displayName.InertialConfinementFusionReactorV=Inertial Confinement Terawatt Fusion Reactor I
+TIPowerPlantTemplate.displayName.InertialConfinementFusionReactorV=Inertial Confinement Fusion Reactor V
 TIPowerPlantTemplate.description.InertialConfinementFusionReactorV=Powerful lasers induce a sustained nuclear fusion reaction.
-TIPowerPlantTemplate.displayName.InertialConfinementFusionReactorVI=Inertial Confinement Terawatt Fusion Reactor II
+TIPowerPlantTemplate.displayName.InertialConfinementFusionReactorVI=Inertial Confinement Fusion Reactor VI
 TIPowerPlantTemplate.description.InertialConfinementFusionReactorVI=Powerful lasers induce a sustained nuclear fusion reaction.
-TIPowerPlantTemplate.displayName.InertialConfinementFusionReactorVII=Inertial Confinement Terawatt Fusion Reactor III
+TIPowerPlantTemplate.displayName.InertialConfinementFusionReactorVII=Inertial Confinement Fusion Reactor VII
 TIPowerPlantTemplate.description.InertialConfinementFusionReactorVII=Powerful lasers induce a sustained nuclear fusion reaction.
+TIPowerPlantTemplate.displayName.AlienHybridConfinementFusionReactor=Alien Hybrid Confinement Fusion Reactor I 
+TIPowerPlantTemplate.description.AlienHybridConfinementFusionReactor=The aliens appear to use a mix of electrostatic and inertial containment techniques for their powerful fusion reactors.
+TIPowerPlantTemplate.displayName.AlienAdvancedHybridConfinementFusionReactor=Alien Hybrid Confinement Fusion Reactor II
+TIPowerPlantTemplate.description.AlienAdvancedHybridConfinementFusionReactor=The aliens appear to use a mix of electrostatic and inertial containment techniques for their powerful fusion reactors.
+TIPowerPlantTemplate.displayName.AlienSuperAdvancedHybridConfinementFusionReactor=Alien Hybrid Confinement Fusion Reactor III
+TIPowerPlantTemplate.description.AlienSuperAdvancedHybridConfinementFusionReactor=The aliens appear to use a mix of electrostatic and inertial containment techniques for their powerful fusion reactors.
 TIPowerPlantTemplate.displayName.AntimatterSolidCoreReactor=Antimatter Solid Core Reactor
 TIPowerPlantTemplate.description.AntimatterSolidCoreReactor=A stream of antiprotons strike a tungsten target, heating it.
 TIPowerPlantTemplate.displayName.AntimatterGasCoreReactor=Antimatter Gas Core Reactor
@@ -120,9 +128,9 @@ TIPowerPlantTemplate.PowerPlantType=Classification:<rcol>{0}</rcol>
 TIPowerPlantTemplate.PowerPlantRequirement.Any_General=Any Reactor
 TIPowerPlantTemplate.PowerPlantRequirement.Fuel_Cell=Fuel Cell
 TIPowerPlantTemplate.PowerPlantRequirement.Solid_Core_Fission=Solid Core Fission
-TIPowerPlantTemplate.PowerPlantRequirement.Liquid_Core_Fission=Liquid Core Fission
+TIPowerPlantTemplate.PowerPlantRequirement.Liquid_Core_Fission=Molten Core Fission
 TIPowerPlantTemplate.PowerPlantRequirement.Gas_Core_Fission=Gas Core Fission
-TIPowerPlantTemplate.PowerPlantRequirement.Salt_Water_Core=Nuclear Salt Water Core
+TIPowerPlantTemplate.PowerPlantRequirement.Molten_Salt_Core_Fission=Molten Salt Core Fission
 TIPowerPlantTemplate.PowerPlantRequirement.Z_Pinch_Fusion=Z-Pinch Fusion
 TIPowerPlantTemplate.PowerPlantRequirement.Any_Magnetic_Confinement_Fusion=Any Magnetic Confinement Fusion
 TIPowerPlantTemplate.PowerPlantRequirement.Electrostatic_Confinement_Fusion=Electrostatic Confinement Fusion
diff --git a/app/game/localization/TIProjectTemplate.en b/app/game/localization/TIProjectTemplate.en
index 851d79b..65370cf 100644
--- a/app/game/localization/TIProjectTemplate.en
+++ b/app/game/localization/TIProjectTemplate.en
@@ -36,7 +36,7 @@ TIProjectTemplate.description.Project_HydraLanguage=While it will take some time
 
 TIProjectTemplate.displayName.Project_TheirTechnology=Alien Technology
 TIProjectTemplate.summary.Project_TheirTechnology=We examine recovered alien technology to reveal its strengths, weaknesses and potential applications.
-TIProjectTemplate.description.Project_TheirTechnology=Since the moment we recovered it, our research and engineering divisions have been constantly requesting samples of the alien technology. Today alone we have seen no less than 48 requests for everything from recovered databanks to simple bulkhead fasteners.<br/><br/>This is understandable, given that each item is a potential treasure trove of knowledge, both at a technological level - how does it operate, and what is its purpose? - and a chemical one - what was it created from, and where? The recovered technology has begun to yield its secrets, the theoretical applications of which very much depend on our own intentions. Unfortunately, with such a finite amount of these alien artifacts to hand, we can for now only scratch the surface of their potential.
+TIProjectTemplate.description.Project_TheirTechnology=Since the moment we recovered it, our research and engineering divisions have been constantly requesting samples of the alien technology. Today alone we have seen no fewer than 48 requests for everything from recovered databanks to simple bulkhead fasteners.<br/><br/>This is understandable, given that each item is a potential treasure trove of knowledge, both at a technological level - how does it operate, and what is its purpose? - and a chemical one - what was it created from, and where? The recovered technology has begun to yield its secrets, the theoretical applications of which very much depend on our own intentions. Unfortunately, with such a finite amount of these alien artifacts to hand, we can for now only scratch the surface of their potential.
 
 TIProjectTemplate.displayName.Project_Exotics=Exotic Materials
 TIProjectTemplate.summary.Project_Exotics=We further analyze samples of the recovered extrasolar material essential to the aliens' construction and war effort.
@@ -103,7 +103,7 @@ TIProjectTemplate.summary.Project_CooperateVictory=We seek a means of drawing th
 TIProjectTemplate.description.Project_CooperateVictory=We can no longer have our cake and eat it: that much is clear. We cannot be an organization that offers surrender with one hand, but slaughter with the other. Peace is the only realistic long-term outcome for humanity, and on that enough of us are now agreed. We will demand that those amongst us who hold more extreme views either compromise or leave. Once we are of one mind, no matter what it might cost us, we can enact our great plan: to prove decisively to the aliens that Earth is not theirs for the taking, but neither is it their enemy.
 
 TIProjectTemplate.displayName.Project_DestroyVictory=Purify the Earth
-TIProjectTemplate.summary.Project_DestroyVictory=We reach agreement on how best to drive the aliens away for good
+TIProjectTemplate.summary.Project_DestroyVictory=We reach agreement on how best to drive the aliens away for good.
 TIProjectTemplate.description.Project_DestroyVictory=We've been fighting back for some time now, doing all we can to protect the human race from an invasion that shows no signs of slowing down. But playing defense indefinitely is not a long-term solution, especially when other factions on Earth want to throw in the towel. It's time to play offense, before it's too late - and at last we've worked out exactly how we're going to do that.
 
 TIProjectTemplate.displayName.Project_EscapeVictory=Leave the Cradle
@@ -152,7 +152,7 @@ TIProjectTemplate.description.Project_TheOneTruePath=Though we perhaps cannot ho
 
 TIProjectTemplate.displayName.Project_AlienFlora=Alien Flora
 TIProjectTemplate.summary.Project_AlienFlora=Our biologists study the nonsapient life forms that were collected from several sites.
-TIProjectTemplate.description.Project_AlienFlora=There was a limited amount to be gleaned from our study of the vegetative lifeform we have dubbed 'xenoflora', but not a lack of trying. The issue is that we have thus far been unable to fully crack its genetic make-up, for elements thereof are so, for lack of a better word, alien as to be thoroughly inscrutable to us at the present time. Neither have we been able to divine any clues as to its origin, other than to say it is most certainly not of this Earth. While we have previously observed some correlation between xenoflora growth and alien crash sites, causation now seems highly probable.<br/><br/>Even its behavior supports this conclusion - it spreads faster than any terrestrial flora or even fungus, and with eerie, almost machine-like regularity. To suggest that the xenoflora has been in some way genetically altered - or even wholly designed - would not be an unreasonable hypothesis. If left unchecked, it could very likely colonize a region in record time, preventing the growth of all other flora. To what end we do not yet know. It would therefore be prudent to find a way to limit the organism's spread, whether through military or biological means. 
+TIProjectTemplate.description.Project_AlienFlora=There was a limited amount to be gleaned from our study of the vegetative lifeform we have dubbed 'xenoflora', but not for a lack of trying. The issue is that we have thus far been unable to fully crack its genetic make-up, for elements thereof are so, for lack of a better word, alien as to be thoroughly inscrutable to us at the present time. Neither have we been able to divine any clues as to its origin, other than to say it is most certainly not of this Earth. While we have previously observed some correlation between xenoflora growth and alien crash sites, causation now seems highly probable.<br/><br/>Even its behavior supports this conclusion - it spreads faster than any terrestrial flora or even fungus, and with eerie, almost machine-like regularity. To suggest that the xenoflora has been in some way genetically altered - or even wholly designed - would not be an unreasonable hypothesis. If left unchecked, it could very likely colonize a region in record time, preventing the growth of all other flora. To what end we do not yet know. It would therefore be prudent to find a way to limit the organism's spread, whether through military or biological means. 
 
 TIProjectTemplate.displayName.Project_TheirComputers=Alien Computers
 TIProjectTemplate.summary.Project_TheirComputers=We attempt to decipher the purpose and operation of the machines seemingly used to control the alien spacecraft.
@@ -194,11 +194,17 @@ TIProjectTemplate.displayName.Project_WakhanCorridorProject=Wakhan Corridor Proj
 TIProjectTemplate.summary.Project_WakhanCorridorProject=A highway between Afghanistan and Xinjiang.
 TIProjectTemplate.displayName.Project_DarienGapRoad=Darien Gap Road
 TIProjectTemplate.summary.Project_DarienGapRoad=We cut through the jungle to connect Central and South America at last.
+TIProjectTemplate.displayName.Project_DiphuPass=Diphu Pass Opening
+TIProjectTemplate.summary.Project_DiphuPass=A goat trail turns into a highway connecting Tibet and northern Myanmar.
+TIProjectTemplate.displayName.Project_PalkStraitBridge=Palk Strait Bridge
+TIProjectTemplate.summary.Project_PalkStraitBridge=Sri Lanka is connected to mainland India via a bridge and tunnel system.
+TIProjectTemplate.displayName.Project_NorthChannelCrossing=North Channel Crossing
+TIProjectTemplate.summary.Project_NorthChannelCrossing=A quick jaunt from Scotland to Ireland.
 TIProjectTemplate.displayName.Project_AtzlanNation=Aztlán Nation
 TIProjectTemplate.summary.Project_AtzlanNation=The American Southwest and northern Mexico form a national identity.
 TIProjectTemplate.displayName.Project_BreakupofIndonesia=Breakup of Indonesia
 TIProjectTemplate.summary.Project_BreakupofIndonesia=The islands decide on self-governance.
-TIProjectTemplate.displayName.Project_EndofAmerica=End of America
+TIProjectTemplate.displayName.Project_EndofAmerica=End of the American Empire
 TIProjectTemplate.summary.Project_EndofAmerica=Separatist movements gain strength as Americans give up on bridging their ideological and regional divides.
 TIProjectTemplate.displayName.Project_EndofIndia=End of India
 TIProjectTemplate.summary.Project_EndofIndia=The peoples of the pre-Raj states of India assert their desire for self-determination.
@@ -218,8 +224,8 @@ TIProjectTemplate.displayName.Project_ForwardRussia=Forward Russia
 TIProjectTemplate.summary.Project_ForwardRussia=Russia sets its sights on domination of Eurasia from the Atlantic to the Pacific.
 TIProjectTemplate.displayName.Project_LiberatingMainlandChina=Liberating Mainland China
 TIProjectTemplate.summary.Project_LiberatingMainlandChina=A outward-looking Taiwan moves to assert control over China's mainland.
-TIProjectTemplate.displayName.Project_HokkaidoIndependenceMovement=Hokkaido Independence Movement
-TIProjectTemplate.summary.Project_HokkaidoIndependenceMovement=The Ainu people seek self-determination.
+TIProjectTemplate.displayName.Project_HokkaidoIndependenceMovement=Japanese Islands Independence Movements
+TIProjectTemplate.summary.Project_HokkaidoIndependenceMovement=The Ainu and Ryuku peoples seek self-determination.
 TIProjectTemplate.displayName.Project_SiberianIndependenceMovement=Siberian Independence Movement
 TIProjectTemplate.summary.Project_SiberianIndependenceMovement=Siberian peoples seek to break ties with Moscow.
 TIProjectTemplate.displayName.Project_BreakupofPakistan=Breakup of Pakistan
@@ -251,7 +257,7 @@ TIProjectTemplate.summary.Project_EastAfricanFederation=One People, one Destiny.
 TIProjectTemplate.displayName.Project_GreaterIndonesia=Greater Indonesia
 TIProjectTemplate.summary.Project_GreaterIndonesia=Jakarta sets its sights on consolidating Borneo, New Guinea and the Malay Peninsula under its rule.
 TIProjectTemplate.displayName.Project_GreaterAustronesia=Greater Austronesia
-TIProjectTemplate.summary.Project_GreaterAustronesia=Indian and Pacific Ocean peoples see a properous future together.
+TIProjectTemplate.summary.Project_GreaterAustronesia=Indian and Pacific Ocean peoples see a prosperous future together.
 TIProjectTemplate.displayName.Project_TheShiaNation=The Shia Nation
 TIProjectTemplate.summary.Project_TheShiaNation=Shia Muslims unite under Iran's protection.
 TIProjectTemplate.displayName.Project_TheHouseofIslam=The House of Islam
@@ -282,8 +288,8 @@ TIProjectTemplate.displayName.Project_UnitedMalayNation=The United Malay Nation
 TIProjectTemplate.summary.Project_UnitedMalayNation=Malays in many nations unite under a single banner.
 TIProjectTemplate.displayName.Project_GreaterMalaysia=Greater Malaysia
 TIProjectTemplate.summary.Project_GreaterMalaysia=Malaysia consolidates its power over nations where it has had historical influence.
-TIProjectTemplate.displayName.Project_OccitanIndependenceMovement=Occitan Independence Movement
-TIProjectTemplate.summary.Project_OccitanIndependenceMovement=The people of southern France seek self-determination.
+TIProjectTemplate.displayName.Project_FrenchIndependenceMovements=French Independence Movement
+TIProjectTemplate.summary.Project_FrenchIndependenceMovements=Peoples in France seek self-determination.
 TIProjectTemplate.displayName.Project_KatangaIndependenceMovement=Katanga Independence Movement
 TIProjectTemplate.summary.Project_KatangaIndependenceMovement=Eastern Congo seeks to chart its own course.
 TIProjectTemplate.displayName.Project_OurOwnWay=Our Own Way
@@ -297,16 +303,19 @@ TIProjectTemplate.summary.Project_WestAfricanCommunity=The nations of West Afric
 TIProjectTemplate.displayName.Project_NigerianConfederation=Nigerian Confederation
 TIProjectTemplate.summary.Project_NigerianConfederation=Nigeria asserts authority over its neighbors.
 TIProjectTemplate.displayName.Project_PeruvianConfederation=Peruvian Confederation
-TIProjectTemplate.summary.Project_PeruvianConfederation=An old alliance is renewed.
+TIProjectTemplate.summary.Project_PeruvianConfederation=An old alliance is renewed, and indigenous peoples seek an alternative.
 TIProjectTemplate.displayName.Project_BantuNation=The Bantu Nation
 TIProjectTemplate.summary.Project_BantuNation=Bantu peoples across south and central Africa seek common governance.
 TIProjectTemplate.displayName.Project_CommonwealthRestored=Restored Commonwealth
 TIProjectTemplate.summary.Project_CommonwealthRestored=Threats to the geopolitical order drive the Anglosphere to regroup.
 TIProjectTemplate.displayName.Project_PacificLeague=The Pacific Defense League
-TIProjectTemplate.summary.Project_PacificLeague=Old animosities are set aside for Japan to lead a bulwark against China.
+TIProjectTemplate.summary.Project_PacificLeague=Old animosities are set aside for Japan to lead a bulwark against regional threats.
 TIProjectTemplate.displayName.Project_CompositeArmor=Composite Armor
 TIProjectTemplate.summary.Project_CompositeArmor=<shipmodule>
 TIProjectTemplate.description.Project_CompositeArmor=Our most advanced armor material will be immediately applied to protecting our hab modules.
+TIProjectTemplate.displayName.Project_FoamedMetalArmor=Foamed Metal Armor
+TIProjectTemplate.summary.Project_FoamedMetalArmor=<shipmodule>
+TIProjectTemplate.description.Project_FoamedMetalArmor=Our most advanced armor material will be immediately applied to protecting our hab modules.
 TIProjectTemplate.displayName.Project_NanotubeArmor=Nanotube Armor
 TIProjectTemplate.summary.Project_NanotubeArmor=<shipmodule>
 TIProjectTemplate.description.Project_NanotubeArmor=Our most advanced armor material will be immediately applied to protecting our hab modules.
@@ -349,6 +358,8 @@ TIProjectTemplate.displayName.Project_DustyPlasmaRadiator=Dusty Plasma Radiator
 TIProjectTemplate.summary.Project_DustyPlasmaRadiator=<shipmodule>
 TIProjectTemplate.displayName.Project_ExoticSpikeRadiator=Exotic Spike Radiator
 TIProjectTemplate.summary.Project_ExoticSpikeRadiator=<shipmodule>
+TIProjectTemplate.displayName.Project_UltracoldNeutronContainment=Ultracold Neutron Containment
+TIProjectTemplate.summary.Project_UltracoldNeutronContainment=Bottling free neutrons to employ as a catalyst for miniature fission reactions.
 TIProjectTemplate.displayName.Project_Warships=Interplanetary Warships
 TIProjectTemplate.summary.Project_Warships=We design hulls durable enough to carry us into the Solar System.
 TIProjectTemplate.displayName.Project_PatrolVessels=Patrol Vessels
@@ -368,13 +379,15 @@ TIProjectTemplate.summary.Project_AdvancedProspectingSurveys=We improve our abil
 TIProjectTemplate.displayName.Project_MuonSpiker=Muon Spiker
 TIProjectTemplate.summary.Project_MuonSpiker=Muons catalyze nuclear fusion reactions, increasing thrust from our fusion drives.
 TIProjectTemplate.displayName.Project_NeutroniumSpiker=Neutronium Spiker
-TIProjectTemplate.summary.Project_NeutroniumSpiker=Small numbers of free neutrons are generated to catalyze nuclear reactions, increasing thrust from our nuclear drives.
+TIProjectTemplate.summary.Project_NeutroniumSpiker=Small numbers of free neutrons are generated to catalyze nuclear reactions, increasing thrust from our fission drives.
 TIProjectTemplate.displayName.Project_AntimatterSpiker=Antimatter Spiker
 TIProjectTemplate.summary.Project_AntimatterSpiker=Tiny amounts of antimatter are stored and used to catalyze nuclear reactions, providing a significant improvement to thrust.
 TIProjectTemplate.displayName.Project_MobileSpaceScienceLab=Mobile Space Science Lab
 TIProjectTemplate.summary.Project_MobileSpaceScienceLab=We develop a prospecting and research lab module for use on our spacecraft.
 TIProjectTemplate.displayName.Project_RepairBay=Repair Bay
 TIProjectTemplate.summary.Project_RepairBay=We prepare doctrine for specialized damage control teams and facilities on our spacecraft.
+TIProjectTemplate.displayName.Project_SalvageBay=Salvage Bay
+TIProjectTemplate.summary.Project_SalvageBay=A ship module carrying salvage specialists and drones that will increase our haul after space battles.
 TIProjectTemplate.displayName.Project_MarineAssaultUnit=Marine Assault Unit
 TIProjectTemplate.summary.Project_MarineAssaultUnit=A training regimen and ship module design to support space Marines that can assault enemy habitats.
 TIProjectTemplate.displayName.Project_AdvancedMarineAssaultUnit=Advanced Marine Assault Unit
@@ -385,6 +398,8 @@ TIProjectTemplate.displayName.Project_LaserEngine=Laser Engine
 TIProjectTemplate.summary.Project_LaserEngine=A module to increase power for our ship laser weapons.
 TIProjectTemplate.displayName.Project_AdvancedLaserEngine=Advanced Laser Engine
 TIProjectTemplate.summary.Project_AdvancedLaserEngine=A ship module to significantly increase power output from our laser weapons.
+TIProjectTemplate.displayName.Project_Cyclotron=Cyclotron
+TIProjectTemplate.summary.Project_Cyclotron=A ship module to significantly increase power output from our particle weapons.
 TIProjectTemplate.displayName.Project_LiquidHydrogenContainment=Liquid Hydrogen Containment
 TIProjectTemplate.summary.Project_LiquidHydrogenContainment=<shipmodule>
 TIProjectTemplate.displayName.Project_SlushHydrogenTankage=Slush Hydrogen Tankage
@@ -415,6 +430,8 @@ TIProjectTemplate.displayName.Project_AutomatedFissionPlatformKit=Automated Fiss
 TIProjectTemplate.summary.Project_AutomatedFissionPlatformKit=Deploys a fission-powered space station with a supply depot.
 TIProjectTemplate.displayName.Project_AutomatedFissionOutpostKit=Automated Fission Outpost Kit
 TIProjectTemplate.summary.Project_AutomatedFissionOutpostKit=Deploys a fission-powered robotic mining base.
+TIProjectTemplate.displayName.Project_AdministrationNode=Administration Node
+TIProjectTemplate.summary.Project_AdministrationNode=<habmodule>
 TIProjectTemplate.displayName.Project_AntimatterTrap=Antimatter Trap
 TIProjectTemplate.summary.Project_AntimatterTrap=<habmodule>
 TIProjectTemplate.displayName.Project_AntimatterHarvester=Antimatter Harvester
@@ -445,6 +462,8 @@ TIProjectTemplate.displayName.Project_FusionPile=Fusion Pile
 TIProjectTemplate.summary.Project_FusionPile=<habmodule>
 TIProjectTemplate.displayName.Project_HeavyFissionPile=Heavy Fission Pile
 TIProjectTemplate.summary.Project_HeavyFissionPile=<habmodule>
+TIProjectTemplate.displayName.Project_HeavyFusionPile=Heavy Fusion Pile
+TIProjectTemplate.summary.Project_HeavyFusionPile=<habmodule>
 TIProjectTemplate.displayName.Project_HydroponicsBay=Hydroponics Bay
 TIProjectTemplate.summary.Project_HydroponicsBay=<habmodule>
 TIProjectTemplate.displayName.Project_InformationScienceLab=Information Science Lab
@@ -464,6 +483,8 @@ TIProjectTemplate.description.Project_OutpostCore=Bases may be founded at hab si
 TIProjectTemplate.displayName.Project_OutpostMiningComplex=Outpost Mining Complex
 TIProjectTemplate.summary.Project_OutpostMiningComplex=<habmodule>
 TIProjectTemplate.description.Project_OutpostMiningComplex=Mines add space resources to our stockpile. Each base may only have one mine, and they are built in the slot to the north of the core module.
+TIProjectTemplate.displayName.Project_ParticleCollider=Particle Collider
+TIProjectTemplate.summary.Project_ParticleCollider=<habmodule>
 TIProjectTemplate.displayName.Project_PlatformCore=Platform Core
 TIProjectTemplate.summary.Project_PlatformCore=<habmodule>
 TIProjectTemplate.description.Project_PlatformCore=Stations may be founded in orbits. Platforms may have up to four additional small modules.
@@ -503,6 +524,8 @@ TIProjectTemplate.displayName.Project_FusionReactorArray=Fusion Reactor Array
 TIProjectTemplate.summary.Project_FusionReactorArray=<habmodule>
 TIProjectTemplate.displayName.Project_HeavyFissionReactorArray=Heavy Fission Reactor Array
 TIProjectTemplate.summary.Project_HeavyFissionReactorArray=<habmodule>
+TIProjectTemplate.displayName.Project_HeavyFusionReactorArray=Heavy Fusion Reactor Array
+TIProjectTemplate.summary.Project_HeavyFusionReactorArray=<habmodule>
 TIProjectTemplate.displayName.Project_InformationScienceResearchCenter=Information Science Research Center
 TIProjectTemplate.summary.Project_InformationScienceResearchCenter=<habmodule>
 TIProjectTemplate.displayName.Project_LayeredDefenseArray=Layered Defense Array
@@ -519,7 +542,7 @@ TIProjectTemplate.displayName.Project_Nanofactory=Nanofactory
 TIProjectTemplate.summary.Project_Nanofactory=<habmodule>
 TIProjectTemplate.displayName.Project_OperationsCenter=Operations Center
 TIProjectTemplate.summary.Project_OperationsCenter=<habmodule>
-TIProjectTemplate.displayName.Project_OrbitalHospital=Orbital Hospital
+TIProjectTemplate.displayName.Project_OrbitalHospital=Space Medical Center
 TIProjectTemplate.summary.Project_OrbitalHospital=<habmodule>
 TIProjectTemplate.displayName.Project_ResearchCampus=Research Campus
 TIProjectTemplate.summary.Project_ResearchCampus=<habmodule>
@@ -570,12 +593,14 @@ TIProjectTemplate.displayName.Project_Foundry=Foundry
 TIProjectTemplate.summary.Project_Foundry=<habmodule>
 TIProjectTemplate.displayName.Project_FusionReactorFarm=Fusion Reactor Farm
 TIProjectTemplate.summary.Project_FusionReactorFarm=<habmodule>
-TIProjectTemplate.displayName.Project_GeriatricsFacility=Geriatrics Facility
+TIProjectTemplate.displayName.Project_GeriatricsFacility=Space Hospital
 TIProjectTemplate.summary.Project_GeriatricsFacility=<habmodule>
 TIProjectTemplate.displayName.Project_HeavyFissionReactorFarm=Heavy Fission Reactor Farm
 TIProjectTemplate.summary.Project_HeavyFissionReactorFarm=<habmodule>
 TIProjectTemplate.displayName.Project_HeavyFusionReactorFarm=Heavy Fusion Reactor Farm
 TIProjectTemplate.summary.Project_HeavyFusionReactorFarm=<habmodule>
+TIProjectTemplate.displayName.Project_Helium-3Mine=Helium-3 Mine
+TIProjectTemplate.summary.Project_Helium-3Mine=<habmodule>
 TIProjectTemplate.displayName.Project_InformationScienceInstitute=Information Science Institute
 TIProjectTemplate.summary.Project_InformationScienceInstitute=<habmodule>
 TIProjectTemplate.displayName.Project_InterstellarLaunchingLaser=Interstellar Launch Facility
@@ -617,62 +642,68 @@ TIProjectTemplate.displayName.Project_XenoscienceInstitute=Xenoscience Institute
 TIProjectTemplate.summary.Project_XenoscienceInstitute=<habmodule>
 TIProjectTemplate.displayName.Project_AntimatterBeamCoreTorch=Pion Torch
 TIProjectTemplate.summary.Project_AntimatterBeamCoreTorch=<shipmodule>
-TIProjectTemplate.displayName.Project_AdvancedAntimatterPlasmaCoreDrive=Advanced Antimatter Plasma Core Drive
-TIProjectTemplate.summary.Project_AdvancedAntimatterPlasmaCoreDrive=<shipmodule>
-TIProjectTemplate.displayName.Project_AntimatterPlasmaCoreDrive=Antimatter Plasma Core Drive
-TIProjectTemplate.summary.Project_AntimatterPlasmaCoreDrive=<shipmodule>
-TIProjectTemplate.displayName.Project_AntimatterPulsedPlasmaCoreDrive=Antimatter Pulsed Plasma Core Drive
-TIProjectTemplate.summary.Project_AntimatterPulsedPlasmaCoreDrive=<shipmodule>
+TIProjectTemplate.displayName.Project_AdvancedAntimatterPlasmaCoreTorch=Advanced Antimatter Plasma Core Torch
+TIProjectTemplate.summary.Project_AdvancedAntimatterPlasmaCoreTorch=<shipmodule>
+TIProjectTemplate.displayName.Project_AntimatterPlasmaCoreTorch=Antimatter Plasma Core Torch
+TIProjectTemplate.summary.Project_AntimatterPlasmaCoreTorch=<shipmodule>
+TIProjectTemplate.displayName.Project_AntimatterPulsedPlasmaCoreLantern=Antimatter Pulsed Plasma Core Lantern
+TIProjectTemplate.summary.Project_AntimatterPulsedPlasmaCoreLantern=<shipmodule>
 TIProjectTemplate.displayName.Project_AntimatterGasCoreDrive=Antimatter Gas Core Drive
 TIProjectTemplate.summary.Project_AntimatterGasCoreDrive=<shipmodule>
 TIProjectTemplate.displayName.Project_AntimatterSolidCoreDrive=Antimatter Solid Core Drive
 TIProjectTemplate.summary.Project_AntimatterSolidCoreDrive=<shipmodule>
 TIProjectTemplate.displayName.Project_ProtiumConverterTorch=Protium Converter Torch
 TIProjectTemplate.summary.Project_ProtiumConverterTorch=<shipmodule>
-TIProjectTemplate.displayName.Project_ProtiumInertialTorch=Protium Inertial Torch
-TIProjectTemplate.summary.Project_ProtiumInertialTorch=<shipmodule>
-TIProjectTemplate.displayName.Project_BoronInertialTorch=Boron Inertial Torch
-TIProjectTemplate.summary.Project_BoronInertialTorch=<shipmodule>
-TIProjectTemplate.displayName.Project_BoronInertialDrive=Boron Inertial Drive
-TIProjectTemplate.summary.Project_BoronInertialDrive=<shipmodule>
-TIProjectTemplate.displayName.Project_DaedelusTorch=Daedalus Torch
-TIProjectTemplate.summary.Project_DaedelusTorch=<shipmodule>
-TIProjectTemplate.displayName.Project_HelionInertialDrive=Helion Inertial Drive
-TIProjectTemplate.summary.Project_HelionInertialDrive=<shipmodule>
-TIProjectTemplate.displayName.Project_TritonVistaInertialDrive=Triton Vista Inertial Drive
-TIProjectTemplate.summary.Project_TritonVistaInertialDrive=<shipmodule>
-TIProjectTemplate.displayName.Project_TritonHopeInertialDrive=Triton Hope Inertial Drive
-TIProjectTemplate.summary.Project_TritonHopeInertialDrive=<shipmodule>
-TIProjectTemplate.displayName.Project_MagProtiumFusionDrive=Mag Protium Fusion Drive
-TIProjectTemplate.summary.Project_MagProtiumFusionDrive=<shipmodule>
-TIProjectTemplate.displayName.Project_ZetaBoronFusionDrive=Zeta Boron Fusion Drive
-TIProjectTemplate.summary.Project_ZetaBoronFusionDrive=<shipmodule>
-TIProjectTemplate.displayName.Project_ZetaHelionDrive=Zeta Helion Drive
-TIProjectTemplate.summary.Project_ZetaHelionDrive=<shipmodule>
-TIProjectTemplate.displayName.Project_AdvancedHelionReflexDrive=Advanced Helion Reflex Drive
-TIProjectTemplate.summary.Project_AdvancedHelionReflexDrive=<shipmodule>
+TIProjectTemplate.displayName.Project_ProtiumNovaTorch=Protium Nova Torch
+TIProjectTemplate.summary.Project_ProtiumNovaTorch=<shipmodule>
+TIProjectTemplate.displayName.Project_BoraneNovaLantern=Borane Nova Lantern
+TIProjectTemplate.summary.Project_BoraneNovaLantern=<shipmodule>
+TIProjectTemplate.displayName.Project_HelionNovaTorch=Helion Nova Torch
+TIProjectTemplate.summary.Project_HelionNovaTorch=<shipmodule>
+TIProjectTemplate.displayName.Project_HelionNovaLantern=Helion Nova Lantern
+TIProjectTemplate.summary.Project_HelionNovaLantern=<shipmodule>
+TIProjectTemplate.displayName.Project_DeuteronNovaLantern=Deuteron Nova Lantern
+TIProjectTemplate.summary.Project_DeuteronNovaLantern=<shipmodule>
+TIProjectTemplate.displayName.Project_TritonNovaDrive=Triton Nova Drive
+TIProjectTemplate.summary.Project_TritonNovaDrive=<shipmodule>
+TIProjectTemplate.displayName.Project_ZetaBoraneLantern=Zeta Borane Lantern
+TIProjectTemplate.summary.Project_ZetaBoraneLantern=<shipmodule>
+TIProjectTemplate.displayName.Project_ZetaHelionLantern=Zeta Helion Lantern
+TIProjectTemplate.summary.Project_ZetaHelionLantern=<shipmodule>
+TIProjectTemplate.displayName.Project_ZetaDeuteronTorch=Zeta Deuteron Torch
+TIProjectTemplate.summary.Project_ZetaDeuteronTorch=<shipmodule>
+TIProjectTemplate.displayName.Project_ZetaDeuteronDrive=Zeta Deuteron Drive
+TIProjectTemplate.summary.Project_ZetaDeuteronDrive=<shipmodule>
+TIProjectTemplate.displayName.Project_ZetaTritonDrive=Zeta Triton Drive
+TIProjectTemplate.summary.Project_ZetaTritonDrive=<shipmodule>
+TIProjectTemplate.displayName.Project_BoranePlasmajetTorch=Borane Plasmajet Torch
+TIProjectTemplate.summary.Project_BoranePlasmajetTorch=<shipmodule>
+TIProjectTemplate.displayName.Project_HelionPlasmajetLantern=Helion Plasmajet Lantern
+TIProjectTemplate.summary.Project_HelionPlasmajetLantern=<shipmodule>
+TIProjectTemplate.displayName.Project_DeuteronPolywellDrive=Deuteron Polywell Drive
+TIProjectTemplate.summary.Project_DeuteronPolywellDrive=<shipmodule>
+TIProjectTemplate.displayName.Project_TritonPolywellDrive=Triton Polywell Drive
+TIProjectTemplate.summary.Project_TritonPolywellDrive=<shipmodule>
+TIProjectTemplate.displayName.Project_ProtiumTorusLantern=Protium Torus Lantern
+TIProjectTemplate.summary.Project_ProtiumTorusLantern=<shipmodule>
+TIProjectTemplate.displayName.Project_HelionTorusLantern=Helion Torus Lantern
+TIProjectTemplate.summary.Project_HelionTorusLantern=<shipmodule>
+TIProjectTemplate.displayName.Project_DeuteronTorusDrive=Deuteron Torus Drive
+TIProjectTemplate.summary.Project_DeuteronTorusDrive=<shipmodule>
+TIProjectTemplate.displayName.Project_TritonTorusDrive=Triton Torus Drive
+TIProjectTemplate.summary.Project_TritonTorusDrive=<shipmodule>
 TIProjectTemplate.displayName.Project_HelionReflexDrive=Helion Reflex Drive
 TIProjectTemplate.summary.Project_HelionReflexDrive=<shipmodule>
-TIProjectTemplate.displayName.Project_AdvancedHelionTorusDrive=Advanced Helion Torus Drive
-TIProjectTemplate.summary.Project_AdvancedHelionTorusDrive=<shipmodule>
-TIProjectTemplate.displayName.Project_HelionTorusDrive=Helion Torus Drive
-TIProjectTemplate.summary.Project_HelionTorusDrive=<shipmodule>
+TIProjectTemplate.displayName.Project_DeuteronReflexDrive=Deuteron Reflex Drive
+TIProjectTemplate.summary.Project_DeuteronReflexDrive=<shipmodule>
 TIProjectTemplate.displayName.Project_TritonReflexDrive=Triton Reflex Drive
 TIProjectTemplate.summary.Project_TritonReflexDrive=<shipmodule>
-TIProjectTemplate.displayName.Project_TritonTorusDrive=Triton Torus Drive
-TIProjectTemplate.summary.Project_TritonTorusDrive=<shipmodule>
-TIProjectTemplate.displayName.Project_IcarusTorch=Icarus Torch
-TIProjectTemplate.summary.Project_IcarusTorch=<shipmodule>
-TIProjectTemplate.displayName.Project_IcarusDrive=Icarus Drive
-TIProjectTemplate.summary.Project_IcarusDrive=<shipmodule>
-TIProjectTemplate.displayName.Project_HybridFusionDrive=Hybrid Fusion Drive
-TIProjectTemplate.summary.Project_HybridFusionDrive=<shipmodule>
-TIProjectTemplate.displayName.Project_LithiumFusionLantern=Lithium Fusion Lantern
-TIProjectTemplate.summary.Project_LithiumFusionLantern=<shipmodule>
-TIProjectTemplate.displayName.Project_FireflyTorch=Firefly Torch
-TIProjectTemplate.summary.Project_FireflyTorch=<shipmodule>
-TIProjectTemplate.displayName.Project_TritonPulseDrive=Triton Pulse Drive
-TIProjectTemplate.summary.Project_TritonPulseDrive=<shipmodule>
+TIProjectTemplate.displayName.Project_ProtiumFusorDrive=Protium Fusor Drive
+TIProjectTemplate.summary.Project_ProtiumFusorDrive=<shipmodule>
+TIProjectTemplate.displayName.Project_DeuteronFusorDrive=Deuteron Fusor Drive
+TIProjectTemplate.summary.Project_DeuteronFusorDrive=<shipmodule>
+TIProjectTemplate.displayName.Project_TritonFusorDrive=Triton Fusor Drive
+TIProjectTemplate.summary.Project_TritonFusorDrive=<shipmodule>
 TIProjectTemplate.displayName.Project_OrionDrive=Orion Drive
 TIProjectTemplate.summary.Project_OrionDrive=<shipmodule>
 TIProjectTemplate.displayName.Project_AdvancedOrionDrive=H-Orion Drive
@@ -689,10 +720,10 @@ TIProjectTemplate.displayName.Project_Z-pinchMicrofissionDrive=Z-Pinch Microfiss
 TIProjectTemplate.summary.Project_Z-pinchMicrofissionDrive=<shipmodule>
 TIProjectTemplate.displayName.Project_NeutronFluxTorch=Neutron Flux Torch
 TIProjectTemplate.summary.Project_NeutronFluxTorch=<shipmodule>
-TIProjectTemplate.displayName.Project_NeutronFluxDrive=Neutron Flux Drive
-TIProjectTemplate.summary.Project_NeutronFluxDrive=<shipmodule>
-TIProjectTemplate.displayName.Project_FirestarDrive=Firestar Drive
-TIProjectTemplate.summary.Project_FirestarDrive=<shipmodule>
+TIProjectTemplate.displayName.Project_NeutronFluxLantern=Neutron Flux Lantern
+TIProjectTemplate.summary.Project_NeutronFluxLantern=<shipmodule>
+TIProjectTemplate.displayName.Project_FirestarFissionLantern=Firestar Fission Lantern
+TIProjectTemplate.summary.Project_FirestarFissionLantern=<shipmodule>
 TIProjectTemplate.displayName.Project_FlareDrive=Flare Drive
 TIProjectTemplate.summary.Project_FlareDrive=<shipmodule>
 TIProjectTemplate.displayName.Project_BurnerDrive=Burner Drive
@@ -701,8 +732,8 @@ TIProjectTemplate.displayName.Project_DustyPlasmaDrive=Dusty Plasma Drive
 TIProjectTemplate.summary.Project_DustyPlasmaDrive=<shipmodule>
 TIProjectTemplate.displayName.Project_FissionFragDrive=Fission Frag Drive
 TIProjectTemplate.summary.Project_FissionFragDrive=<shipmodule>
-TIProjectTemplate.displayName.Project_FissionLantern=Fission Lantern
-TIProjectTemplate.summary.Project_FissionLantern=<shipmodule>
+TIProjectTemplate.displayName.Project_LodestarFissionLantern=Lodestar Fission Lantern
+TIProjectTemplate.summary.Project_LodestarFissionLantern=<shipmodule>
 TIProjectTemplate.displayName.Project_PharosDrive=Pharos Drive
 TIProjectTemplate.summary.Project_PharosDrive=<shipmodule>
 TIProjectTemplate.displayName.Project_LightbulbDrive=Lightbulb Drive
@@ -721,6 +752,8 @@ TIProjectTemplate.displayName.Project_PegasusDrive=Pegasus Drive
 TIProjectTemplate.summary.Project_PegasusDrive=<shipmodule>
 TIProjectTemplate.displayName.Project_FissionSpinnerDrive=Fission Spinner Drive
 TIProjectTemplate.summary.Project_FissionSpinnerDrive=<shipmodule>
+TIProjectTemplate.displayName.Project_TeardropDrive=Teardrop Drive
+TIProjectTemplate.summary.Project_TeardropDrive=<shipmodule>
 TIProjectTemplate.displayName.Project_LarsDrive=Lars Drive
 TIProjectTemplate.summary.Project_LarsDrive=<shipmodule>
 TIProjectTemplate.displayName.Project_AdvancedPebbleDrive=Particle Drive
@@ -759,7 +792,7 @@ TIProjectTemplate.displayName.Project_E-BeamDrive=E-Beam Drive
 TIProjectTemplate.summary.Project_E-BeamDrive=<shipmodule>
 TIProjectTemplate.displayName.Project_PulsedPlasmoidDrive=Pulsed Plasmoid Drive
 TIProjectTemplate.summary.Project_PulsedPlasmoidDrive=<shipmodule>
-TIProjectTemplate.displayName.Project_PonderomotiveVASIMR=Ponderomotive Drive
+TIProjectTemplate.displayName.Project_PonderomotiveVASIMR=Advanced VASIMR Drive
 TIProjectTemplate.summary.Project_PonderomotiveVASIMR=<shipmodule>
 TIProjectTemplate.displayName.Project_VASIMR=VASIMR
 TIProjectTemplate.summary.Project_VASIMR=<shipmodule>
@@ -819,6 +852,10 @@ TIProjectTemplate.displayName.Project_SolidCoreFissionReactorIX=Compact Solid Co
 TIProjectTemplate.summary.Project_SolidCoreFissionReactorIX=<shipmodule>
 TIProjectTemplate.displayName.Project_SolidCoreFissionReactorX=Compact Solid Core Fission Reactor V
 TIProjectTemplate.summary.Project_SolidCoreFissionReactorX=<shipmodule>
+TIProjectTemplate.displayName.Project_MoltenSaltFissionReactorI=Molten Salt Fission Reactor I
+TIProjectTemplate.summary.Project_MoltenSaltFissionReactorI=<shipmodule>
+TIProjectTemplate.displayName.Project_MoltenSaltFissionReactorII=Molten Salt Fission Reactor II
+TIProjectTemplate.summary.Project_MoltenSaltFissionReactorII=<shipmodule>
 TIProjectTemplate.displayName.Project_MoltenCoreFissionReactorI=Molten Core Fission Reactor I
 TIProjectTemplate.summary.Project_MoltenCoreFissionReactorI=<shipmodule>
 TIProjectTemplate.displayName.Project_MoltenCoreFissionReactorII=Molten Core Fission Reactor II
@@ -847,10 +884,6 @@ TIProjectTemplate.displayName.Project_FissionFragmentReactor=Fission Fragment Re
 TIProjectTemplate.summary.Project_FissionFragmentReactor=<shipmodule>
 TIProjectTemplate.displayName.Project_DustyPlasmaReactor=Dusty Plasma Reactor
 TIProjectTemplate.summary.Project_DustyPlasmaReactor=<shipmodule>
-TIProjectTemplate.displayName.Project_SaltWaterCoreReactorI=Salt Water Core Reactor I
-TIProjectTemplate.summary.Project_SaltWaterCoreReactorI=<shipmodule>
-TIProjectTemplate.displayName.Project_SaltWaterCoreReactorII=Salt Water Core Reactor II
-TIProjectTemplate.summary.Project_SaltWaterCoreReactorII=<shipmodule>
 TIProjectTemplate.displayName.Project_ElectrostaticConfinementFusionReactorI=Electrostatic Confinement Fusion Reactor I
 TIProjectTemplate.summary.Project_ElectrostaticConfinementFusionReactorI=<shipmodule>
 TIProjectTemplate.displayName.Project_ElectrostaticConfinementFusionReactorII=Electrostatic Confinement Fusion Reactor II
@@ -863,12 +896,16 @@ TIProjectTemplate.displayName.Project_ZPinchFusionReactorII=Z-Pinch Fusion React
 TIProjectTemplate.summary.Project_ZPinchFusionReactorII=<shipmodule>
 TIProjectTemplate.displayName.Project_ZPinchFusionReactorIII=Z-Pinch Fusion Reactor III
 TIProjectTemplate.summary.Project_ZPinchFusionReactorIII=<shipmodule>
+TIProjectTemplate.displayName.Project_ZPinchFusionReactorIV=Z-Pinch Fusion Reactor IV
+TIProjectTemplate.summary.Project_ZPinchFusionReactorIV=<shipmodule>
 TIProjectTemplate.displayName.Project_HybridConfinementFusionReactorI=Hybrid Confinement Fusion Reactor I
 TIProjectTemplate.summary.Project_HybridConfinementFusionReactorI=<shipmodule>
 TIProjectTemplate.displayName.Project_HybridConfinementFusionReactorII=Hybrid Confinement Fusion Reactor II
 TIProjectTemplate.summary.Project_HybridConfinementFusionReactorII=<shipmodule>
 TIProjectTemplate.displayName.Project_HybridConfinementFusionReactorIII=Hybrid Confinement Fusion Reactor III
 TIProjectTemplate.summary.Project_HybridConfinementFusionReactorIII=<shipmodule>
+TIProjectTemplate.displayName.Project_HybridConfinementFusionReactorIV=Hybrid Confinement Fusion Reactor IV
+TIProjectTemplate.summary.Project_HybridConfinementFusionReactorIV=<shipmodule>
 TIProjectTemplate.displayName.Project_FusionTokamakI=Fusion Tokamak I
 TIProjectTemplate.summary.Project_FusionTokamakI=<shipmodule>
 TIProjectTemplate.displayName.Project_FusionTokamakII=Fusion Tokamak II
@@ -893,13 +930,13 @@ TIProjectTemplate.displayName.Project_InertialConfinementFusionReactorII=Inertia
 TIProjectTemplate.summary.Project_InertialConfinementFusionReactorII=<shipmodule>
 TIProjectTemplate.displayName.Project_InertialConfinementFusionReactorIII=Inertial Confinement Fusion Reactor III
 TIProjectTemplate.summary.Project_InertialConfinementFusionReactorIII=<shipmodule>
-TIProjectTemplate.displayName.Project_InertialConfinementFusionReactorIV=Heavy Inertial Confinement Fusion Reactor
+TIProjectTemplate.displayName.Project_InertialConfinementFusionReactorIV=Inertial Confinement Fusion Reactor IV
 TIProjectTemplate.summary.Project_InertialConfinementFusionReactorIV=<shipmodule>
-TIProjectTemplate.displayName.Project_InertialConfinementFusionReactorV=Inertial Confinement Terawatt Fusion Reactor I
+TIProjectTemplate.displayName.Project_InertialConfinementFusionReactorV=Inertial Confinement Fusion Reactor V
 TIProjectTemplate.summary.Project_InertialConfinementFusionReactorV=<shipmodule>
-TIProjectTemplate.displayName.Project_InertialConfinementFusionReactorVI=Inertial Confinement Terawatt Fusion Reactor II
+TIProjectTemplate.displayName.Project_InertialConfinementFusionReactorVI=Inertial Confinement Fusion Reactor VI
 TIProjectTemplate.summary.Project_InertialConfinementFusionReactorVI=<shipmodule>
-TIProjectTemplate.displayName.Project_InertialConfinementFusionReactorVII=Inertial Confinement Terawatt Fusion Reactor III
+TIProjectTemplate.displayName.Project_InertialConfinementFusionReactorVII=Inertial Confinement Fusion Reactor VII
 TIProjectTemplate.summary.Project_InertialConfinementFusionReactorVII=<shipmodule>
 TIProjectTemplate.displayName.Project_AntimatterSolidCoreReactor=Antimatter Solid Core Reactor
 TIProjectTemplate.summary.Project_AntimatterSolidCoreReactor=<shipmodule>
@@ -913,44 +950,36 @@ TIProjectTemplate.displayName.Project_AntimatterPlasmaCoreReactorIII=Antimatter
 TIProjectTemplate.summary.Project_AntimatterPlasmaCoreReactorIII=<shipmodule>
 TIProjectTemplate.displayName.Project_AntimatterBeamCoreReactor=Antimatter Beam Core Reactor
 TIProjectTemplate.summary.Project_AntimatterBeamCoreReactor=<shipmodule>
-TIProjectTemplate.displayName.Project_AnacondaMissileBay=Anaconda Missiles
-TIProjectTemplate.summary.Project_AnacondaMissileBay=<shipmodule>
-TIProjectTemplate.displayName.Project_CobraMissileBay=Cobra Missiles
-TIProjectTemplate.summary.Project_CobraMissileBay=<shipmodule>
-TIProjectTemplate.displayName.Project_CopperheadMissileBay=Copperhead Missiles
-TIProjectTemplate.summary.Project_CopperheadMissileBay=<shipmodule>
-TIProjectTemplate.displayName.Project_HarlequinMissileBay=Harlequin Missiles
-TIProjectTemplate.summary.Project_HarlequinMissileBay=<shipmodule>
-TIProjectTemplate.displayName.Project_KeelbackMissileBay=Keelback Missiles
-TIProjectTemplate.summary.Project_KeelbackMissileBay=<shipmodule>
-TIProjectTemplate.displayName.Project_LanceheadMissileBay=Lancehead Missiles
-TIProjectTemplate.summary.Project_LanceheadMissileBay=<shipmodule>
-TIProjectTemplate.displayName.Project_RattlerMissileBay=Rattler Missiles
-TIProjectTemplate.summary.Project_RattlerMissileBay=<shipmodule>
-TIProjectTemplate.displayName.Project_RiverjackMissileBay=Riverjack Missiles
-TIProjectTemplate.summary.Project_RiverjackMissileBay=<shipmodule>
-TIProjectTemplate.displayName.Project_ViperMissileBay=Viper Missiles
-TIProjectTemplate.summary.Project_ViperMissileBay=<shipmodule>
-TIProjectTemplate.displayName.Project_HeraTorpedoBay=Hera Torpedoes
-TIProjectTemplate.summary.Project_HeraTorpedoBay=<shipmodule>
-TIProjectTemplate.displayName.Project_ArtemisTorpedoBay=Artemis Torpedoes
-TIProjectTemplate.summary.Project_ArtemisTorpedoBay=<shipmodule>
-TIProjectTemplate.displayName.Project_AthenaTorpedoBay=Athena Torpedoes
-TIProjectTemplate.summary.Project_AthenaTorpedoBay=<shipmodule>
-TIProjectTemplate.displayName.Project_HermesTorpedoBay=Hermes Torpedoes
-TIProjectTemplate.summary.Project_HermesTorpedoBay=<shipmodule>
-TIProjectTemplate.displayName.Project_VulcanTorpedoBay=Vulcan Torpedoes
-TIProjectTemplate.summary.Project_VulcanTorpedoBay=<shipmodule>
-TIProjectTemplate.displayName.Project_AresTorpedoBay=Ares Torpedoes
-TIProjectTemplate.summary.Project_AresTorpedoBay=<shipmodule>
-TIProjectTemplate.displayName.Project_CerebrusNuclearTorpedoBay=Cerberus Nuclear Torpedoes
+TIProjectTemplate.displayName.Project_AnacondaMissileBay=Hypergolic Explosive Warhead Missiles
+TIProjectTemplate.summary.Project_AnacondaMissileBay=Explosive warheads maximize damage to a ship's armor.
+TIProjectTemplate.displayName.Project_CopperheadMissileBay=Hydrolox Explosive Warhead Missiles
+TIProjectTemplate.summary.Project_CopperheadMissileBay=Hydrolox offers greater missile performance than hypergolic fuels.
+TIProjectTemplate.displayName.Project_HarlequinMissileBay=Hypergolic Penetrator Warhead Missiles
+TIProjectTemplate.summary.Project_HarlequinMissileBay=Penetrator warheads rely on kinetic energy to maximize damage.
+TIProjectTemplate.displayName.Project_LanceheadMissileBay=Hydrolox Penetrator Warhead Missiles
+TIProjectTemplate.summary.Project_LanceheadMissileBay=High-performance missiles that can be deadly on contact with enemy ships.
+TIProjectTemplate.displayName.Project_RattlerMissileBay=Hypergolic Fragmentation Warhead Missiles
+TIProjectTemplate.summary.Project_RattlerMissileBay=Frag warheads offer multiple chances to penetrate enemy armor on a hit. These missiles can also be used in a defensive role.
+TIProjectTemplate.displayName.Project_ViperMissileBay=Hydrolox Fragmentation Warhead Missiles
+TIProjectTemplate.summary.Project_ViperMissileBay=High performance fragmentation missiles that can also be used to intercept enemy missiles.
+TIProjectTemplate.displayName.Project_AthenaTorpedoBay=Nuclear-Powered Explosive Warhead Torpedoes
+TIProjectTemplate.summary.Project_AthenaTorpedoBay=A tiny solid-core nuclear reactor powers these extended-range missiles.
+TIProjectTemplate.displayName.Project_AresTorpedoBay=Nuclear-Powered Penetrator Warhead Torpedoes
+TIProjectTemplate.summary.Project_AresTorpedoBay=A nuclear thruster offers better performance than conventional fuels.
+TIProjectTemplate.displayName.Project_CerebrusNuclearTorpedoBay=Hypergolic-Fueled Nuclear Torpedoes
 TIProjectTemplate.summary.Project_CerebrusNuclearTorpedoBay=<shipmodule>
-TIProjectTemplate.displayName.Project_HadesNuclearTorpedoBay=Hades Nuclear Torpedoes
-TIProjectTemplate.summary.Project_HadesNuclearTorpedoBay=<shipmodule>
+TIProjectTemplate.displayName.Project_HadesNuclearTorpedoBay=Hydrolox-Fueled Nuclear Missiles
+TIProjectTemplate.summary.Project_HadesNuclearTorpedoBay=Nuclear detonations in space aren't as deadly as on Earth, but they are deadly enough.
 TIProjectTemplate.displayName.Project_NemesisNuclearTorpedoBay=Nemesis Nuclear Torpedoes
 TIProjectTemplate.summary.Project_NemesisNuclearTorpedoBay=<shipmodule>
-TIProjectTemplate.displayName.Project_OlympusNuclearTorpedoBay=Olympus Shaped-Nuclear Torpedoes
-TIProjectTemplate.summary.Project_OlympusNuclearTorpedoBay=<shipmodule>
+TIProjectTemplate.displayName.Project_OlympusNuclearTorpedoBay=Shaped-Charge Nuclear Missiles
+TIProjectTemplate.summary.Project_OlympusNuclearTorpedoBay=Shaped-charge warheads confine the damaging energy of a nuclear explosion in a narrow cone, threatening distant targets in their path.
+TIProjectTemplate.displayName.Project_AcheronNuclearTorpedoBay=Acheron Shaped-Nuclear Torpedoes
+TIProjectTemplate.summary.Project_AcheronNuclearTorpedoBay=<shipmodule>
+TIProjectTemplate.displayName.Project_TartarusNuclearTorpedoBay=Tartarus Shaped-Nuclear Torpedoes
+TIProjectTemplate.summary.Project_TartarusNuclearTorpedoBay=<shipmodule>
+TIProjectTemplate.displayName.Project_StyxNuclearTorpedoBay=Styx Shaped-Nuclear Torpedoes
+TIProjectTemplate.summary.Project_StyxNuclearTorpedoBay=<shipmodule>
 TIProjectTemplate.displayName.Project_AntimatterTorpedoLauncher=Antimatter Torpedoes
 TIProjectTemplate.summary.Project_AntimatterTorpedoLauncher=<shipmodule>
 TIProjectTemplate.displayName.Project_PotassiumHeatSink=Potassium Heat Sinks
@@ -964,265 +993,99 @@ TIProjectTemplate.summary.Project_MoltenSaltHeatSink=<shipmodule>
 TIProjectTemplate.displayName.Project_ExoticHeatSink=Exotic Heat Sinks
 TIProjectTemplate.summary.Project_ExoticHeatSink=<shipmodule>
 TIProjectTemplate.displayName.Project_PlasmaBatteryMk1=Plasma Batteries
-TIProjectTemplate.summary.Project_PlasmaBatteryMk1=<shipmodule>
-TIProjectTemplate.displayName.Project_HeavyPlasmaBatteryMk1=Heavy Plasma Batteries
-TIProjectTemplate.summary.Project_HeavyPlasmaBatteryMk1=<shipmodule>
+TIProjectTemplate.summary.Project_PlasmaBatteryMk1=Large and heavy, these highly accurate weapons can degrade enemy armor during an engagement.
 TIProjectTemplate.displayName.Project_PlasmaCannonMk1=Plasma Cannon
-TIProjectTemplate.summary.Project_PlasmaCannonMk1=<shipmodule>
-TIProjectTemplate.displayName.Project_HeavyPlasmaCannonMk1=Heavy Plasma Cannon
-TIProjectTemplate.summary.Project_HeavyPlasmaCannonMk1=<shipmodule>
+TIProjectTemplate.summary.Project_PlasmaCannonMk1=Nose-mounted plasma weaponry offers increased range and damage over their turreted counterparts.
 TIProjectTemplate.displayName.Project_PlasmaBatteryMk2=Improved Plasma Batteries
-TIProjectTemplate.summary.Project_PlasmaBatteryMk2=<shipmodule>
-TIProjectTemplate.displayName.Project_HeavyPlasmaBatteryMk2=Improved Heavy Plasma Batteries
-TIProjectTemplate.summary.Project_HeavyPlasmaBatteryMk2=<shipmodule>
+TIProjectTemplate.summary.Project_PlasmaBatteryMk2=Second-generation plasma batteries offer improved range and higher rate of fire.
 TIProjectTemplate.displayName.Project_PlasmaCannonMk2=Improved Plasma Cannon
-TIProjectTemplate.summary.Project_PlasmaCannonMk2=<shipmodule>
-TIProjectTemplate.displayName.Project_HeavyPlasmaCannonMk2=Improved Heavy Plasma Cannon
-TIProjectTemplate.summary.Project_HeavyPlasmaCannonMk2=<shipmodule>
+TIProjectTemplate.summary.Project_PlasmaCannonMk2=Second-generation plasma cannon allow for targeting enemies at standoff ranges.
 TIProjectTemplate.displayName.Project_PlasmaBatteryMk3=Advanced Plasma Batteries
-TIProjectTemplate.summary.Project_PlasmaBatteryMk3=<shipmodule>
-TIProjectTemplate.displayName.Project_HeavyPlasmaBatteryMk3=Advanced Heavy Plasma Batteries
-TIProjectTemplate.summary.Project_HeavyPlasmaBatteryMk3=<shipmodule>
+TIProjectTemplate.summary.Project_PlasmaBatteryMk3=Advanced plasma turrets capable of immense damage at range.
 TIProjectTemplate.displayName.Project_PlasmaCannonMk3=Advanced Plasma Cannon
-TIProjectTemplate.summary.Project_PlasmaCannonMk3=<shipmodule>
-TIProjectTemplate.displayName.Project_HeavyPlasmaCannonMk3=Advanced Heavy Plasma Cannon
-TIProjectTemplate.summary.Project_HeavyPlasmaCannonMk3=<shipmodule>
-TIProjectTemplate.displayName.Project_PointDefenseParticleBeam=Point Defense Particle Beam
-TIProjectTemplate.summary.Project_PointDefenseParticleBeam=<shipmodule>
-TIProjectTemplate.displayName.Project_ParticleCannonMk1=Particle Cannon
-TIProjectTemplate.summary.Project_ParticleCannonMk1=<shipmodule>
-TIProjectTemplate.displayName.Project_HeavyParticleCannonMk1=Heavy Particle Cannon
-TIProjectTemplate.summary.Project_HeavyParticleCannonMk1=<shipmodule>
-TIProjectTemplate.displayName.Project_SpinalParticleCannonMk1=Spinal Mount Particle Cannon
-TIProjectTemplate.summary.Project_SpinalParticleCannonMk1=<shipmodule>
-TIProjectTemplate.displayName.Project_ParticleCannonMk2=Improved Particle Cannon
-TIProjectTemplate.summary.Project_ParticleCannonMk2=<shipmodule>
-TIProjectTemplate.displayName.Project_HeavyParticleCannonMk2=Improved Heavy Particle Cannon
-TIProjectTemplate.summary.Project_HeavyParticleCannonMk2=<shipmodule>
-TIProjectTemplate.displayName.Project_SpinalParticleCannonMk2=Improved Spinal Mount Particle Cannon
-TIProjectTemplate.summary.Project_SpinalParticleCannonMk2=<shipmodule>
-TIProjectTemplate.displayName.Project_ParticleCannonMk3=Advanced Particle Cannon
-TIProjectTemplate.summary.Project_ParticleCannonMk3=<shipmodule>
-TIProjectTemplate.displayName.Project_HeavyParticleCannonMk3=Advanced Heavy Particle Cannon
-TIProjectTemplate.summary.Project_HeavyParticleCannonMk3=<shipmodule>
-TIProjectTemplate.displayName.Project_SpinalParticleCannonMk3=Advanced Spinal Mount Particle Cannon
-TIProjectTemplate.summary.Project_SpinalParticleCannonMk3=<shipmodule>
-TIProjectTemplate.displayName.Project_LightRailgunBatteryMk1=Light Railgun Batteries
-TIProjectTemplate.summary.Project_LightRailgunBatteryMk1=<shipmodule>
+TIProjectTemplate.summary.Project_PlasmaCannonMk3=Advanced nose-mount plasma emitter capable of hitting targets at extreme distances.
+TIProjectTemplate.displayName.Project_EBeamBatteries=E-Beam Batteries
+TIProjectTemplate.summary.Project_EBeamBatteries=Our first attempt to weaponize particle beams, electron beams are shorter-range weapons that can penetrate most armor and disable enemy electronics and crew.
+TIProjectTemplate.displayName.Project_ElectronLance=Electron Lance
+TIProjectTemplate.summary.Project_ElectronLance=Cannon-sized electron particle beams can penetrate most armor and disable enemy electronics and crew.
+TIProjectTemplate.displayName.Project_IonBatteries=Ion Batteries
+TIProjectTemplate.summary.Project_IonBatteries=Turreted linear accelerators firing pulses of armor-piercing charged particles to disrupt enemy electronics and disable crew members.
+TIProjectTemplate.displayName.Project_IonCannon=Ion Cannon
+TIProjectTemplate.summary.Project_IonCannon=Nose-mount linear accelerators firing pulses of armor-piercing charged particles to disrupt enemy electronics and disable crew members.
+TIProjectTemplate.displayName.Project_ParticleBeamBatteries=Particle Beam Batteries
+TIProjectTemplate.summary.Project_ParticleBeamBatteries=Turreted linear accelerators that fire armor-piercing, long-range neutralized particles to disrupt enemy electronics and disable crew members.
+TIProjectTemplate.displayName.Project_ParticleLance=Particle Lance
+TIProjectTemplate.summary.Project_ParticleLance=Keel-mounted linear accelerators that fire armor-piercing, long-range neutralized particles to disrupt enemy electronics and disable crew members.
+TIProjectTemplate.displayName.Project_AntimatterParticleCannon=Antimatter Particle Cannon
+TIProjectTemplate.summary.Project_AntimatterParticleCannon=Nose-mounted linear accelerators that fire armor-piercing, long-range antimatter beams that inflict massive damage on our enemies.
+TIProjectTemplate.displayName.Project_SpinalNeutronLance=Spinal Neutron Lance
+TIProjectTemplate.summary.Project_SpinalNeutronLance=<shipmodule>
 TIProjectTemplate.displayName.Project_RailgunBatteryMk1=Railgun Batteries
-TIProjectTemplate.summary.Project_RailgunBatteryMk1=<shipmodule>
-TIProjectTemplate.displayName.Project_HeavyRailgunBatteryMk1=Heavy Railgun Batteries
-TIProjectTemplate.summary.Project_HeavyRailgunBatteryMk1=<shipmodule>
+TIProjectTemplate.summary.Project_RailgunBatteryMk1=A series of magnetic railgun turrets able to accelerate projectiles faster than conventional guns.
 TIProjectTemplate.displayName.Project_RailCannonMk1=Rail Cannon
-TIProjectTemplate.summary.Project_RailCannonMk1=<shipmodule>
-TIProjectTemplate.displayName.Project_SpinalRailgunMk1=Spinal Mount Railguns
-TIProjectTemplate.summary.Project_SpinalRailgunMk1=<shipmodule>
-TIProjectTemplate.displayName.Project_LightRailgunBatteryMk2=Improved Light Railgun Batteries
-TIProjectTemplate.summary.Project_LightRailgunBatteryMk2=<shipmodule>
+TIProjectTemplate.summary.Project_RailCannonMk1=A selection of large railguns to be mounted along the keel of our warships.
 TIProjectTemplate.displayName.Project_RailgunBatteryMk2=Improved Railgun Batteries
-TIProjectTemplate.summary.Project_RailgunBatteryMk2=<shipmodule>
-TIProjectTemplate.displayName.Project_HeavyRailgunBatteryMk2=Improved Heavy Railgun Batteries
-TIProjectTemplate.summary.Project_HeavyRailgunBatteryMk2=<shipmodule>
+TIProjectTemplate.summary.Project_RailgunBatteryMk2=A series of enhanced railgun turrets featuring greater muzzle velocity and larger warheads. 
 TIProjectTemplate.displayName.Project_RailCannonMk2=Improved Rail Cannon
-TIProjectTemplate.summary.Project_RailCannonMk2=<shipmodule>
-TIProjectTemplate.displayName.Project_SpinalRailgunMk2=Improved Spinal Mount Railguns
-TIProjectTemplate.summary.Project_SpinalRailgunMk2=<shipmodule>
-TIProjectTemplate.displayName.Project_LightRailgunBatteryMk3=Advanced Light Railgun Batteries
-TIProjectTemplate.summary.Project_LightRailgunBatteryMk3=<shipmodule>
+TIProjectTemplate.summary.Project_RailCannonMk2=A series of enhanced rail cannon firing larger and faster shells.
 TIProjectTemplate.displayName.Project_RailgunBatteryMk3=Advanced Railgun Batteries
-TIProjectTemplate.summary.Project_RailgunBatteryMk3=<shipmodule>
-TIProjectTemplate.displayName.Project_HeavyRailgunBatteryMk3=Advanced Heavy Railgun Batteries
-TIProjectTemplate.summary.Project_HeavyRailgunBatteryMk3=<shipmodule>
+TIProjectTemplate.summary.Project_RailgunBatteryMk3=The best railgun turrets science can develop.
 TIProjectTemplate.displayName.Project_RailCannonMk3=Advanced Rail Cannon
-TIProjectTemplate.summary.Project_RailCannonMk3=<shipmodule>
-TIProjectTemplate.displayName.Project_SpinalRailgunMk3=Advanced Spinal Mount Railguns
-TIProjectTemplate.summary.Project_SpinalRailgunMk3=<shipmodule>
-TIProjectTemplate.displayName.Project_LightCoilgunBatteryMk1=Light Coilgun Batteries
-TIProjectTemplate.summary.Project_LightCoilgunBatteryMk1=<shipmodule>
+TIProjectTemplate.summary.Project_RailCannonMk3=Third-generation rail cannon offer extreme muzzle velocities.
 TIProjectTemplate.displayName.Project_CoilgunBatteryMk1=Coilgun Batteries
-TIProjectTemplate.summary.Project_CoilgunBatteryMk1=<shipmodule>
-TIProjectTemplate.displayName.Project_HeavyCoilgunBatteryMk1=Heavy Coilgun Batteries
-TIProjectTemplate.summary.Project_HeavyCoilgunBatteryMk1=<shipmodule>
+TIProjectTemplate.summary.Project_CoilgunBatteryMk1=A series of magnetic weapon turrets that feature a higher rate of fire than railguns could manage.
 TIProjectTemplate.displayName.Project_CoilCannonMk1=Coil Cannon
-TIProjectTemplate.summary.Project_CoilCannonMk1=<shipmodule>
-TIProjectTemplate.displayName.Project_SpinalCoilerMk1=Spinal Mount Coilgun
-TIProjectTemplate.summary.Project_SpinalCoilerMk1=<shipmodule>
-TIProjectTemplate.displayName.Project_LightCoilgunBatteryMk2=Improved Light Coilgun Batteries
-TIProjectTemplate.summary.Project_LightCoilgunBatteryMk2=<shipmodule>
+TIProjectTemplate.summary.Project_CoilCannonMk1=A selection of nose-mounted magnetic cannon deadlier than what railgun technology could offer.
 TIProjectTemplate.displayName.Project_CoilgunBatteryMk2=Improved Coilgun Batteries
-TIProjectTemplate.summary.Project_CoilgunBatteryMk2=<shipmodule>
-TIProjectTemplate.displayName.Project_HeavyCoilgunBatteryMk2=Improved Heavy Coilgun Batteries
-TIProjectTemplate.summary.Project_HeavyCoilgunBatteryMk2=<shipmodule>
+TIProjectTemplate.summary.Project_CoilgunBatteryMk2=Second-generation coilgun turrets offer increased rate of fire.
 TIProjectTemplate.displayName.Project_CoilCannonMk2=Improved Coil Cannon
-TIProjectTemplate.summary.Project_CoilCannonMk2=<shipmodule>
-TIProjectTemplate.displayName.Project_SpinalCoilerMk2=Improved Spinal Mount Coilgun
-TIProjectTemplate.summary.Project_SpinalCoilerMk2=<shipmodule>
-TIProjectTemplate.displayName.Project_LightCoilgunBatteryMk3=Advanced Light Coilgun Batteries
-TIProjectTemplate.summary.Project_LightCoilgunBatteryMk3=<shipmodule>
+TIProjectTemplate.summary.Project_CoilCannonMk2=A series of enhanced forward-firing coilguns.
 TIProjectTemplate.displayName.Project_CoilgunBatteryMk3=Advanced Coilgun Batteries
-TIProjectTemplate.summary.Project_CoilgunBatteryMk3=<shipmodule>
-TIProjectTemplate.displayName.Project_HeavyCoilgunBatteryMk3=Advanced Heavy Coilgun Batteries
-TIProjectTemplate.summary.Project_HeavyCoilgunBatteryMk3=<shipmodule>
+TIProjectTemplate.summary.Project_CoilgunBatteryMk3=Third-generation coilguns feature the best muzzle velocity and warhead size we can mount in a turret.
 TIProjectTemplate.displayName.Project_CoilCannonMk3=Advanced Coil Cannon
-TIProjectTemplate.summary.Project_CoilCannonMk3=<shipmodule>
-TIProjectTemplate.displayName.Project_SpinalCoilerMk3=Advanced Spinal Mount Coilgun
-TIProjectTemplate.summary.Project_SpinalCoilerMk3=<shipmodule>
-TIProjectTemplate.displayName.Project_LightRailCannonMk1=Light Rail Cannon
-TIProjectTemplate.summary.Project_LightRailCannonMk1=<shipmodule>
-TIProjectTemplate.displayName.Project_LightRailCannonMk2=Improved Light Rail Cannon
-TIProjectTemplate.summary.Project_LightRailCannonMk2=<shipmodule>
-TIProjectTemplate.displayName.Project_LightRailCannonMk3=Advanced Light Rail Cannon
-TIProjectTemplate.summary.Project_LightRailCannonMk3=<shipmodule>
-TIProjectTemplate.displayName.Project_LightCoilCannonMk1=Light Coil Cannon
-TIProjectTemplate.summary.Project_LightCoilCannonMk1=<shipmodule>
-TIProjectTemplate.displayName.Project_LightCoilCannonMk2=Improved Light Coil Cannon
-TIProjectTemplate.summary.Project_LightCoilCannonMk2=<shipmodule>
-TIProjectTemplate.displayName.Project_LightCoilCannonMk3=Advanced Light Coil Cannon
-TIProjectTemplate.summary.Project_LightCoilCannonMk3=<shipmodule>
-TIProjectTemplate.displayName.Project_HeavyRailCannonMk1=Heavy Rail Cannon
-TIProjectTemplate.summary.Project_HeavyRailCannonMk1=<shipmodule>
-TIProjectTemplate.displayName.Project_HeavyRailCannonMk2=Improved Heavy Rail Cannon
-TIProjectTemplate.summary.Project_HeavyRailCannonMk2=<shipmodule>
-TIProjectTemplate.displayName.Project_HeavyRailCannonMk3=Advanced Heavy Rail Cannon
-TIProjectTemplate.summary.Project_HeavyRailCannonMk3=<shipmodule>
-TIProjectTemplate.displayName.Project_HeavyCoilCannonMk1=Heavy Coil Cannon
-TIProjectTemplate.summary.Project_HeavyCoilCannonMk1=<shipmodule>
-TIProjectTemplate.displayName.Project_HeavyCoilCannonMk2=Improved Heavy Coil Cannon
-TIProjectTemplate.summary.Project_HeavyCoilCannonMk2=<shipmodule>
-TIProjectTemplate.displayName.Project_HeavyCoilCannonMk3=Advanced Heavy Coil Cannon
-TIProjectTemplate.summary.Project_HeavyCoilCannonMk3=<shipmodule>
+TIProjectTemplate.summary.Project_CoilCannonMk3=Third-generation coilgun nose mounts represent the pinnacle of what we can achieve with magnetic weaponry.
 TIProjectTemplate.displayName.Project_PointDefenseLaserTurret=Point Defense Laser Turrets
 TIProjectTemplate.summary.Project_PointDefenseLaserTurret=<shipmodule>
-TIProjectTemplate.displayName.Project_60cmIRLaserBattery=Light IR Laser Batteries
-TIProjectTemplate.summary.Project_60cmIRLaserBattery=<shipmodule>
-TIProjectTemplate.displayName.Project_120cmIRLaserBattery=Medium IR Laser Batteries
-TIProjectTemplate.summary.Project_120cmIRLaserBattery=<shipmodule>
-TIProjectTemplate.displayName.Project_360cmIRLaserBattery=Heavy IR Laser Batteries
-TIProjectTemplate.summary.Project_360cmIRLaserBattery=<shipmodule>
-TIProjectTemplate.displayName.Project_240cmIRLaserCannon=Light IR Laser Cannon
-TIProjectTemplate.summary.Project_240cmIRLaserCannon=<shipmodule>
-TIProjectTemplate.displayName.Project_480cmIRLaserCannon=Medium IR Laser Cannon
-TIProjectTemplate.summary.Project_480cmIRLaserCannon=<shipmodule>
-TIProjectTemplate.displayName.Project_720cmIRLaserCannon=Heavy IR Laser Cannon
-TIProjectTemplate.summary.Project_720cmIRLaserCannon=<shipmodule>
-TIProjectTemplate.displayName.Project_960cmIRLaserCannon=Superheavy IR Laser Cannon
-TIProjectTemplate.summary.Project_960cmIRLaserCannon=<shipmodule>
+TIProjectTemplate.displayName.Project_60cmIRLaserBattery=Infrared Laser Batteries
+TIProjectTemplate.summary.Project_60cmIRLaserBattery=A series of short-range laser turrets.
+TIProjectTemplate.displayName.Project_240cmIRLaserCannon=Infrared Laser Cannon
+TIProjectTemplate.summary.Project_240cmIRLaserCannon=A series of short-range nose-mounted laser cannon.
 TIProjectTemplate.displayName.Project_PointDefenseArcLaserTurret=Point Defense Arc Laser Turrets
 TIProjectTemplate.summary.Project_PointDefenseArcLaserTurret=<shipmodule>
-TIProjectTemplate.displayName.Project_60cmIRArcLaserBattery=Light IR Arc Laser Batteries
-TIProjectTemplate.summary.Project_60cmIRArcLaserBattery=<shipmodule>
-TIProjectTemplate.displayName.Project_120cmIRArcLaserBattery=Medium IR Arc Laser Batteries
-TIProjectTemplate.summary.Project_120cmIRArcLaserBattery=<shipmodule>
-TIProjectTemplate.displayName.Project_360cmIRArcLaserBattery=Heavy IR Arc Laser Batteries
-TIProjectTemplate.summary.Project_360cmIRArcLaserBattery=<shipmodule>
-TIProjectTemplate.displayName.Project_240cmIRArcLaserCannon=Light IR Arc Laser Cannon
-TIProjectTemplate.summary.Project_240cmIRArcLaserCannon=<shipmodule>
-TIProjectTemplate.displayName.Project_480cmIRArcLaserCannon=Medium IR Arc Laser Cannon
-TIProjectTemplate.summary.Project_480cmIRArcLaserCannon=<shipmodule>
-TIProjectTemplate.displayName.Project_720cmIRArcLaserCannon=Heavy IR Arc Laser Cannon
-TIProjectTemplate.summary.Project_720cmIRArcLaserCannon=<shipmodule>
-TIProjectTemplate.displayName.Project_960cmIRArcLaserCannon=Superheavy IR Arc Laser Cannon
-TIProjectTemplate.summary.Project_960cmIRArcLaserCannon=<shipmodule>
+TIProjectTemplate.displayName.Project_60cmIRArcLaserBattery=Infrared Arc Laser Batteries
+TIProjectTemplate.summary.Project_60cmIRArcLaserBattery=A series of enhanced laser turrets.
+TIProjectTemplate.displayName.Project_240cmIRArcLaserCannon=Infrared Arc Laser Cannon
+TIProjectTemplate.summary.Project_240cmIRArcLaserCannon=A series of enhanced laser cannon.
 TIProjectTemplate.displayName.Project_PointDefensePhaserTurret=Point Defense Phaser Turrets
 TIProjectTemplate.summary.Project_PointDefensePhaserTurret=<shipmodule>
-TIProjectTemplate.displayName.Project_60cmIRPhaserBattery=Light IR Phaser Batteries
-TIProjectTemplate.summary.Project_60cmIRPhaserBattery=<shipmodule>
-TIProjectTemplate.displayName.Project_120cmIRPhaserBattery=Medium IR Phaser Batteries
-TIProjectTemplate.summary.Project_120cmIRPhaserBattery=<shipmodule>
-TIProjectTemplate.displayName.Project_360cmIRPhaserBattery=Heavy IR Phaser Batteries
-TIProjectTemplate.summary.Project_360cmIRPhaserBattery=<shipmodule>
-TIProjectTemplate.displayName.Project_240cmIRPhaserCannon=Light IR Phaser Cannon
-TIProjectTemplate.summary.Project_240cmIRPhaserCannon=<shipmodule>
-TIProjectTemplate.displayName.Project_480cmIRPhaserCannon=Medium IR Phaser Cannon
-TIProjectTemplate.summary.Project_480cmIRPhaserCannon=<shipmodule>
-TIProjectTemplate.displayName.Project_720cmIRPhaserCannon=Heavy IR Phaser Cannon
-TIProjectTemplate.summary.Project_720cmIRPhaserCannon=<shipmodule>
-TIProjectTemplate.displayName.Project_960cmIRPhaserCannon=Superheavy IR Phaser Cannon
-TIProjectTemplate.summary.Project_960cmIRPhaserCannon=<shipmodule>
-TIProjectTemplate.displayName.Project_60cmGreenLaserBattery=Light Green Laser Batteries
-TIProjectTemplate.summary.Project_60cmGreenLaserBattery=<shipmodule>
-TIProjectTemplate.displayName.Project_120cmGreenLaserBattery=Medium Green Laser Batteries
-TIProjectTemplate.summary.Project_120cmGreenLaserBattery=<shipmodule>
-TIProjectTemplate.displayName.Project_360cmGreenLaserBattery=Heavy Green Laser Batteries
-TIProjectTemplate.summary.Project_360cmGreenLaserBattery=<shipmodule>
-TIProjectTemplate.displayName.Project_240cmGreenLaserCannon=Light Green Laser Cannon
-TIProjectTemplate.summary.Project_240cmGreenLaserCannon=<shipmodule>
-TIProjectTemplate.displayName.Project_480cmGreenLaserCannon=Medium Green Laser Cannon
-TIProjectTemplate.summary.Project_480cmGreenLaserCannon=<shipmodule>
-TIProjectTemplate.displayName.Project_720cmGreenLaserCannon=Heavy Green Laser Cannon
-TIProjectTemplate.summary.Project_720cmGreenLaserCannon=<shipmodule>
-TIProjectTemplate.displayName.Project_960cmGreenLaserCannon=Superheavy Green Laser Cannon
-TIProjectTemplate.summary.Project_960cmGreenLaserCannon=<shipmodule>
-TIProjectTemplate.displayName.Project_60cmGreenArcLaserBattery=Light Green Arc Laser Batteries
-TIProjectTemplate.summary.Project_60cmGreenArcLaserBattery=<shipmodule>
-TIProjectTemplate.displayName.Project_120cmGreenArcLaserBattery=Medium Green Arc Laser Batteries
-TIProjectTemplate.summary.Project_120cmGreenArcLaserBattery=<shipmodule>
-TIProjectTemplate.displayName.Project_360cmGreenArcLaserBattery=Heavy Green Arc Laser Batteries
-TIProjectTemplate.summary.Project_360cmGreenArcLaserBattery=<shipmodule>
-TIProjectTemplate.displayName.Project_240cmGreenArcLaserCannon=Light Green Arc Laser Cannon
-TIProjectTemplate.summary.Project_240cmGreenArcLaserCannon=<shipmodule>
-TIProjectTemplate.displayName.Project_480cmGreenArcLaserCannon=Medium Green Arc Laser Cannon
-TIProjectTemplate.summary.Project_480cmGreenArcLaserCannon=<shipmodule>
-TIProjectTemplate.displayName.Project_720cmGreenArcLaserCannon=Heavy Green Arc Laser Cannon
-TIProjectTemplate.summary.Project_720cmGreenArcLaserCannon=<shipmodule>
-TIProjectTemplate.displayName.Project_960cmGreenArcLaserCannon=Superheavy Green Arc Laser Cannon
-TIProjectTemplate.summary.Project_960cmGreenArcLaserCannon=<shipmodule>
-TIProjectTemplate.displayName.Project_60cmGreenPhaserBattery=Light Green Phaser Batteries
-TIProjectTemplate.summary.Project_60cmGreenPhaserBattery=<shipmodule>
-TIProjectTemplate.displayName.Project_120cmGreenPhaserBattery=Medium Green Phaser Batteries
-TIProjectTemplate.summary.Project_120cmGreenPhaserBattery=<shipmodule>
-TIProjectTemplate.displayName.Project_360cmGreenPhaserBattery=Heavy Green Phaser Batteries
-TIProjectTemplate.summary.Project_360cmGreenPhaserBattery=<shipmodule>
-TIProjectTemplate.displayName.Project_240cmGreenPhaserCannon=Light Green Phaser Cannon
-TIProjectTemplate.summary.Project_240cmGreenPhaserCannon=<shipmodule>
-TIProjectTemplate.displayName.Project_480cmGreenPhaserCannon=Medium Green Phaser Cannon
-TIProjectTemplate.summary.Project_480cmGreenPhaserCannon=<shipmodule>
-TIProjectTemplate.displayName.Project_720cmGreenPhaserCannon=Heavy Green Phaser Cannon
-TIProjectTemplate.summary.Project_720cmGreenPhaserCannon=<shipmodule>
-TIProjectTemplate.displayName.Project_960cmGreenPhaserCannon=Superheavy Green Phaser Cannon
-TIProjectTemplate.summary.Project_960cmGreenPhaserCannon=<shipmodule>
-TIProjectTemplate.displayName.Project_60cmUVLaserBattery=Light UV Laser Batteries
-TIProjectTemplate.summary.Project_60cmUVLaserBattery=<shipmodule>
-TIProjectTemplate.displayName.Project_120cmUVLaserBattery=Medium UV Laser Batteries
-TIProjectTemplate.summary.Project_120cmUVLaserBattery=<shipmodule>
-TIProjectTemplate.displayName.Project_360cmUVLaserBattery=Heavy UV Laser Batteries
-TIProjectTemplate.summary.Project_360cmUVLaserBattery=<shipmodule>
-TIProjectTemplate.displayName.Project_240cmUVLaserCannon=Light UV Laser Cannon
-TIProjectTemplate.summary.Project_240cmUVLaserCannon=<shipmodule>
-TIProjectTemplate.displayName.Project_480cmUVLaserCannon=Medium UV Laser Cannon
-TIProjectTemplate.summary.Project_480cmUVLaserCannon=<shipmodule>
-TIProjectTemplate.displayName.Project_720cmUVLaserCannon=Heavy UV Laser Cannon
-TIProjectTemplate.summary.Project_720cmUVLaserCannon=<shipmodule>
-TIProjectTemplate.displayName.Project_960cmUVLaserCannon=Superheavy UV Laser Cannon
-TIProjectTemplate.summary.Project_960cmUVLaserCannon=<shipmodule>
-TIProjectTemplate.displayName.Project_60cmUVArcLaserBattery=Light UV Arc Laser Batteries
-TIProjectTemplate.summary.Project_60cmUVArcLaserBattery=<shipmodule>
-TIProjectTemplate.displayName.Project_120cmUVArcLaserBattery=Medium UV Arc Laser Batteries
-TIProjectTemplate.summary.Project_120cmUVArcLaserBattery=<shipmodule>
-TIProjectTemplate.displayName.Project_360cmUVArcLaserBattery=Heavy UV Arc Laser Batteries
-TIProjectTemplate.summary.Project_360cmUVArcLaserBattery=<shipmodule>
-TIProjectTemplate.displayName.Project_240cmUVArcLaserCannon=Light UV Arc Laser Cannon
-TIProjectTemplate.summary.Project_240cmUVArcLaserCannon=<shipmodule>
-TIProjectTemplate.displayName.Project_480cmUVArcLaserCannon=Medium UV Arc Laser Cannon
-TIProjectTemplate.summary.Project_480cmUVArcLaserCannon=<shipmodule>
-TIProjectTemplate.displayName.Project_720cmUVArcLaserCannon=Heavy UV Arc Laser Cannon
-TIProjectTemplate.summary.Project_720cmUVArcLaserCannon=<shipmodule>
-TIProjectTemplate.displayName.Project_960cmUVArcLaserCannon=Superheavy UV Arc Laser Cannon
-TIProjectTemplate.summary.Project_960cmUVArcLaserCannon=<shipmodule>
-TIProjectTemplate.displayName.Project_60cmUVPhaserBattery=Light UV Phaser Batteries
-TIProjectTemplate.summary.Project_60cmUVPhaserBattery=<shipmodule>
-TIProjectTemplate.displayName.Project_120cmUVPhaserBattery=Medium UV Phaser Batteries
-TIProjectTemplate.summary.Project_120cmUVPhaserBattery=<shipmodule>
-TIProjectTemplate.displayName.Project_360cmUVPhaserBattery=Heavy UV Phaser Batteries
-TIProjectTemplate.summary.Project_360cmUVPhaserBattery=<shipmodule>
-TIProjectTemplate.displayName.Project_240cmUVPhaserCannon=Light UV Phaser Cannon
-TIProjectTemplate.summary.Project_240cmUVPhaserCannon=<shipmodule>
-TIProjectTemplate.displayName.Project_480cmUVPhaserCannon=Medium UV Phaser Cannon
-TIProjectTemplate.summary.Project_480cmUVPhaserCannon=<shipmodule>
-TIProjectTemplate.displayName.Project_720cmUVPhaserCannon=Heavy UV Phaser Cannon
-TIProjectTemplate.summary.Project_720cmUVPhaserCannon=<shipmodule>
-TIProjectTemplate.displayName.Project_960cmUVPhaserCannon=Superheavy UV Phaser Cannon
-TIProjectTemplate.summary.Project_960cmUVPhaserCannon=<shipmodule>
+TIProjectTemplate.displayName.Project_60cmIRPhaserBattery=Infrared Phaser Batteries
+TIProjectTemplate.summary.Project_60cmIRPhaserBattery=A series of advanced infrared laser turrets.
+TIProjectTemplate.displayName.Project_240cmIRPhaserCannon=Infrared Phaser Cannon
+TIProjectTemplate.summary.Project_240cmIRPhaserCannon=A series of advanced infrared laser cannon.
+TIProjectTemplate.displayName.Project_60cmGreenLaserBattery=Green Laser Batteries
+TIProjectTemplate.summary.Project_60cmGreenLaserBattery=A series of visible-wavelength laser turrets.
+TIProjectTemplate.displayName.Project_240cmGreenLaserCannon=Green Laser Cannon
+TIProjectTemplate.summary.Project_240cmGreenLaserCannon=A series of visible-wavelength laser cannon that are effective firing through atmospheres.
+TIProjectTemplate.displayName.Project_60cmGreenArcLaserBattery=Green Arc Laser Batteries
+TIProjectTemplate.summary.Project_60cmGreenArcLaserBattery=A series of enhanced visible-wavelength laser turrets.
+TIProjectTemplate.displayName.Project_240cmGreenArcLaserCannon=Green Arc Laser Cannon
+TIProjectTemplate.summary.Project_240cmGreenArcLaserCannon=A series of enhanced visible-wavelength laser cannon that are effective firing through atmospheres.
+TIProjectTemplate.displayName.Project_60cmGreenPhaserBattery=Green Phaser Batteries
+TIProjectTemplate.summary.Project_60cmGreenPhaserBattery=A series of advanced visible-wavelength laser turrets.
+TIProjectTemplate.displayName.Project_240cmGreenPhaserCannon=Green Phaser Cannon
+TIProjectTemplate.summary.Project_240cmGreenPhaserCannon=A series of advanced visible-wavelength laser cannon that are effective firing through atmospheres.
+TIProjectTemplate.displayName.Project_60cmUVLaserBattery=Ultraviolet Laser Batteries
+TIProjectTemplate.summary.Project_60cmUVLaserBattery=A series of laser turrets firing in deadly ultraviolet wavelengths.
+TIProjectTemplate.displayName.Project_240cmUVLaserCannon=Ultraviolet Laser Cannon
+TIProjectTemplate.summary.Project_240cmUVLaserCannon=A series of laser cannon firing in dangerous ultraviolet wavelengths.
+TIProjectTemplate.displayName.Project_60cmUVArcLaserBattery=Ultraviolet Arc Laser Batteries
+TIProjectTemplate.summary.Project_60cmUVArcLaserBattery=A series of enhanced laser turrets firing in ultraviolet wavelengths.
+TIProjectTemplate.displayName.Project_240cmUVArcLaserCannon=Ultraviolet Arc Laser Cannon
+TIProjectTemplate.summary.Project_240cmUVArcLaserCannon=A series of enhanced laser cannon firing in ultraviolet wavelengths.
+TIProjectTemplate.displayName.Project_60cmUVPhaserBattery=Ultraviolet Phaser Batteries
+TIProjectTemplate.summary.Project_60cmUVPhaserBattery=A series of advanced laser turrets firing in ultraviolet wavelengths.
+TIProjectTemplate.displayName.Project_240cmUVPhaserCannon=Ultraviolet Phaser Cannon
+TIProjectTemplate.summary.Project_240cmUVPhaserCannon=A series of the largest and deadliest laser cannon we can devise.
 TIProjectTemplate.displayName.Project_PublicizeAlienThreat=Publicize Alien Threat
 TIProjectTemplate.summary.Project_PublicizeAlienThreat=We show the world the true nature of our enemy.
 TIProjectTemplate.displayName.Project_GlobalListeningNetwork=Global Listening Network
@@ -1433,7 +1296,7 @@ TIProjectTemplate.summary.Project_OnboardingInjections=A few genetic read-write
 TIProjectTemplate.displayName.Project_TrainingSimulationImplants=Training Simulation Implants
 TIProjectTemplate.summary.Project_TrainingSimulationImplants=Cybernetic chips convey the lessons learned by our experienced operatives to our new recruits.
 TIProjectTemplate.displayName.Project_CivilianFusionReactors=Civilian Fusion Reactors
-TIProjectTemplate.summary.Project_CivilianFusionReactors=Clean, cheap energy makes its way to the civilian sector.
+TIProjectTemplate.summary.Project_CivilianFusionReactors=Clean, cheap energy begins to make its way to the civilian sector.
 TIProjectTemplate.displayName.Project_AlgorithmicEconomicManagement=Algorithmic Economic Management
 TIProjectTemplate.summary.Project_AlgorithmicEconomicManagement=AIs respond to economic indicators to help control inflation and unemployment.
 TIProjectTemplate.displayName.Project_CivilianPhotonicComputing=Civilian Photonic Computing
@@ -1518,14 +1381,22 @@ TIProjectTemplate.displayName.Project_InterrogationTechniques=Interrogation Tech
 TIProjectTemplate.summary.Project_InterrogationTechniques=We hone our ability to extract information about enemy captives.
 TIProjectTemplate.displayName.Project_Pherocyte-EnhancedInterrogations=Pherocyte-Enhanced Interrogations
 TIProjectTemplate.summary.Project_Pherocyte-EnhancedInterrogations=We employ alien biology against our human prisoners.
+TIProjectTemplate.displayName.Project_FlagBridge=Flag Bridge
+TIProjectTemplate.summary.Project_FlagBridge=<shipmodule>
+TIProjectTemplate.displayName.Project_TargetingComputer1=Targeting Computer
+TIProjectTemplate.summary.Project_TargetingComputer1=<shipmodule>
+TIProjectTemplate.displayName.Project_TargetingComputer2=Targeting Computer II
+TIProjectTemplate.summary.Project_TargetingComputer2=<shipmodule>
+TIProjectTemplate.displayName.Project_TargetingComputer3=Targeting Computer III
+TIProjectTemplate.summary.Project_TargetingComputer3=<shipmodule>
 TIProjectTemplate.displayName.Project_ECM1=Electronic Countermeasures
-TIProjectTemplate.summary.Project_ECM1=<shipmodule>
+TIProjectTemplate.summary.Project_ECM1=Electronic countermeasures (ECM) reduce enemy chances to quickly target our ships and also may cause conventional missiles to detonate without doing any damage.
 TIProjectTemplate.displayName.Project_ECM2=Improved ECM Module
-TIProjectTemplate.summary.Project_ECM2=<shipmodule>
+TIProjectTemplate.summary.Project_ECM2=Enhanced electronic countermeasures (ECM) reduce enemy chances to quickly target our ships and also may cause conventional missiles to detonate without doing any damage.
 TIProjectTemplate.displayName.Project_ECM3=Advanced ECM Module
-TIProjectTemplate.summary.Project_ECM3=<shipmodule>
+TIProjectTemplate.summary.Project_ECM3=Advanced electronic countermeasures (ECM) reduce enemy chances to quickly target our ships and also may cause conventional missiles to detonate without doing any damage.
 TIProjectTemplate.displayName.Project_AlienECM=Alien-Adapted ECM
-TIProjectTemplate.summary.Project_AlienECM=Our shipboard ECM modules will become effective against alien missile systems.
+TIProjectTemplate.summary.Project_AlienECM=Our shipboard ECM modules will become effective against alien weapon systems.
 TIProjectTemplate.displayName.Project_StrategicDeception=Strategic Deception
 TIProjectTemplate.summary.Project_StrategicDeception=We disguise aspects of our space operations to reduce alien interest in them.
 TIProjectTemplate.displayName.Project_OperationalMisdirection=Operational Misdirection
@@ -1545,7 +1416,7 @@ TIProjectTemplate.summary.Project_PredictiveAbductionModeling=Algorithms predict
 TIProjectTemplate.displayName.Project_Hunter-KillerTacticalUnits=Hunter-Killer Tactical Units
 TIProjectTemplate.summary.Project_Hunter-KillerTacticalUnits=Expert special operations forces are trained to excise violent aliens from our cities.
 TIProjectTemplate.displayName.Project_PherocyteExposureNetworkTracing=Pherocyte Exposure Network Tracing
-TIProjectTemplate.summary.Project_PherocyteExposureNetworkTracing=We build on establised epidemology procedures to create mechanisms to trace individual pherocyte exposure.
+TIProjectTemplate.summary.Project_PherocyteExposureNetworkTracing=We build on established epidemiology procedures to create mechanisms to trace individual pherocyte exposure.
 TIProjectTemplate.displayName.Project_AlienRedTeaming=Alien Red Teaming
 TIProjectTemplate.summary.Project_AlienRedTeaming=AI-aided teams try to think like aliens to predict alien behavior and test our forces' ability to respond.
 TIProjectTemplate.displayName.Project_PublicBehaviorialMonitoring=Public Behaviorial Monitoring
@@ -1567,7 +1438,7 @@ TIProjectTemplate.summary.Project_APeriodofUnity=Vietnam seeks dominion over its
 TIProjectTemplate.displayName.Project_CentralAsianUnion=Central Asian Union
 TIProjectTemplate.summary.Project_CentralAsianUnion=Former Soviet states see strength in unity.
 TIProjectTemplate.displayName.Project_MaglevTrains=Maglev Trains
-TIProjectTemplate.summary.Project_MaglevTrains=While Maglev trains are nothing new, recent breakthroughs in superconducting magnets have made it practical for nations to convert their entire public transportation network to Magnetic Levitation trains, ushering in a new era of high speed rail.
+TIProjectTemplate.summary.Project_MaglevTrains=Breakthroughs in superconducting magnets have made it practical for nations to begin converting their transportation networks to high-speed rail.
 TIProjectTemplate.displayName.Project_SelfDrivingVehicles=Self-Driving Vehicles
 TIProjectTemplate.summary.Project_SelfDrivingVehicles=After many failed attempts, self-driving vehicles are now a reality. Not only cars, but trucks, trains, and airplanes can now pilot themselves autonomously.
 TIProjectTemplate.displayName.Project_Spartans=Humanity First Spartans
@@ -1576,3 +1447,17 @@ TIProjectTemplate.displayName.Project_Rangers=Resistance Rangers
 TIProjectTemplate.summary.Project_Rangers=<shipmodule>
 TIProjectTemplate.displayName.Project_Immortals=The Immortals
 TIProjectTemplate.summary.Project_Immortals=<shipmodule>
+TIProjectTemplate.displayName.Project_UnidadColombia=Unidad Colombia
+TIProjectTemplate.summary.Project_UnidadColombia=Realizing Miranda's dream of a vast Latin American nation.
+TIProjectTemplate.displayName.Project_NubianAwakening=Nubian Awakening
+TIProjectTemplate.summary.Project_NubianAwakening=Peoples of southern Egypt and northern Sudan seek autonomy.
+TIProjectTemplate.displayName.Project_MexicanLiberationMovements=Mexican Liberation Movements
+TIProjectTemplate.summary.Project_MexicanLiberationMovements=El Sur and El Norte decide to leave the union.
+TIProjectTemplate.displayName.Project_IranianSeparatism=Iranian Separatism
+TIProjectTemplate.summary.Project_IranianSeparatism=Minorities chafe under Persian rule.
+TIProjectTemplate.displayName.Project_40mmAutocannon=40mm Autocannon
+TIProjectTemplate.summary.Project_40mmAutocannon=<shipmodule>
+TIProjectTemplate.displayName.Project_StewardoftheAmazon=Stewards of the Amazon
+TIProjectTemplate.summary.Project_StewardoftheAmazon=Brazil appoints itself overlord of the great jungle.
+TIProjectTemplate.displayName.Project_ArmorStruts=Armor Struts
+TIProjectTemplate.summary.Project_ArmorStruts=<shipmodule>
\ No newline at end of file
diff --git a/app/game/localization/TIShipArmorTemplate.en b/app/game/localization/TIShipArmorTemplate.en
index 9d362b8..7340f46 100644
--- a/app/game/localization/TIShipArmorTemplate.en
+++ b/app/game/localization/TIShipArmorTemplate.en
@@ -8,6 +8,8 @@ TIShipArmorTemplate.displayName.BoronCarbideArmor=Boron Carbide Armor
 TIShipArmorTemplate.description.BoronCarbideArmor=Durable "black diamond" armor created from reduction of boron trioxide in a carbon atmosphere.
 TIShipArmorTemplate.displayName.CompositeArmor=Composite Armor
 TIShipArmorTemplate.description.CompositeArmor=Alternating layers of ceramics and metals offers broad and lightweight protection.
+TIShipArmorTemplate.displayName.FoamedMetalArmor=Foamed Metal Armor
+TIShipArmorTemplate.description.FoamedMetalArmor=Low-density "foamed" titanium and other alloys, layered with ceramic plates, offer lightweight protection to our spacecraft.
 TIShipArmorTemplate.displayName.NanotubeArmor=Nanotube Armor
 TIShipArmorTemplate.description.NanotubeArmor=Next-generation armor created by the fusion of millions of carbon nanotubes.
 TIShipArmorTemplate.displayName.AdamantaneArmor=Adamantine Armor
@@ -20,9 +22,29 @@ TIShipArmorTemplate.displayName.AlienAdamantaneArmor=Alien Diamondoid Armor
 TIShipArmorTemplate.description.AlienAdamantaneArmor=An alien material that appears to be based on carbon manipulation.
 TIShipArmorTemplate.displayName.AlienExoticArmor=Alien Exotic Armor
 TIShipArmorTemplate.description.AlienExoticArmor=An alien material with exotic properties.
-TIShipArmorTemplate.FrontBackTonsPerPoint={0} tons per nose or tail armor point
-TIShipArmorTemplate.LateralTonsPerPoint={0} tons per lateral armor point
-TIShipArmorTemplate.ResourcesPerTon=Construction Resources Per Ton: {0}
-TIShipArmorTemplate.KineticsResistance=Bonus Resistance to Kinetic Damage
-TIShipArmorTemplate.LaserResistance=Bonus Resistance to Laser Damage
-TIShipArmorTemplate.ChippingResistance=Bonus Resistance to Chipping
\ No newline at end of file
+
+TIShipArmorTemplate.ResourcesPerTon=Cost Per Ton:<rcol>{0}</rcol>
+TIShipArmorTemplate.KineticsResistance={0} bonus resistance to kinetic damage
+TIShipArmorTemplate.LaserResistance={0} bonus resistance to laser damage
+TIShipArmorTemplate.ChippingResistance={0} bonus resistance to chipping
+TIShipArmorTemplate.KineticsVulnerability=Suffers {0} extra damage from kinetic weapons
+TIShipArmorTemplate.LaserVulnerability=Suffers {0} extra damage from lasers
+TIShipArmorTemplate.ChippingVulnerability=Suffers {0} extra armor chipping from hits
+TIShipArmorTemplate.XRayResistance={0} bonus resistance to particle weapon x-rays relative to steel
+TIShipArmorTemplate.XRayVulnerability=Suffers {0} extra damage from particle weapon x-rays
+TIShipArmorTemplate.BaryonicResistance={0} bonus resistance to particle weapon neutrons
+TIShipArmorTemplate.BaryonicVulnerability=Suffers {0} extra damage from particle weapon neutrons
+
+TIShipArmorTemplate.ThicknessPerPoint=Thickness per point:<rcol>{0} cm</rcol>
+
+TIShipArmorTemplate.NoseTailTonsPerPoint=Mass per nose or tail armor point:<rcol>{0} tons</rcol>
+TIShipArmorTemplate.LateralTonsPerPoint=Mass per lateral armor point:<rcol>{0} tons</rcol>
+
+TIShipArmorTemplate.MaxArmorThickness_Lateral=Maximum Lateral Armor Thickness:<rcol>{0} cm</rcol>
+TIShipArmorTemplate.MaxArmorThickness_Nose=Maximum Nose Armor Thickness:<rcol>{0} cm</rcol>
+TIShipArmorTemplate.MaxArmorThickness_Tail=Maximum Tail Armor Thickness:<rcol>{0} cm</rcol>
+
+TIShipArmorTemplate.MaxArmorPoints_Lateral=Maximum Lateral Armor:<rcol>{0}</rcol>
+TIShipArmorTemplate.MaxArmorPoints_Nose=Maximum Nose Armor:<rcol>{0}</rcol>
+TIShipArmorTemplate.MaxArmorPoints_Tail=Maximum Tail Armor:<rcol>{0}</rcol>
+
diff --git a/app/game/localization/TIShipCommandTemplate.en b/app/game/localization/TIShipCommandTemplate.en
index 81c7da4..986f4c3 100644
--- a/app/game/localization/TIShipCommandTemplate.en
+++ b/app/game/localization/TIShipCommandTemplate.en
@@ -97,7 +97,7 @@ MatchVelocityCommand.description=Order ship to match the velocity of a selected
 CancelMatchVelocityCommand.displayName=Cancel Match Velocity
 CancelMatchVelocityCommand.description=Order ship to cancel the match velocity maneuver.
 DefensiveManeuversCommand.displayName=Defensive Maneuvers
-DefensiveManeuversCommand.description=Order ship to perform defensive manuevers. Ship will attempt to dodge projectiles if possible. Otherwise it will rotate its nose towards incoming fire. 
+DefensiveManeuversCommand.description=Order ship to perform defensive maneuvers. Ship will attempt to dodge projectiles if possible. Otherwise it will rotate its nose towards incoming fire. 
 CancelDefensiveManeuversCommand.displayName=Cancel Defensive Maneuvers
 CancelDefensiveManeuversCommand.description=Order ship to cancel defensive maneuvers.
 FaceVelocityVectorCommand.displayName=Face Velocity Vector
diff --git a/app/game/localization/TIShipHullTemplate.en b/app/game/localization/TIShipHullTemplate.en
index fac7709..f1839c6 100644
--- a/app/game/localization/TIShipHullTemplate.en
+++ b/app/game/localization/TIShipHullTemplate.en
@@ -10,15 +10,23 @@ TIShipHullTemplate.displayName.Battlecruiser=Battlecruiser
 TIShipHullTemplate.displayName.Battleship=Battleship
 TIShipHullTemplate.displayName.Dreadnought=Dreadnought
 TIShipHullTemplate.displayName.Titan=Titan
+TIShipHullTemplate.displayName.STOFighter=Fighter
 TIShipHullTemplate.displayName.AlienGunship=Gunship
 TIShipHullTemplate.displayName.AlienCorvette=Corvette
+TIShipHullTemplate.displayName.AlienEscort=Escort
 TIShipHullTemplate.displayName.AlienFrigate=Frigate
+TIShipHullTemplate.displayName.AlienMonitor=Monitor
 TIShipHullTemplate.displayName.AlienDestroyer=Destroyer
+TIShipHullTemplate.displayName.AlienCruiser=Cruiser
 TIShipHullTemplate.displayName.AlienBattlecruiser=Battlecruiser
 TIShipHullTemplate.displayName.AlienBattleship=Battleship
+TIShipHullTemplate.displayName.AlienLancer=Lancer
 TIShipHullTemplate.displayName.AlienDreadnought=Dreadnought
+TIShipHullTemplate.displayName.AlienTitan=Titan
 TIShipHullTemplate.displayName.AlienAssaultCarrier=Assault Carrier
 TIShipHullTemplate.displayName.AlienMothership=Mothership
+TIShipHullTemplate.displayName.SalamanderGunship=Fighter
+TIShipHullTemplate.abbr.STOFighter=OF
 TIShipHullTemplate.abbr.Gunship=GS
 TIShipHullTemplate.abbr.Corvette=CT
 TIShipHullTemplate.abbr.Escort=DE
@@ -32,11 +40,17 @@ TIShipHullTemplate.abbr.Battleship=BB
 TIShipHullTemplate.abbr.Dreadnought=DN
 TIShipHullTemplate.abbr.Titan=TI
 TIShipHullTemplate.abbr.AlienGunship=GS
+TIShipHullTemplate.abbr.AlienEscort=DE
 TIShipHullTemplate.abbr.AlienCorvette=CT
 TIShipHullTemplate.abbr.AlienFrigate=FF
+TIShipHullTemplate.abbr.AlienMonitor=MO
 TIShipHullTemplate.abbr.AlienDestroyer=DD
+TIShipHullTemplate.abbr.AlienCruiser=CH
 TIShipHullTemplate.abbr.AlienBattlecruiser=BC
 TIShipHullTemplate.abbr.AlienBattleship=BB
 TIShipHullTemplate.abbr.AlienDreadnought=DN
+TIShipHullTemplate.abbr.AlienLancer=LN
 TIShipHullTemplate.abbr.AlienAssaultCarrier=LHA
+TIShipHullTemplate.abbr.AlienTitan=TI
 TIShipHullTemplate.abbr.AlienMothership=MS
+TIShipHullTemplate.abbr.SalamanderGunship=F
diff --git a/app/game/localization/TITechTemplate.en b/app/game/localization/TITechTemplate.en
index e1f7b02..02d62e1 100644
--- a/app/game/localization/TITechTemplate.en
+++ b/app/game/localization/TITechTemplate.en
@@ -110,7 +110,7 @@ TITechTemplate.description.ArrivalDomesticPolitics=Whether embracing egalitarian
 
 TITechTemplate.displayName.ArrivalEconomics=Arrival Economics
 TITechTemplate.summary.ArrivalEconomics=Economists seek mechanisms to stabilize and harness the financial disruptions caused by the alien arrival.
-TITechTemplate.quote.ArrivalEconomics="Culture!?! Culture is nothing more than a qualitative marketing profile. Whether your line is boots, carbonated beverages, or civilian firearms, your job is to develop products that people will incorporate into their identities so deeply they can’t see where their personality stops and our branding begins."<br/><align=right>{exploitLeader}<align=left><br/><align=right>Chairman Soren Van Wyk, remarks during conference call with senior product managers<align=left>
+TITechTemplate.quote.ArrivalEconomics="Culture!?! Culture is nothing more than a qualitative marketing profile. Whether your line is boots, carbonated beverages, or civilian firearms, your job is to develop products that people will incorporate into their identities so deeply they can't see where their personality stops and our branding begins."<br/><align=right>{exploitLeader}<align=left><br/><align=right>Remarks during conference call with senior product managers<align=left>
 TITechTemplate.description.ArrivalEconomics=As socially interactive creatures, humans have always relied on systems of exchange for goods and services. These systems have often found themselves affected by sweeping societal changes such as new alliances, advancement in technology, and looming conflict, but the confirmed existence of an extraterrestrial race may perhaps be the single most seminal of these moments. As speculation abounds regarding their intention and we contend with the possibility we are no longer an apex predator, the potential for riches or ruin has never been greater. Today's banking and investment systems were not designed to cope with such a sweeping change to Earth's place in the universe, both in terms of domestic adjustment to the alien arrival, and in terms of humanity's likely future amongst the stars. We must task our best economists with calming the startled markets, funding new ways of living, and ultimately laying the groundwork for deep-space society and commerce.
 
 TITechTemplate.displayName.ArrivalGovernance=Arrival Governance
@@ -250,7 +250,7 @@ TITechTemplate.description.ElectrostaticPlasmaConfinement=By utilizing static el
 
 TITechTemplate.displayName.ElectrostaticPropulsion=Electrostatic Propulsion
 TITechTemplate.summary.ElectrostaticPropulsion=We develop thrusters that use static electric fields to accelerate propellant.
-TITechTemplate.quote.ElectrostaticPropulsion="Tell me what we need to send more people further, faster. Otherwise we'll be stuck playing defense forever - and that's just a slow way to lose."<br/><align=right>{resistLeader}<align=left><br/><align=right>Attending a technical design briefing for the UK space program<align=left>
+TITechTemplate.quote.ElectrostaticPropulsion="Colleagues, Mars and the near asteroids will be in reach without us having to ignite nuclear fires."<br/><align=right>{cooperateLeader}<align=left><br/><align=right>speech at a C9 league summit<align=left>
 TITechTemplate.description.ElectrostaticPropulsion=Of the many factors that have kept humanity tethered to our home planet since we first sent a man to space all those decades ago, the foremost is fuel demands. Any deep space propulsion system needs to manage its fuel as efficiently as possible to allow for long distance travel.<br/><br/>Now, by using electrostatic fields, our researchers believe they have found a workable solution. This novel thruster concept employs an elegant array of electrostatic fields to guide and accelerate the fuel. The fuel is pushed through an almost frictionless system of pipes to gain velocity. Once it has reached the desired velocity, the fuel is expelled through thrusters, pushing the spaceship forward. The beauty of these thrusters is the tunability of the electrostatic fields, which allows the spacecraft to select just the right amount of acceleration for any maneuver. Even though the current design allows accurate control over the spaceship's thrust, our engineers believe that, in time, we will be able to push the fuel velocity even further using high-energy electrostatic fields. 
 
 TITechTemplate.displayName.ElectrothermalPropulsion=Electrothermal Propulsion
@@ -303,15 +303,6 @@ TITechTemplate.summary.HighEnergyElectromagneticPropulsion=Physicists improve on
 TITechTemplate.quote.HighEnergyElectromagneticPropulsion="It is not about who hits hardest. It is about who moves fastest. Though even that will get you killed if you have not planned exactly what to do once you get there."<br/><align=right>{destroyLeader}<align=left><br/><align=right>In an interview with the U.S. Southern Command magazine Diálogo<align=left>
 TITechTemplate.description.HighEnergyElectromagneticPropulsion=With electromagnetic propulsion now a proven success, we can explore how to refine it further. While our electromagnetic drives can never achieve the thrust of chemical rockets, we can make them have a measure of more power for less mass, and also more energy-efficient, reducing the need for huge radiators. Advances in room-temperature superconductors and other materials will allow us to contain and direct energetic plasma as well as solid masses as we develop the next generation of exploration and transport space ships. The sky won't be the limit much longer.
 
-TITechTemplate.displayName.HighEnergyElectrostaticPropulsion=High-Energy Electrostatic Propulsion
-TITechTemplate.summary.HighEnergyElectrostaticPropulsion=We further refine thrusters that use static electric fields for acceleration.
-TITechTemplate.quote.HighEnergyElectrostaticPropulsion="If we are to contemplate founding human society on another world, it is imperative that we learn from our past mistakes. It is a chance to start afresh, with fairness and equality the very bedrock of how we live."<br/><align=right>{appeaseLeader}<align=left><br/><align=right>Speech at the International Peace Conference<align=left>
-TITechTemplate.description.HighEnergyElectrostaticPropulsion=Our solar system is a treasure trove of resources that will help us become the space-faring race we are surely destined to be. This does not remove the need for human ingenuity, of course. So it is to a further evolution of electrostatic propulsion systems that we now look, as we seek to explore the furthest corners of the sol system - and, perhaps, beyond.<br/><br/>This new thruster concept is based on our existing electrostatic drives, but employs far stronger fields in combination with a lighter, ionized propellant. The latter can be accelerated faster and to significantly greater maximum velocities; while the strengthened fields also have a smaller footprint, allowing for more compact drive design. Ships equipped with these new thrusters will comfortably exceed the current limitations of space travel.
-
-TITechTemplate.displayName.HighEnergyElectrothermalPropulsion=High-Energy Electrothermal Propulsion
-TITechTemplate.summary.HighEnergyElectrothermalPropulsion=By enhancing our control over electromagnetic fields, we can generate high-energy plasma to heat lighter propellant.
-TITechTemplate.quote.HighEnergyElectrothermalPropulsion="Colleagues, Mars and the near asteroids will be in reach without us having to ignite nuclear fires."<br/><align=right>{cooperateLeader}<align=left><br/><align=right>speech at a C9 league summit<align=left>
-TITechTemplate.description.HighEnergyElectrothermalPropulsion=Until now, our current spacecraft had only limited reach, allowing us only to explore our nearest neighbors; however, high-energy electrothermal propulsion will help us to extend our influence into the farthest corners of this solar system.<br/><br/>Based on existing electrothermal drives, our researchers have refined the electromagnetic containment fields, allowing us to supercharge the plasma. These new containment fields are able to directly weave the supercharged plasma through the light-weight propellant. This creates a highly energetic flow of gas within the nozzle system. By using a new fully frictionless coating, the gas flow can reach far higher velocities than the previous generation. These higher velocities translate directly into more powerful thrust, while offering precise directional control - exactly what is needed to make exploration of the outer planets feasible. 
 
 TITechTemplate.displayName.HighEnergyLasers=High-Energy Lasers
 TITechTemplate.summary.HighEnergyLasers=Engineers develop powerful directed energy devices with potential as weapons and in the ignition of nuclear fusion.
@@ -323,10 +314,6 @@ TITechTemplate.summary.HighTemperatureSuperconductors=Scientists develop superco
 TITechTemplate.quote.HighTemperatureSuperconductors="Few things clear your mind and focus your output as effectively as a sharp blast of cold. As a 'thank you' for being part of our course, please enjoy a 25 percent discount on any of our in-home cryo chambers."<br/><align=right>{submitLeader}<align=left><br/><align=right>From the welcome email to her <i>Burn Brighter</i> course<align=left>
 TITechTemplate.description.HighTemperatureSuperconductors=Superconductors are substances that transmit electricity without resistance, and therefore, without energy loss. They are thus essential for the extreme energy requirements of the groundbreaking technologies humanity has developed in response to the alien arrival. Alas, superconductors are historically limited to very low temperatures. For decades, even our most pioneering ones could only function below -220F. It was not until the early 2020s that superconductivity even at room temperatures became possible, achieved by forming a crystalline compound of carbon, hydrogen, and sulfur, but even then its applications were infuriatingly limited. At last, however, we have developed a compound capable of superconductivity even at the high temperatures found in harsher extrasolar environments, and with only minimal energy loss. An equally important breakthrough is effective shielding from the magnetic fields so fundamental to our spacecraft and their weaponry, but so disruptive to superconductivity. This offers astounding potential for even greater advancements in deep-space propulsion and combat.
 
-TITechTemplate.displayName.HydrogenLithium6Fusion=Hydrogen-Lithium-6 Fusion
-TITechTemplate.summary.HydrogenLithium6Fusion=Scientists reach for the sky by taming the first aneutronic fusion reaction to harness energy. 
-TITechTemplate.quote.HydrogenLithium6Fusion="Our technology is but a mirror of ourselves. When we reach for fusion - the power of the sun - we reach for the light that guides our path through the darkness."<br/><align=right>{submitLeader}<align=left><br/><align=right>from Seeing The Light Podcast<align=left>
-TITechTemplate.description.HydrogenLithium6Fusion=Now that we can construct fusion reactors in space, we can turn our gaze towards the various options for fuel sources. Both hydrogen and lithium are abundant resources in our solar system. By using our understanding of lithium from our nuclear fission and weapons research, we can create the first generation of hydrogen-lithium-6 fusion reactors.<br/><br/>Fusing hydrogen with lithium involves an aneutronic reaction, the benefit of which is that we can collect the energy using water and turbines, since it is mostly released as electromagnetic radiation rather than neutrons. Converting this electromagnetic radiation into electricity is far easier than trying to capture neutrons. In addition, our reactors can forgo the heavy neutron shielding required to protect all living matter in the vicinity, making them lighter and smaller than previous generations.<br/><br/>We can in turn then build faster and lighter ships, which will aid our expansion deeper into the solar system.  
 
 TITechTemplate.displayName.ImprovedShipbuildingTechniques=Improved Shipbuilding Techniques
 TITechTemplate.summary.ImprovedShipbuildingTechniques=Engineers develop ways to build lighter, larger spacecraft.
@@ -418,10 +405,15 @@ TITechTemplate.summary.MissiontoMars=Scientists study exploration and colonizati
 TITechTemplate.quote.MissiontoMars="It takes so very little for one tribe of humanity to look upon a second tribe as The Other. Think of what will happen once hundreds of millions of kilometers lie between us."<br/><align=right>{cooperateLeader}<align=left><br/><align=right>"Distributed Humanity"<align=left>	
 TITechTemplate.description.MissiontoMars=Though it is scarcely an appealing home, there is no better prospect within our solar system for eventual colonization than our crimson neighbor, Mars. It lacks a breathable atmosphere, the radiation risk from both galactic cosmic rays and solar energetic particles is extreme, the soil is flooded with toxins, and the low gravity will weaken both bones and muscles and cause cardiovascular problems. Then there is the cold, and the minimal supply of water... And with travel each way also taking months, at least until such time as we have made profound progress in spaceflight technology, only the bravest and hardiest pioneers would dare take this chance. Yet if humanity is ever to explore the stars, or settle on further-out planets, or to trace our alien visitors to their own homeworld, there is simply no choice other than Mars. In terms of temperature, sunlight, and simple proximity, no other planet in our system comes close. Our scientists are now confident that the settling of a limited number of highly-trained personnel will be possible, thanks to a combination of highly complex life-support systems and certain cyanobacteria capable of photosynthesis even on Mars' hostile surface. The latter, grown at sufficient scale, can generate both food and oxygen locally, and allow the propagation of more complex organisms. It is from these starting blocks that long-term life on Mars will begin.
 
-TITechTemplate.displayName.MissiontotheInnerPlanets=Mission to the Inner Planets
-TITechTemplate.summary.MissiontotheInnerPlanets=Researchers pursue means to explore Mercury and the skies of Venus.
+TITechTemplate.displayName.MissiontoVenus=Mission to Venus
+TITechTemplate.summary.MissiontoVenus=We prepare to explore Earth's accessible but hellish near-twin.
+TITechTemplate.quote.MissiontoVenus="The final frontier proved a bit underwhelming, no? 'Veni, vidi, vici' is great, but how do you say 'I leased it at triple market rate' in Latin?"<br/><align=right>{exploitLeader}<align=left><br/><align=right>Comments to CNN<align=left>
+TITechTemplate.description.MissiontoVenus=The surface of Venus is among the most inhospitable in the Solar System, with a crushing, poisonous atmosphere rendering it impossible to colonize. But its orbits receive a wealth of sunlight to support power-efficient stations, and it serves as a stepping stone toward colonizing the sunburned iron cannonball further inward: Mercury.
+
+TITechTemplate.displayName.MissiontotheInnerPlanets=Mission to Mercury
+TITechTemplate.summary.MissiontotheInnerPlanets=Researchers pursue means to explore Mercury.
 TITechTemplate.quote.MissiontotheInnerPlanets="Never be afraid to burn, for it is only within that fiery crucible that our true selves are forged."<br/><align=right>{submitLeader}<align=left><br/><align=right>From the concluding chapter of her <i>Burn Brighter</i> course<align=left>
-TITechTemplate.description.MissiontotheInnerPlanets=Full colonization of the inner worlds of our solar system must remain a pipe dream, for neither the alternately burning and freezing landscape of Mercury nor the acidic atmosphere of Venus could possibly support more than the briefest human existence. However, there is some hope for limited settlement in the permanently shadowed craters which litter Mercury's poles, which we believe also contain copious amounts of frozen water. But the true gain in enabling our fleets to reach the sun's closest planet would be its sheer abundance of resources. Some 70% of Mercury is composed of metal. As for Venus, though its poison air and extreme heat would annihilate any life foolish enough to land upon it, in other respects it is Earth's close twin. As such, it could theoretically provide vast amounts of carbon, nitrogen, and oxygen for the construction and maintenance of nearby space stations. Venus is also a rich source of deuterium, a potent fusion fuel. All of these will surely be necessary if we are to defend our home system from any threats, which might arise, and to expand further outwards.
+TITechTemplate.description.MissiontotheInnerPlanets=Full colonization of the innermost world of our solar system must remain a pipe dream, for the alternately burning and freezing landscape of Mercury could not possibly support more than the briefest human existence. However, there is some hope for limited settlement in the permanently shadowed craters which litter the planet's poles, which we believe also may contain deposits of frozen water. But the true gain in enabling our fleets to reach the Sun's closest planet would be its sheer abundance of resources. Some 70 percent of Mercury is composed of metal that could support our development in space, and its proxmity to the Sun means our solar power stations will have abundant generation for our habs.
 
 TITechTemplate.displayName.MissiontoSaturn=Mission to Saturn
 TITechTemplate.quote.MissiontoSaturn="The online shopping guy and the electric car guy can squabble over Mars all they like, but that's just selling humanity short. Trust me, we can do so much better."<br/><align=right>{escapeLeader}<align=left><br/><align=right>During an appearance on The Late Show<align=left>
@@ -465,13 +457,13 @@ TITechTemplate.description.NetworkedGlobalDefense=It has long been the case that
 
 TITechTemplate.displayName.NetworkedPropaganda=Networked Propaganda
 TITechTemplate.summary.NetworkedPropaganda=We study ways to shape public opinion in the Internet's many-speak-to-many environment.
-TITechTemplate.quote.NetworkedPropaganda="Fake news, misinformation... It doesn't matter what they call it. The simple truth is that the powerful do it, and the powerless cry about it. And that is why the powerless will never, ever become the powerful.<br/><align=right>{exploitLeader}<align=left><br/><align=right>During a billionaires-only Clubhouse discussion<align=left>
+TITechTemplate.quote.NetworkedPropaganda="Fake news, misinformation... It doesn't matter what they call it. The simple truth is that the powerful do it, and the powerless cry about it. And that is why the powerless will never, ever become the powerful.<br/><align=right>{exploitLeader}<align=left><br/><align=right>During a billionaires-only clubhouse discussion<align=left>
 TITechTemplate.description.NetworkedPropaganda=If not controlling, then at least influencing hearts and minds is a growing necessity in this most turbulent of ages. With old loyalties transformed and new sympathies forged by the alien arrival, international borders - or indeed planetary ones - simply will not present any barrier whatsoever to the spreading of a message. The advent of cybernetics offers startling opportunities in this field too - we are now testing experimental new implants that entirely remove the old need for devices and screens and cables, enabling the near-instantaneous sending and receipt of messages and videos to anyone, anywhere.<br/><br/>The potential for organizing movements, for crowd-sourced initiatives and for the mass coordination of aid to people in need is endless, but so too is the potential for exploitation. Not simply in terms of marketing and advertising - there are those who would use it to slowly, perniciously bend others to their will, to encourage coups or to destabilize their opponents through sustained, direct-to-the-senses misinformation campaigns. But this new era of mass communication is a genie that cannot be returned to its bottle - to the victor, the spoils.
 
-TITechTemplate.displayName.NeutroniumContainment=Neutronium Containment
-TITechTemplate.summary.NeutroniumContainment=Physicists investigate ways to contain free neutrons and prevent their decay, allowing us to use them as a catalyst.
-TITechTemplate.quote.NeutroniumContainment="You'll frown at my ignorance and romanticism, but look, if one good thing comes out of all this mess, it's getting to tell my kids that every spaceship has a tiny star at its heart."<br/><align=right>{resistLeader}<align=left><br/><align=right>Private correspondence following a tour of Los Alamos National Laboratory<align=left>
-TITechTemplate.description.NeutroniumContainment=The use of neutronium - the same as the material found at the core of a massive neutron star - as a potential energy source requires, first and foremost, the capability to recreate the intense gravity that first created it, else it would rapidly decay in a burst of deadly radiation. Once harnessed, it is this very burst that can provide incredible amounts of energy, but containment of such free neutrons has thus far eluded even our brightest minds. However, our scientists now believe that they can build upon their work in ultra-dense diamondoids to create a honeycomb-like latticework, capable of finally containing the incredible pressure of the sub-atomic particles of which constitute this neutron-degenerate matter (caused because no two such particles can exist in the same place at the same time), and thus preventing their premature decay. By finally (and safely) bending neutronium to our will, they believe we can build fission-based spacecraft drives of once-unimaginable power. 
+TITechTemplate.displayName.Neutronics=Neutronics
+TITechTemplate.summary.Neutronics=Physicists develop ways to deliver neutrons where they are wanted and keep them out of places where they are not.
+TITechTemplate.quote.Neutronics="You'll frown at my ignorance and romanticism, but look, if one good thing comes out of all this mess, it's getting to tell my kids that every spaceship has a tiny star at its heart."<br/><align=right>{resistLeader}<align=left><br/><align=right>Private correspondence following a tour of Los Alamos National Laboratory<align=left>
+TITechTemplate.description.Neutronics=Neutrons - neutral subatomic particles that along with protons and electrons make up most atoms in the universe - have their uses. Beams of neutrons can trigger nuclear reactions that propel our spacecraft and also serve as weapons. But many fission and fusion reactions also produce wild neutrons that are a danger to the humans relying on those reactions. Powerful new computers have enabled us to model neutron behavior with precision previously unavailable to us. This in turn lets us build new devices to control them, and lightweight shielding to protect fragile life from them. We also see pathways to the ultimate prize: trapping and storing ultracold neutrons for long periods of time, preventing their usual rapid decay. This would allow us to use them as extremely efficient catalysts, but we'll need to develop new understandings of materials science before we can proceed.
 
 TITechTemplate.displayName.NextGenerationAerospace=Next-Generation Aerospace
 TITechTemplate.summary.NextGenerationAerospace=Aeronautical engineers explore reusable suborbital and single-stage-to-orbit craft.
@@ -483,10 +475,10 @@ TITechTemplate.summary.NuclearFissioninSpace=We try out decades-old proposals fo
 TITechTemplate.quote.NuclearFissioninSpace="In 1954, the Americans built the first nuclear-powered submarine, and changed the course of naval warfare. Now, it is upon us to become the creators of the first nuclear-powered spaceship. It is upon us to define warfare in space."<br/><align=right>{resistLeader}<align=left><br/><align=right>From a speech made while opening the Churchill Shipyards<align=left>
 TITechTemplate.description.NuclearFissioninSpace=Since we discovered nuclear fission in 1938, we have used this knowledge both to give and to take - to build power plants and weapons of mass destruction alike. With every passing decade, our understanding of the forces that rule the universe grew, and we were able to refine this process further. However, until now reactors needed the pull of gravity in order to contain the chain reaction, and to keep the water flowing. Without that flow, nothing happens - for fission heats water, water becomes steam, steam turns turbines, and turbines generate energy. <br/><br/>Now, combining our new concepts for deep space propulsion with our decades of experience in nuclear fission, we are able to stabilize the first nuclear reaction in space. With our new reactor designs, we no longer need gravity to collect the energy released by splitting atoms. Our new containment systems ensure a safe, sustained chain reaction in zero-g. <br/><br/>Thanks to this achievement, our fission-powered spacecraft can now reach the darkest and furthest corners of our solar system. Nuclear reactors will power ships, weapons, and habitats, enabling us to harness countless resources far beyond our homeworld's atmosphere and meet the aliens in the vast openness of space, rather than bound to our own soil. Furthermore, these new technologies will help us to build the next generation of solid fission systems and explore the even greater energy potential of nuclear fusion in space.
 
-TITechTemplate.displayName.NuclearFusioninSpace=Nuclear Fusion In Space
-TITechTemplate.summary.NuclearFusioninSpace=We harness nuclear fusion for power and propulsion technologies.
+TITechTemplate.displayName.NuclearFusioninSpace=Nuclear Fusion Methodologies
+TITechTemplate.summary.NuclearFusioninSpace=We explore harnessing nuclear fusion for power and propulsion technologies.
 TITechTemplate.quote.NuclearFusioninSpace="Our advances in science and technology can be the key to the gates of heaven, but also to the gates of hell. We must choose wisely every time, or we may never choose again."<br/><align=right>{appeaseLeader}<align=left><br/><align=right>Speech at the U.N. Science Summit<align=left>
-TITechTemplate.description.NuclearFusioninSpace=Ever since we gazed upon the burning sun in our sky, we have wondered how its light and power are created. As early as 1920, scientists theorized about the sheer endless possibilities of nuclear fusion. Now, with the countless challenges and opportunities presented by the arrival of life from outer space, it is imperative that we realize this dream of unprecedented energy.<br/><br/>We have finally made the impossible possible: controlled nuclear fusion in space. By using powerful superconducting magnets and lasers, we have refined the technology to push smaller atoms together so that they fuse into heavier elements. The trick to nuclear fusion is to overcome the repelling force that prevents atoms from fusing on their own. This allows the binding nuclear force to take over and merge the atoms together. When fusing lighter atoms into heavier ones, we observe Einstein's famous law making itself once more inarguable: energy and mass merge together to create something new, while releasing excess energy. It is this burst of released energy that is key to meeting the steep power requirements of deep-space habitats, but also of our ever more demanding spaceship drives and weapons.<br/><br/>Our scientists believe this breakthrough will help to level the playing field in the vast reaches of space. Now that the fundamentals of off-world fusion reactors have been proven possible, they predict that we shall soon see reactors running on lithium, hydrogen or even on two potent hydrogen isotopes, deuterium and tritium. The versatility of this energy source will surely know no bounds.  
+TITechTemplate.description.NuclearFusioninSpace=Ever since we gazed upon the burning sun in our sky, we have wondered how its light and power are created. As early as 1920, scientists theorized about the sheer endless possibilities of nuclear fusion. Now, with the countless challenges and opportunities presented by the arrival of life from outer space, it is imperative that we realize this dream of unprecedented energy.<br/><br/>We have finally developed a concrete path to make the impossible possible: controlled nuclear fusion. By using powerful magnets and lasers, we have refined the technology to push smaller atoms together so that they fuse into heavier elements. The trick to nuclear fusion is to overcome the repelling force that prevents atoms from fusing on their own. This allows the binding nuclear force to take over and merge the atoms together. When fusing lighter atoms into heavier ones, we observe Einstein's famous law making itself once more inarguable: energy and mass merge together to create something new, while releasing excess energy. It is this burst of released energy that is key to meeting the steep power requirements of deep-space habitats, but also of our ever more demanding spaceship drives and weapons.<br/><br/>Our scientists believe this breakthrough will help to level the playing field in the vast reaches of space. Now that the fundamentals of off-world fusion reactors have been proven possible, they predict that we shall soon see reactors running on two potent hydrogen isotopes, deuterium and tritium, but we must also master at least one of several confinement schemes to control and direct the massive energies we are creating. Once accomplished, the versatility of this energy source will surely know no bounds.  
 
 TITechTemplate.displayName.OrbitalShipbuilding=Orbital Shipbuilding
 TITechTemplate.summary.OrbitalShipbuilding=The construction of zero-g assembly facilities for non-atmospheric craft.
@@ -508,16 +500,15 @@ TITechTemplate.summary.OurSpaceFuture=As our presence in space grows, we conside
 TITechTemplate.quote.OurSpaceFuture="Believe and accept that there are other souls out there - created by the divine, as we ourselves were. It is our mission, our duty, and our privilege to join with them - a meeting of minds across the stars."<br/><align=right>{submitLeader}<align=left><br/>From a Xenobaptist propaganda leaflet, five months before the Night of Cleansing Flame<align=left>
 TITechTemplate.description.OurSpaceFuture=There can be no going backwards now; humanity has both a military and an industrial presence in space, not to mention ever-growing numbers of personnel for whom a life on Earth is an increasingly distant memory. It is time to double-down on this, to no longer think of ourselves as an Earth-bound species. This means establishing new forms of law, order, and communication to govern land, airspace, and space alike, which will create untold turbulence as our new, hybrid society grows accustomed to it. In turn, this requires specially-trained forces, to defend against threats both internal and external. We now have concrete proposals on how to achieve this - and, once it is realized, we can think in earnest about founding true, and increasingly sizable, off-Earth societies.
 
-
 TITechTemplate.displayName.OutpostHabs=Outpost Habs
 TITechTemplate.summary.OutpostHabs=Constructing long term essential modules for a permanent presence in space.
 TITechTemplate.quote.OutpostHabs="There are two types of people in this world: those who only think of home, and those who think only of leaving home."<br/><align=right>{escapeLeader}<align=left><br/><align=right>From a long-defunct online dating profile<align=left>
 TITechTemplate.description.OutpostHabs=While we have long been able to provide a few months of off-world comfort to a small handful of highly-trained astronauts, the time has come to strive for something longer-term - and even indefinite. Our newly-developed, first generation outpost habitats are the product of engineering built on decades of experience in the most hostile corners of the Earth. A far cry from our earliest ventures, which were exclusively designed for scientific research, this new breed of space station is built for versatility - to provide off-world homes for dozens of souls, and from more walks of life than astronaut and engineer. Aside from essential life support and power functionality, the outposts are designed with a space future in mind. Each outpost, already a marvel in its own right, is capable of being further customized, depending on each one's specific mission requirements.
 
-TITechTemplate.displayName.ParticleCannon=Particle Cannon
-TITechTemplate.summary.ParticleCannon=Weaponized particle accelerators bypass armor but are only useful at extremely close range.
+TITechTemplate.displayName.ParticleCannon=Particle Beams
+TITechTemplate.summary.ParticleCannon=High-energy particle accelerators that can be used to induce all manner of atomic reactions.
 TITechTemplate.quote.ParticleCannon="From gigantic atom smashers to household television tubes, particle accelerators are versatile tools. Practically, I see no reason why they could not be weaponized. Ethically is perhaps another matter."<br/><align=right>{cooperateLeader}<align=left><br/><align=right>Scientific testimony during a hearing by the Central Military Commission in Beijing<align=left>
-TITechTemplate.description.ParticleCannon=A particle cannon might sound like a concept ripped from the silver screen, yet until very recently the same was true for alien life. For the scientific community, our first prototype particle cannon has been a concept long in the making.<br/><br/>This new type of weapon fires highly focused, extremely short bursts of protons that can penetrate through various materials. These proton bundles are generated and accelerated using superconducting particle accelerators, while electromagnetic lenses focus and aim their beams.<br/><br/>Even though the tunable particle cannon can bypass most traditional armor, its range is currently very limited, due to the nature of charged particles. The particles repel each other so that, as soon as the beam leaves the confining electromagnetic fields of the accelerator, the bundle starts spreading, losing its deadly power. Nevertheless, for close combat, even in space, this first generation of particle cannon has the potential to be truly devastating. 
+TITechTemplate.description.ParticleCannon=The technology to focus a chaotic bit of matter into a well-defined, directed beam of atoms has been around for decades, but the next generation of particle accelerators employs pulsed lasers or electron afterburners within a plasma to transfer vast energies to the target particles. This reduces the size and energy requirement for accelerators dramatically; the kilometer-sized linear colliders and loops of today will soon fit in our labs and spacecraft.<br/><br/>The applications are many: Compact particle accelerators can be used in propulsion systems to trigger desired nuclear reactions. As weapons, they can wreak havoc on electronics and soft targets, but they will initially only be useful at extremely close range. Eventually, we may be able to use them in space-based colliders to help produce a hugely powerful energy storage medium - antimatter.
 
 TITechTemplate.displayName.PhasedArrayLasers=Phased-Array Lasers
 TITechTemplate.summary.PhasedArrayLasers=Advanced laser weapons, nicknamed phasers, use AI-managed mirror arrays to allow targeting at extreme ranges.
@@ -539,10 +530,15 @@ TITechTemplate.summary.PredictiveGenetics=Improves modern medicine via advances
 TITechTemplate.quote.PredictiveGenetics="If these results are accurate, we're about to upend the entire medical system. Not a soul outside this room can hear about it until we're certain our patents are watertight. And once they are, the golden age begins. Gentlemen, we are about to profit from life itself."<br/><align=right>{exploitLeader}<align=left><br/><align=right>Minutes from Sangoma Pharmaceutical's quarterly board meeting<align=left>
 TITechTemplate.description.PredictiveGenetics=Humans have long chased immortality, or at least some way to meaningfully delay the reaper's arrival. Although predictive genetics is no Philosopher's Stone, it is an enormous leap towards the prolonged sustainment of our lives, as well as dramatically improved quality of life during our later decades. Stemming from its foundations in the Human Genome Project, the latest advancements in predictive genetics will, in time, allow medical personnel to identify and correct for markers associated with complex diseases ranging from Type 2 Diabetes to the most obscure genetic disorders - and even most cancers. When combined with innovative analytics and cutting-edge AI, humans can expect to live longer, healthier lives. Once the nations of the world take full advantage of these latest developments, all but a few of the diseases and disorders which have blighted our species since we first crawled from the oceans, will soon be things of the past.
 
-TITechTemplate.displayName.ProtonBoronFusion=Proton-Boron Fusion
-TITechTemplate.summary.ProtonBoronFusion=Breakthroughs in aneutronic fusion reactions make our reactors more fuel- and cost-efficient than ever before.
-TITechTemplate.quote.ProtonBoronFusion="With all due respect, there are only two things that really matter here: Getting wherever we need to be fast, and not getting ourselves killed in the process."<br/><align=right>{resistLeader}<align=left><br/><align=right>Research Proposal Review Conference for the U.K.'s Defense and Security Accelerator<align=left>
-TITechTemplate.description.ProtonBoronFusion=Successive generations of fusion technologies have lifted us far above the gravity well of our home planet, and enabled us to reach - and exploit - neighboring worlds. Thanks to deuterium-helium-3 fusion, the gulf between us and <i>them</i> has grown ever-smaller. However, deuterium is ultimately too scarce a fuel source to indefinitely sustain our expansion into space.<br/><br/>By building upon our understanding of deuterium-helium-3 fusion, our researchers have made a significant breakthrough - sustainable aneutronic fusion reaction, with strikingly low fuel costs. Proton-boron fusion is the key. Even despite their higher ignition temperature, both protons and boron are far more abundant in the solar system than deuterium. Our latest solid energy collectors can in addition harness this reaction efficiently, as they lose no energy to neutron radiation - all energy is instead released as electromagnetic radiation.<br/><br/>This new breed of fusion reactor will create more power at lower costs, and with less shielding required, thus paving the way to larger habitats and stations, and sleeker ships with more powerful drives. Yet, this is just the beginning of our quest to harness the power of the stars themselves.
+TITechTemplate.displayName.AneutronicFusion=Aneutronic Fusion
+TITechTemplate.summary.AneutronicFusion=Breakthroughs in aneutronic fusion reactions make our reactors more fuel- and cost-efficient than ever before.
+TITechTemplate.quote.AneutronicFusion="Our technology is but a mirror of ourselves. When we reach for fusion - the power of the sun - we reach for the light that guides our path through the darkness."<br/><align=right>{submitLeader}<align=left><br/><align=right>from Seeing The Light Podcast<align=left>
+TITechTemplate.description.AneutronicFusion=Successive generations of fusion technologies have lifted us far above the gravity well of our home planet, and enabled us to reach - and exploit - neighboring worlds. Thanks to deuterium-helium-3 fusion, the gulf between us and <i>them</i> has grown ever-smaller. However, deuterium is ultimately too scarce a fuel source to indefinitely sustain our expansion into space.<br/><br/>By building upon our understanding of deuterium-helium-3 fusion, our researchers have made a significant breakthrough - sustainable aneutronic fusion reaction, with strikingly low fuel costs. The fusion of a proton and boron, and that of hydrogen and lithium-6, are the keys. Even despite their higher ignition temperature, both protons and boron are far more abundant in the solar system than deuterium. Our latest solid energy collectors can in addition harness this reaction efficiently, as they lose no energy to neutron radiation - all energy is instead released as electromagnetic radiation.<br/><br/>This new breed of fusion reactor will create more power at lower costs, and with less shielding required, thus paving the way to larger habitats and stations, and sleeker ships with more powerful drives. Yet, this is just the beginning of our quest to harness the power of the stars themselves.
+
+TITechTemplate.displayName.Superalloys=Superalloys
+TITechTemplate.summary.Superalloys=We design and assemble resilient metallic alloys from the atom up.
+TITechTemplate.quote.Superalloys="With all due respect, there are only two things that really matter here: Getting wherever we need to be fast, and not getting ourselves killed in the process."<br/><align=right>{resistLeader}<align=left><br/><align=right>Research Proposal Review Conference for the U.K.'s Defense and Security Accelerator<align=left>
+TITechTemplate.description.Superalloys=The discipline of metallurgy has taken something of a back seat in materials science as research into carbon nanotubes, diamondoids, and other carbon allotropes have leapt into the fore. But advances in predictive chemistry and nanoscale atomic manipulation also offer the ability to develop new alloys that feature combinations of metals and other materials found neither in nature nor in industrial-era furnaces. More prosaic elements as iron, aluminium, nickel, and cobalt can be arranged in synthetic patterns, and rarer elements like rhenium, tungsten, and hafnium can be added as strengtheners to these new substances. End products vary but may offer previously unknown levels of heat resistance, tensile strength, and durability in hostile environments. This can lead to advances in areas ranging from armor, heat shielding and plasma containment, and weaponry.
 
 TITechTemplate.displayName.ProtonProtonFusion=Proton-Proton Fusion
 TITechTemplate.summary.ProtonProtonFusion=By mastering the ultimate form of fusion reaction, we will tame the power of the sun. 
@@ -609,6 +605,11 @@ TITechTemplate.summary.SpaceMiningandRefining=We develop methods to extract and
 TITechTemplate.quote.SpaceMiningandRefining="We cannot just send up a bunch of diggers and hope for the best - even dirt doesn't behave the same way up there. One might as well build a house upon a pile of rice."<br/><align=right>{escapeLeader}<align=left><br/><align=right>From his irregular newsletter, "Preparing For Tomorrow."<align=left>
 TITechTemplate.description.SpaceMiningandRefining=Hauling raw materials up Earth's gravity well is the very opposite of a long-term plan. In order to spread further into space, we must be able to obtain at least some of what we need from space. Fortunately, nearby asteroids have no shortage of minerals and rare metals, from which we can begin to construct ships and facilities in space. Iron, carbon, aluminum, copper, oxygen, nitrogen, and water will be most urgently required, but gold and platinum will be readily available too. But one cannot mine in space as one would on Earth. For one thing, low or micro-gravity mean mined resources cannot tumble neatly into containers or be automatically gravity-separated by type, while structures cannot be directly built upon the surface.<br/><br/>And so it is that the first method devised to address this is a distinctly unglamorous one - a system of long (up to 1 kilometer) cables and collection bags to tether equipment to an asteroid, and to prevent mined resources from simply floating away. This is an important start, but truly mass-mining will require far more advanced solutions - and the capability to do and use more in situ form, rather than depend on what Earth can send.
 
+TITechTemplate.displayName.SpaceNavies=Space Navies
+TITechTemplate.summary.SpaceNavies=Military leaders discard terrestrial notions of command in favor of a new organizational paradigm.
+TITechTemplate.quote.SpaceNavies="Conflict in space doesn't have an exact analogue in terrestrial warfare, although our instructors keep trying to explain it like it does. Armoured warfare where the tanks are all sliding around on ice? A submarine engagement with nowhere to hide? Air combat where there's no gravity to overcome, or air to bank against? Trying to come up with a universal metaphor will lead to wrong assumptions and broken ships. Teach the physics and the decision sets they imply. Our crews can handle it."<br/><align=right>{resistLeader}<align=left><br/><align=right>Email to United Nations Space Academy commandant<align=left>
+TITechTemplate.description.SpaceNavies=Perhaps the earliest conflict in space was not between two nations but between two branches of the armed forces, the air force and the navy. Air forces made the initial claim on the domain, treating it as a slightly higher extension of their role in the air. But as launches evolved into missions and then into long-term deployments, space<i>craft</i> become space<i>ships</i>, and different routines take hold. Officers must stand watch; crew must live and work together for months or even years. But shipboard life doesn't fully mirror that of wet navies, either, with ships laid out like buildings and long periods of null gravity. Our officers and crew are learning and adapting, building new tactics and procedures, and a new culture.
+
 TITechTemplate.displayName.SpaceResearch=Space Research
 TITechTemplate.summary.SpaceResearch=We develop specialized methodologies for conducting research in zero-g and planetary environments.
 TITechTemplate.quote.SpaceResearch="I am humbled to have been chosen for this once-in-a-lifetime experience. The things they can do up here are simply incredible. Their studies on the long-term effects of microgravity are fascinating, while the strides being made in combustion could revolutionize energy production back on Earth."<br/><align=right>{cooperateLeader}<align=left><br/><align=right>Video interview from a field trip to the International Space Station<br/>Excerpted from the documentary <i>Teenage Prodigies</i><align=left>
@@ -649,6 +650,11 @@ TITechTemplate.summary.TitanicSpacecraft=Engineers develop designs for massive w
 TITechTemplate.quote.TitanicSpacecraft="I don't want to die on some miserable poison world. I want to die countless light years from Earth, with a smile on my face as I bask next to a perfect ocean, under a perfect sky."<br/><align=right>{escapeLeader}<align=left><br/><align=right>From his irregular online newsletter, "Preparing For Tomorrow."<align=left>
 TITechTemplate.description.TitanicSpacecraft=The Sol system is humanity's to explore and lay claim to, but truly doing so will require more personnel, and perhaps more might, than ever before. It perhaps might sound crude, but the best solution is the most obvious one: larger ships, able to carry more crew, more supplies, more weapons, and denser armor. What was once an engineering absurdity - for to cast so titanic a craft between worlds would have taken decades at best - is now entirely possible, thanks to our incredibly powerful reactor and propulsion technologies. Mass is, as ever, the foremost obstacle, compounded by the need to carry sufficient fuel and propellant to maintain a high Delta-v for weeks at a time. And, for any potential attempt to leave this system for another, even years. So it is that we now have workable designs for enormous craft built around the "torchship" principle, possessing both high thrust and high specific impulse, in a state of near-constant acceleration, and so nakedly powerful that the mass of their vast hulls is barely a factor. 
 
+TITechTemplate.displayName.Tokamaks=Tokamaks
+TITechTemplate.summary.Tokamaks=A new generation of toroidal fusion reactors and drives relying on magnetic confinement methods.
+TITechTemplate.quote.Tokamaks="Tell me what we need to send more people further, faster. Otherwise we'll be stuck playing defense forever - and that's just a slow way to lose."<br/><align=right>{resistLeader}<align=left><br/><align=right>Attending a technical design briefing for the UK space program<align=left>
+TITechTemplate.description.Tokamaks=Our earlier successes with magnetic confinement fusion relied on massive magnetic mirrors arrayed in a line. While functional, the mass limited its capabilities as a long-range propulsion system. Our next step is to develop tokamaks, a Russian term for reactors that contain the fusion plasma within a magnetic torus. Holding high-energy plasma within magnetic fields has been likened to using wet spaghetti to hold melting gelatin, but with sufficient computer-aided management of the fields, we have been able to induce a net energy gain and can begin developing new propulsion systems that make use of it.
+
 TITechTemplate.displayName.TransformPhages=Transform Phages
 TITechTemplate.summary.TransformPhages=Genetic engineers create biological machines that can edit a living human's genome.
 TITechTemplate.quote.TransformPhages="I was born with two club feet. For this reason, playground games were impossible for me. So instead, I read and read and read. Though they cause me daily pain, I treasure these warped feet of mine. They made me everything I am today."<br/><align=right>{cooperateLeader}<align=left><br/><align=right>Lecture at Xi'an Jiaotong University<align=left>
@@ -705,7 +711,7 @@ TITechTemplate.quote.FutureTechEnergy=<skip/>
 TITechTemplate.description.FutureTechEnergy=-Energy projects each faction previously failed to trigger have a chance to unlock.
 
 TITechTemplate.displayName.FutureTechMilitaryScience=Future Tech: Military Science
-TITechTemplate.summary.FutureTechMilitaryScience=The organized application of force will always remain one means to a desired politcal end. May it never become an end in and of itself.
+TITechTemplate.summary.FutureTechMilitaryScience=The organized application of force will always remain one means to a desired political end. May it never become an end in and of itself.
 TITechTemplate.quote.FutureTechMilitaryScience=<skip/>
 TITechTemplate.description.FutureTechMilitaryScience=-Military Science projects each faction previously failed to trigger have a chance to unlock.
 
@@ -739,7 +745,6 @@ TITechTemplate.quote.ResistanceLifeScience="In her final days, my mother told me
 TITechTemplate.quote.ResistanceMaterials="Materials have always defined human advancement. Stone and iron, steel and silicon. So to clarify my question: Is this the next discovery that defines our future?"
 TITechTemplate.quote.ResistanceEnergy="Solving the energy crisis? We said that when we developed nuclear power and again when we mastered fusion. Let's be realistic here: whatever new technology you invent to generate power, we will find a way to need more."
 TITechTemplate.quote.ResistanceInformationScience="I don't want to sound like a broken record but information is our greatest weapon. So, let's call the researcher back in to hear her proposal. And this time, don't interrupt her just because you don't understand the details yet."
-TITechTemplate.quote.ResistanceMilitaryScience="Conflict in space doesn't have an exact analog in terrestrial warfare, although our instructors keep trying to explain it like it does. Armored warfare where the tanks are all sliding around on ice? A submarine engagement with nowhere to hide? Air combat where there's no gravity to overcome, or air to bank against? Trying to come up with a universal metaphor will lead to wrong assumptions and broken ships. Teach the physics and the decision sets they imply. Our crews can handle it."
 TITechTemplate.quote.ResistanceSocialScience="I have seen what the prospect of nuclear armageddon did to society; I have witnessed what the arrival of aliens brought out in mankind. Let's assume I have a decent enough handle on how the human psyche works to understand the basics."
 
 TITechTemplate.quote.EscapeSpaceScience="That planet in Pegasus changed everything. The first exoplanet orbiting a Sun-like star. Its discovery in 1995 revolutionized the field of astronomy. And, of course, opened the pathway to leaving Earth behind and traveling to new worlds." 
@@ -773,6 +778,7 @@ TITechTemplate.quote.AppeaseEnergy="In generating more than enough power for all
 TITechTemplate.quote.AppeaseInformationScience="Yes, knowledge is power, but power for what purpose, Ifechi? I want to believe that the more we learn, the more we grow. But the older I get, the more trouble I have shaking the feeling that we are dangerously close to the forbidden fruit of myth."
 TITechTemplate.quote.AppeaseMilitaryScience="For all our advancement, we continue to devise increasingly efficient ways to kill each other. If this has taught me anything, it's that our sad purpose is the eternal refinement of the ultimate weapon: ourselves."
 TITechTemplate.quote.AppeaseSocialScience="There is a theory that humans have a maximum quantity of others they can care about. Radiating in concentric circles, the further the circle, the less we care. We are a space-faring species, and our circle is now infinite. So, how do we start to care more?"
+TITechTemplate.quote.AppeaseSocialScience2="If we are to contemplate founding human society on another world, it is imperative that we learn from our past mistakes. It is a chance to start afresh, with fairness and equality the very bedrock of how we live."<br/><align=right>{appeaseLeader}<align=left><br/><align=right>Speech at the International Peace Conference<align=left>
 
 TITechTemplate.quote.CooperateSpaceScience="As a teenager, looking at the night sky, my mind raced with possibilities as I wondered 'What if?' Now, as a woman effortlessly transitioning from station to colony to warship, I consider, 'How far?'"
 TITechTemplate.quote.CooperateSpaceScience2="Even our greatest technologies only enable us to see five percent of our universe. Just imagine what we will learn once we can gaze upon the remaining ninety-five percent."
@@ -783,7 +789,6 @@ TITechTemplate.quote.CooperateInformationScience="The biggest breakthroughs in h
 TITechTemplate.quote.CooperateMilitaryScience="I am as impressed as I am distraught. This innovation will undoubtedly make the lives of our colonists much better and safer. But how long until someone figures out it can kill his neighbor?"
 TITechTemplate.quote.CooperateSocialScience="Coming together despite our differences is not easy. <i>Staying</i> together is a never-ending struggle that spans generations. What we are building is difficult, but that makes it worthwhile. Ultimately, we are what we do when it counts."
 
-TITechTemplate.quote.ExploitSpaceScience="The final frontier proved a bit underwhelming, no? 'Veni, vidi, vici' is great, but how do you say 'I leased it at triple market rate' in Latin?"
 TITechTemplate.quote.ExploitLifeScience="Ingenious. Now, if you figure out a way to make it better, I'll give you a raise. If you figure out a way to make it <i>cheaper</i>, I'll promote you all." 
 TITechTemplate.quote.ExploitMaterials="Stop. I don't want to know <i>which</i> regulations we broke, because we didn't. I need to know exactly how we did <i>not</i> break these regulations."
 TITechTemplate.quote.ExploitEnergy="Yes, you're all as terribly clever as you are terrible at listening. You've completely missed my meaning when I said I wanted greener energy. If it doesn't make us money, our money isn't making it."
@@ -791,4 +796,14 @@ TITechTemplate.quote.ExploitInformationScience="Bury it somewhere inside the lic
 TITechTemplate.quote.ExploitMilitaryScience="Leak the schematics. And offload as much surplus ammo as you can. These kinetic barriers are the only thing that can stop them, and at the price we're selling them, a half-dozen covers our losses."
 TITechTemplate.quote.ExploitSocialScience="The early Romans were spot on with their plan: park an army outside your territory and offer you the chance to join or die. For the small price of subsuming your culture, you too could enjoy not dying. Brilliant."
 
-TITechTemplate.desc.EndGameReroll=Upon completion, endgame Techs re-roll to unlock projects for Factions.
\ No newline at end of file
+TITechTemplate.desc.EndGameReroll=Upon completion, endgame Techs re-roll to unlock projects for Factions.
+
+TITechTemplate.summary.HighEnergyElectrostaticPropulsion_deprecated=We further refine thrusters that use static electric fields for acceleration.
+TITechTemplate.description.HighEnergyElectrostaticPropulsion_deprecated=Our solar system is a treasure trove of resources that will help us become the space-faring race we are surely destined to be. This does not remove the need for human ingenuity, of course. So it is to a further evolution of electrostatic propulsion systems that we now look, as we seek to explore the furthest corners of the sol system - and, perhaps, beyond.<br/><br/>This new thruster concept is based on our existing electrostatic drives, but employs far stronger fields in combination with a lighter, ionized propellant. The latter can be accelerated faster and to significantly greater maximum velocities; while the strengthened fields also have a smaller footprint, allowing for more compact drive design. Ships equipped with these new thrusters will comfortably exceed the current limitations of space travel.
+TITechTemplate.summary.HighEnergyElectrothermalPropulsion_deprecated=By enhancing our control over electromagnetic fields, we can generate high-energy plasma to heat lighter propellant.
+TITechTemplate.description.HighEnergyElectrothermalPropulsion_deprecated=Until now, our current spacecraft had only limited reach, allowing us only to explore our nearest neighbors; however, high-energy electrothermal propulsion will help us to extend our influence into the farthest corners of this solar system.<br/><br/>Based on existing electrothermal drives, our researchers have refined the electromagnetic containment fields, allowing us to supercharge the plasma. These new containment fields are able to directly weave the supercharged plasma through the light-weight propellant. This creates a highly energetic flow of gas within the nozzle system. By using a new fully frictionless coating, the gas flow can reach far higher velocities than the previous generation. These higher velocities translate directly into more powerful thrust, while offering precise directional control - exactly what is needed to make exploration of the outer planets feasible. 
+TITechTemplate.description.ParticleCannon_Deprecated=A particle cannon might sound like a concept ripped from the silver screen, yet until very recently the same was true for alien life. For the scientific community, our first prototype particle cannon has been a concept long in the making.<br/><br/>This new type of weapon fires highly focused, extremely short bursts of protons that can penetrate through various materials. These proton bundles are generated and accelerated using superconducting particle accelerators, while electromagnetic lenses focus and aim their beams.<br/><br/>Even though the tunable particle cannon can bypass most traditional armor, its range is currently very limited, due to the nature of charged particles. The particles repel each other so that, as soon as the beam leaves the confining electromagnetic fields of the accelerator, the bundle starts spreading, losing its deadly power. Nevertheless, for close combat, even in space, this first generation of particle cannon has the potential to be truly devastating. 
+TITechTemplate.summary.NeutroniumContainment_Deprecated=Physicists investigate ways to contain free neutrons and prevent their decay, allowing us to use them as a catalyst.
+TITechTemplate.description.NeutroniumContainment_Deprecated=The use of neutronium - the same as the material found at the core of a massive neutron star - as a potential energy source requires, first and foremost, the capability to recreate the intense gravity that first created it, else it would rapidly decay in a burst of deadly radiation. Once harnessed, it is this very burst that can provide incredible amounts of energy, but containment of such free neutrons has thus far eluded even our brightest minds. However, our scientists now believe that they can build upon their work in ultra-dense diamondoids to create a honeycomb-like latticework, capable of finally containing the incredible pressure of the sub-atomic particles of which constitute this neutron-degenerate matter (caused because no two such particles can exist in the same place at the same time), and thus preventing their premature decay. By finally (and safely) bending neutronium to our will, they believe we can build fission-based spacecraft drives of once-unimaginable power. 
+TITechTemplate.summary.HydrogenLithium6Fusion_deprecated=Scientists reach for the sky by taming the first aneutronic fusion reaction to harness energy. 
+TITechTemplate.description.HydrogenLithium6Fusion_deprecated=Now that we can construct fusion reactors in space, we can turn our gaze towards the various options for fuel sources. Both hydrogen and lithium are abundant resources in our solar system. By using our understanding of lithium from our nuclear fission and weapons research, we can create the first generation of hydrogen-lithium-6 fusion reactors.<br/><br/>Fusing hydrogen with lithium involves an aneutronic reaction, the benefit of which is that we can collect the energy using water and turbines, since it is mostly released as electromagnetic radiation rather than neutrons. Converting this electromagnetic radiation into electricity is far easier than trying to capture neutrons. In addition, our reactors can forgo the heavy neutron shielding required to protect all living matter in the vicinity, making them lighter and smaller than previous generations.<br/><br/>We can in turn then build faster and lighter ships, which will aid our expansion deeper into the solar system.  
diff --git a/app/game/localization/TIUtilityModuleTemplate.en b/app/game/localization/TIUtilityModuleTemplate.en
index b2c9113..3ec391d 100644
--- a/app/game/localization/TIUtilityModuleTemplate.en
+++ b/app/game/localization/TIUtilityModuleTemplate.en
@@ -1,17 +1,19 @@
 TIUtilityModuleTemplate.displayName.ISRUModule=ISRU Module
-TIUtilityModuleTemplate.description.ISRUModule=The In-Situ Resource Utilization Module will allow ships to re-propellant at unimproved hab sites that produce all raw materials used in the ship's propellant. Ships that that have <h>anything</h> listed as their propellant may re-propellant at any site.
+TIUtilityModuleTemplate.description.ISRUModule=The In-Situ Resource Utilization Module will allow ships to re-propellant at unimproved hab sites that produce all raw materials used in the ship's propellant. Ships that that have <h>anything</h> listed as their propellant may re-propellant at any site. Prohibited for ships that use antimatter in their propellant.
 TIUtilityModuleTemplate.displayName.RemassScoop=Remass Scoop
 TIUtilityModuleTemplate.description.RemassScoop=The remass scoop gives the ship aerodynamic qualities, preventing damage from aerobraking, and allows it to refill <h>hydrogen</h> propellant stores with <color=#FFFFFFFF><sprite name="water"></color> as its only component from interface orbits of Jovian planets. Ships that have <h>anything</h> listed as their propellant may re-propellant at Jovian worlds as well.
 TIUtilityModuleTemplate.displayName.MuonSpiker=Muon Spiker
 TIUtilityModuleTemplate.description.MuonSpiker=Muons catalyze nuclear fusion reactions, granting a {1} bonus to thrust to fusion drives.
 TIUtilityModuleTemplate.displayName.NeutroniumSpiker=Neutronium Spiker
-TIUtilityModuleTemplate.description.NeutroniumSpiker=Small numbers of free neutrons are generated and then used to catalyze nuclear reactions, giving a {1} bonus to thrust in fission and fusion drives.
+TIUtilityModuleTemplate.description.NeutroniumSpiker=Small numbers of free neutrons are generated and then used to catalyze nuclear reactions, giving a {1} bonus to thrust in fission drives.
 TIUtilityModuleTemplate.displayName.AntimatterSpiker=Antimatter Spiker
 TIUtilityModuleTemplate.description.AntimatterSpiker=Tiny amounts of antimatter are stored and used to catalyze nuclear reactions, giving a {1} bonus to thrust in fission and fusion drives. 
 TIUtilityModuleTemplate.displayName.MobileSpaceScienceLab=Mobile Space Science Lab
 TIUtilityModuleTemplate.description.MobileSpaceScienceLab=A scientific team joins the crew, granting a {5} bonus to Space Science research and enabling the ship to prospect space bodies for suitable base sites from interface orbits.
 TIUtilityModuleTemplate.displayName.RepairBay=Repair Bay
-TIUtilityModuleTemplate.description.RepairBay=An expanded damage control team as well as a workshop to conduct more extensive repairs away from the shipyard.
+TIUtilityModuleTemplate.description.RepairBay=An expanded damage control team as well as a workshop to conduct more extensive repairs away from the shipyard. <br><br/>Significantly increases the effectiveness of your damage control teams during combat. Out of combat the Repair Bay allows for the Bridge, Life Support, Battery, and Damage Control modules to be partially repaired and increases the repair cap on destroyed modules from 5% to 25%. <br><br/><h>Note that some modules such as weapons and utility modules can only be repaired at a station once destroyed.</h>
+TIUtilityModuleTemplate.displayName.SalvageBay=Salvage Bay
+TIUtilityModuleTemplate.description.SalvageBay=A squadron of drones and technicians that gather material from destroyed ships following a battle. Increases our salvage by up to {8}. A fleet cannot increase its salvage bonus above 50%.
 TIUtilityModuleTemplate.displayName.MarineAssaultUnit=Marine Assault Unit
 TIUtilityModuleTemplate.description.MarineAssaultUnit=Allows ship to launch assaults on habs. Assault Value: <color=#FFFFFFFF><sprite name="army_level"></color>{3}.
 TIUtilityModuleTemplate.displayName.AdvancedMarineAssaultUnit=Advanced Marine Assault Unit
@@ -25,9 +27,13 @@ TIUtilityModuleTemplate.description.Rangers=Veteran space Marine unit for our sh
 TIUtilityModuleTemplate.displayName.Immortals=Immortals
 TIUtilityModuleTemplate.description.Immortals=Our most devoted and expert space Marines. Assault Value: <color=#FFFFFFFF><sprite name="army_level"></color>{3}.
 TIUtilityModuleTemplate.displayName.LaserEngine=Laser Engine
-TIUtilityModuleTemplate.description.LaserEngine=Increases all laser weapon power by {0} MJ, meaning this ship's laser weapons do more damage at longer ranges. Bonus stacks with additional laser engine modules.
+TIUtilityModuleTemplate.description.LaserEngine=Increases all offensive laser weapon power by {0} MJ so a ship's laser weapons do more damage at longer ranges. Bonus is reduced for purely point defense weapons. Bonus stacks with additional laser engine modules.
 TIUtilityModuleTemplate.displayName.AdvancedLaserEngine=Advanced Laser Engine
-TIUtilityModuleTemplate.description.AdvancedLaserEngine=Increases all laser weapon power by {0} MJ, meaning this ship's laser weapons do more damage at longer ranges. Bonus stacks with additional laser engine modules.
+TIUtilityModuleTemplate.description.AdvancedLaserEngine=Increases all offensive laser weapon power by {0} MJ, so a ship's laser weapons do more damage at longer ranges. Bonus is reduced for purely point defense weapons. Bonus stacks with additional laser engine modules.
+TIUtilityModuleTemplate.displayName.Cyclotron=Cyclotron
+TIUtilityModuleTemplate.description.Cyclotron=Increases all particle weapon power by {13} MJ, causing them to do more damage. Bonus is lower for purely point defense particle weapons. Bonus stacks with additional cyclotron modules.
+TIUtilityModuleTemplate.displayName.VectorThrusters=Vector Thrusters
+TIUtilityModuleTemplate.description.VectorThrusters=Extra rotational thrusters provide {12} additional Newtons of force, leading to quicker ship rotations. <h>Very small ships may see no benefit if the maximum possible rotation already exceeds human limits.</h>
 TIUtilityModuleTemplate.displayName.LiquidHydrogenContainment=Liquid Hydrogen Containment
 TIUtilityModuleTemplate.description.LiquidHydrogenContainment=Long-term storage tanks for stable liquid hydrogen, granting an effective {2} bonus to the ship's exhaust velocity.
 TIUtilityModuleTemplate.displayName.SlushHydrogenTankage=Slush Hydrogen Tankage
@@ -37,11 +43,11 @@ TIUtilityModuleTemplate.description.HydronTrap=Storage tanks for stabilized mona
 TIUtilityModuleTemplate.displayName.Magazine=Magazine
 TIUtilityModuleTemplate.description.Magazine=Feeder hardware and storage that adds an additional full ammo load for all projectile weapons with ammo counts. Mass and ammo increase are recorded with individual weapons.
 TIUtilityModuleTemplate.displayName.ComponentArmor=Component Armor
-TIUtilityModuleTemplate.description.ComponentArmor=Protective plating applied to the ship's systems and modules. Halves all damage taken by the ship's internal components in combat.
+TIUtilityModuleTemplate.description.ComponentArmor=Protective plating applied to the ship's systems and modules. Reduces all damage taken by the ship's internal components in combat by {10}.
 TIUtilityModuleTemplate.displayName.SolarPlatformKit=Solar Platform Kit
-TIUtilityModuleTemplate.description.SolarPlatformKit=Allows creation of a small solar-powered space station with a construction module at the ship's location. Not viable beyond Earth's orbit around the Sun. Can be replenished by repairing the ship at a shipyard.
+TIUtilityModuleTemplate.description.SolarPlatformKit=Allows creation of a small solar-powered space station with a construction module at the ship's location. Not viable beyond Earth's orbit around the Sun. Can be replenished by resupplying the ship at a shipyard.
 TIUtilityModuleTemplate.displayName.SolarOutpostKit=Solar Outpost Kit
-TIUtilityModuleTemplate.description.SolarOutpostKit=Allows creation of a small solar-powered base with a construction module on the surface of a space body orbits no further than Earth's orbit around the Sun. Can be replenished by repairing the ship at a shipyard.
+TIUtilityModuleTemplate.description.SolarOutpostKit=Allows creation of a small solar-powered base with a construction module on the surface of a space body that orbits no further than Earth's orbit around the Sun. Can be replenished by resupplying the ship at a shipyard.
 TIUtilityModuleTemplate.displayName.FissionPlatformKit=Fission Platform Kit
 TIUtilityModuleTemplate.description.FissionPlatformKit=Allows creation of a small nuclear-powered space station with a construction module at the ship's location. Can be replenished by repairing the ship at a shipyard.
 TIUtilityModuleTemplate.displayName.FissionOutpostKit=Fission Outpost Kit
@@ -51,19 +57,29 @@ TIUtilityModuleTemplate.description.FusionPlatformKit=Allows creation of a small
 TIUtilityModuleTemplate.displayName.FusionOutpostKit=Fusion Outpost Kit
 TIUtilityModuleTemplate.description.FusionOutpostKit=Allows creation of a small fusion-powered base with a construction module on the surface of a space body. Can be replenished by repairing the ship at a shipyard.
 TIUtilityModuleTemplate.displayName.AutomatedSolarPlatformKit=Automated Solar Platform Kit
-TIUtilityModuleTemplate.description.AutomatedSolarPlatformKit=Allows creation of one small solar-powered supply depot and station at the ship's location. Not viable beyond Earth's orbit around the Sun. Can be replenished by repairing the ship at a shipyard.
+TIUtilityModuleTemplate.description.AutomatedSolarPlatformKit=Allows creation of one small solar-powered supply depot and station at the ship's location. Not viable beyond Earth's orbit around the Sun. Can be replenished by resupplying the ship at a shipyard.
 TIUtilityModuleTemplate.displayName.AutomatedSolarOutpostKit=Automated Solar Outpost Kit
-TIUtilityModuleTemplate.description.AutomatedSolarOutpostKit=Allows creation of a small solar-powered mining base on the surface of a space body inward of Mars. Can be replenished by repairing the ship at a shipyard.
+TIUtilityModuleTemplate.description.AutomatedSolarOutpostKit=Allows creation of a small solar-powered mining base on the surface of a space body that orbits no further than Earth's orbit around the Sun. Can be replenished by resupplying the ship at a shipyard.
 TIUtilityModuleTemplate.displayName.AutomatedFissionPlatformKit=Automated Fission Platform Kit
 TIUtilityModuleTemplate.description.AutomatedFissionPlatformKit=Allows creation of a small nuclear-powered supply depot and station at the ship's location. Can be replenished by repairing the ship at a shipyard.
 TIUtilityModuleTemplate.displayName.AutomatedFissionOutpostKit=Automated Fission Outpost Kit
 TIUtilityModuleTemplate.description.AutomatedFissionOutpostKit=Allows creation of a small nuclear-powered mining base on the surface of a space body. Can be replenished by repairing the ship at a shipyard.
 TIUtilityModuleTemplate.displayName.ElectronicCountermeasures1=ECM
-TIUtilityModuleTemplate.description.ElectronicCountermeasures1=Electronic Countermeasures interfere with the guidance of enemy missiles and torpedos to provide a {6} chance of the missile detonating early with no damage. Requires a special project to work against alien missiles.
-TIUtilityModuleTemplate.displayName.ElectronicCountermeasures2=ECM Mark II
-TIUtilityModuleTemplate.description.ElectronicCountermeasures2=Electronic Countermeasures interfere with the guidance of enemy missiles and torpedos to provide a {6} chance of the missile detonating early with no damage. Requires a special project to work against alien missiles.
-TIUtilityModuleTemplate.displayName.ElectronicCountermeasures3=ECM Mark III
-TIUtilityModuleTemplate.description.ElectronicCountermeasures3=Electronic Countermeasures interfere with the guidance of enemy missiles and torpedos to provide a {6} chance of the missile detonating early with no damage. Requires a special project to work against alien missiles.
+TIUtilityModuleTemplate.description.ElectronicCountermeasures1=Electronic Countermeasures have up to a {6} chance to force an enemy weapon into cooldown when this ship is targeted, with ECM effectiveness decreasing with decreased range to the enemy. Non-nuclear missiles also have a {6} chance to detonate early and do no damage. Requires a special project to work against alien weapons.
+TIUtilityModuleTemplate.displayName.ElectronicCountermeasures2=ECM Mk2
+TIUtilityModuleTemplate.description.ElectronicCountermeasures2=Electronic Countermeasures have up to a {6} chance to force an enemy weapon into cooldown when this ship is targeted, with ECM effectiveness decreasing with decreased range to the enemy. Non-nuclear missiles also have a {6} chance to detonate early and do no damage. Requires a special project to work against alien weapons.
+TIUtilityModuleTemplate.displayName.ElectronicCountermeasures3=ECM Mk3
+TIUtilityModuleTemplate.description.ElectronicCountermeasures3=Electronic Countermeasures have up to a {6} chance to force an enemy weapon into cooldown when this ship is targeted, with ECM effectiveness decreasing with decreased range to the enemy. Non-nuclear missiles also have a {6} chance to detonate early and do no damage. Requires a special project to work against alien weapons.
+TIUtilityModuleTemplate.displayName.TargetingComputer1=Targeting Computer
+TIUtilityModuleTemplate.description.TargetingComputer1=Improves a ship's rolls to overcome enemy ECM and damage to sensors by {9}.
+TIUtilityModuleTemplate.displayName.TargetingComputer2=Targeting Computer Mk2
+TIUtilityModuleTemplate.description.TargetingComputer2=Improves a ship's rolls to overcome enemy ECM and damage to sensors by {9}.
+TIUtilityModuleTemplate.displayName.TargetingComputer3=Targeting Computer Mk3
+TIUtilityModuleTemplate.description.TargetingComputer3=Improves a ship's rolls to overcome enemy ECM and damage to sensors by {9}.
+TIUtilityModuleTemplate.displayName.FlagBridge=Flag Bridge
+TIUtilityModuleTemplate.description.FlagBridge=A fleet coordination center led by a senior commander and staff. Reduces mission control cost for the fleet by {7}. Only one ship per fleet may provide this bonus. The fleet must have at least two ships.
+TIUtilityModuleTemplate.displayName.ArmorStruts=Armor Struts
+TIUtilityModuleTemplate.description.ArmorStruts=Reinforced struts that increase the amount of armor each facing on the ship can carry by {11}.
 TIUtilityModuleTemplate.displayName.HydraInfiltrationPod=Unknown
 TIUtilityModuleTemplate.description.HydraInfiltrationPod=This module has an unknown function.
 TIUtilityModuleTemplate.displayName.SalamanderTerrorUnitPod=Unknown
@@ -76,6 +92,8 @@ TIUtilityModuleTemplate.displayName.AlienFusionPlatformKit=Unknown
 TIUtilityModuleTemplate.description.AlienFusionPlatformKit=This module has an unknown function.
 TIUtilityModuleTemplate.displayName.AlienNeutroniumSpiker=Unknown
 TIUtilityModuleTemplate.description.AlienNeutroniumSpiker=This module has an unknown function.
+TIUtilityModuleTemplate.displayName.AlienMuonSpiker=Unknown
+TIUtilityModuleTemplate.description.AlienMuonSpiker=This module has an unknown function.
 TIUtilityModuleTemplate.displayName.AlienSlushHydrogenTankage=Unknown
 TIUtilityModuleTemplate.description.AlienSlushHydrogenTankage=This module has an unknown function.
 TIUtilityModuleTemplate.displayName.AlienHydronTrap=Unknown
@@ -84,8 +102,16 @@ TIUtilityModuleTemplate.displayName.AlienRepairBay=Unknown
 TIUtilityModuleTemplate.description.AlienRepairBay=This module has an unknown function.
 TIUtilityModuleTemplate.displayName.AlienECM=Unknown
 TIUtilityModuleTemplate.description.AlienECM=This module has an unknown function.
+TIUtilityModuleTemplate.displayName.AlienTargetingComputer=Unknown
+TIUtilityModuleTemplate.description.AlienTargetingComputer=This module has an unknown function.
 TIUtilityModuleTemplate.displayName.AlienSurveillanceModule=Unknown
 TIUtilityModuleTemplate.description.AlienSurveillanceModule=This module has an unknown function.
+TIUtilityModuleTemplate.displayName.AlienMagazine=Unknown
+TIUtilityModuleTemplate.description.AlienMagazine=This module has an unknown function.
 TIUtilityModuleTemplate.description.RequiresHydrogenPropellant=<h>Requires a drive that can use hydrogen as propellant.</h>
+TIUtilityModuleTemplate.description.RequiresFissionDrive=<h>Requires a nuclear fission drive.</h>
 TIUtilityModuleTemplate.description.RequiresNuclearDrive=<h>Requires a nuclear drive.</h>
-TIUtilityModuleTemplate.description.RequiresFusionDrive=<h>Requires a nuclear fusion drive.</h>
\ No newline at end of file
+TIUtilityModuleTemplate.description.RequiresFusionDrive=<h>Requires a nuclear fusion drive.</h>
+TIUtilityModuleTemplate.description.RequiresNonISRUDrive=<h>Not allowed on ships with drives that have an innate ISRU capability.</h>
+TIUtilityModuleTemplate.description.ConsTier=<h>Only allowed on larger hulls.</h>
+TIUtilityModuleTemplate.description.ImmuneToDamage=<h>This module cannot be damaged.</h>
\ No newline at end of file
diff --git a/app/game/templates/TIDriveTemplate.json b/app/game/templates/TIDriveTemplate.json
index 7bda93e..1b1ff0f 100644
--- a/app/game/templates/TIDriveTemplate.json
+++ b/app/game/templates/TIDriveTemplate.json
@@ -5,15 +5,17 @@
    "thrusters": 1,
    "notes": "Shuttle Booster x1",
    "driveClassification": "Chemical",
+   "requiredProjectName": "Project_Solid-FuelSpaceRockets",
    "thrust_N": 14820000,
    "EV_kps": 2.6,
    "specificPower_kgMW": 0,
    "efficiency": 1,
+   "thrustRating_GW": "19.266",
+   "req power": "0.000",
    "flatMass_tons": 66,
    "requiredPowerPlant": "Any_General",
    "thrustCap": 1,
    "cooling": "Open",
-   "requiredProjectName": "Project_Solid-FuelSpaceRockets",
    "weightedBuildMaterials": {
       "water": 0,
       "volatiles": 0,
@@ -30,7 +32,6 @@
       "antimatter": 0,
       "exotics": 0
    },
-   "interstellar": false,
    "iconResource": "shipbuildericons/ICO_ApexSolidRocket"
 },
  {
@@ -38,15 +39,17 @@
    "friendlyName": "Apex Solid Rocket x2",
    "thrusters": 2,
    "driveClassification": "Chemical",
+   "requiredProjectName": "Project_Solid-FuelSpaceRockets",
    "thrust_N": 29640000,
    "EV_kps": 2.6,
    "specificPower_kgMW": 0,
    "efficiency": 1,
+   "thrustRating_GW": "38.532",
+   "req power": "0.000",
    "flatMass_tons": 132,
    "requiredPowerPlant": "Any_General",
    "thrustCap": 1,
    "cooling": "Open",
-   "requiredProjectName": "Project_Solid-FuelSpaceRockets",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -61,15 +64,17 @@
    "friendlyName": "Apex Solid Rocket x3",
    "thrusters": 3,
    "driveClassification": "Chemical",
+   "requiredProjectName": "Project_Solid-FuelSpaceRockets",
    "thrust_N": 44460000,
    "EV_kps": 2.6,
    "specificPower_kgMW": 0,
    "efficiency": 1,
+   "thrustRating_GW": "57.798",
+   "req power": "0.000",
    "flatMass_tons": 198,
    "requiredPowerPlant": "Any_General",
    "thrustCap": 1,
    "cooling": "Open",
-   "requiredProjectName": "Project_Solid-FuelSpaceRockets",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -84,15 +89,17 @@
    "friendlyName": "Apex Solid Rocket x4",
    "thrusters": 4,
    "driveClassification": "Chemical",
+   "requiredProjectName": "Project_Solid-FuelSpaceRockets",
    "thrust_N": 59280000,
    "EV_kps": 2.6,
    "specificPower_kgMW": 0,
    "efficiency": 1,
+   "thrustRating_GW": "77.064",
+   "req power": "0.000",
    "flatMass_tons": 264,
    "requiredPowerPlant": "Any_General",
    "thrustCap": 1,
    "cooling": "Open",
-   "requiredProjectName": "Project_Solid-FuelSpaceRockets",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -107,15 +114,17 @@
    "friendlyName": "Apex Solid Rocket x5",
    "thrusters": 5,
    "driveClassification": "Chemical",
+   "requiredProjectName": "Project_Solid-FuelSpaceRockets",
    "thrust_N": 74100000,
    "EV_kps": 2.6,
    "specificPower_kgMW": 0,
    "efficiency": 1,
+   "thrustRating_GW": "96.330",
+   "req power": "0.000",
    "flatMass_tons": 330,
    "requiredPowerPlant": "Any_General",
    "thrustCap": 1,
    "cooling": "Open",
-   "requiredProjectName": "Project_Solid-FuelSpaceRockets",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -130,15 +139,17 @@
    "friendlyName": "Apex Solid Rocket x6",
    "thrusters": 6,
    "driveClassification": "Chemical",
+   "requiredProjectName": "Project_Solid-FuelSpaceRockets",
    "thrust_N": 88920000,
    "EV_kps": 2.6,
    "specificPower_kgMW": 0,
    "efficiency": 1,
+   "thrustRating_GW": "115.596",
+   "req power": "0.000",
    "flatMass_tons": 396,
    "requiredPowerPlant": "Any_General",
    "thrustCap": 1,
    "cooling": "Open",
-   "requiredProjectName": "Project_Solid-FuelSpaceRockets",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -154,15 +165,17 @@
    "thrusters": 1,
    "notes": "Saturn V F-1 x2",
    "driveClassification": "Chemical",
+   "requiredProjectName": "Project_Liquid-FuelRockets",
    "thrust_N": 15481000,
    "EV_kps": 2.98,
    "specificPower_kgMW": 0,
    "efficiency": 1,
+   "thrustRating_GW": "23.067",
+   "req power": "0.000",
    "flatMass_tons": 17,
    "requiredPowerPlant": "Any_General",
    "thrustCap": 1,
    "cooling": "Open",
-   "requiredProjectName": "Project_Liquid-FuelRockets",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -178,15 +191,17 @@
    "friendlyName": "Meteor Liquid Rocket x2",
    "thrusters": 2,
    "driveClassification": "Chemical",
+   "requiredProjectName": "Project_Liquid-FuelRockets",
    "thrust_N": 30962000,
    "EV_kps": 2.98,
    "specificPower_kgMW": 0,
    "efficiency": 1,
+   "thrustRating_GW": "46.133",
+   "req power": "0.000",
    "flatMass_tons": 34,
    "requiredPowerPlant": "Any_General",
    "thrustCap": 1,
    "cooling": "Open",
-   "requiredProjectName": "Project_Liquid-FuelRockets",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -202,15 +217,17 @@
    "friendlyName": "Meteor Liquid Rocket x3",
    "thrusters": 3,
    "driveClassification": "Chemical",
+   "requiredProjectName": "Project_Liquid-FuelRockets",
    "thrust_N": 46443000,
    "EV_kps": 2.98,
    "specificPower_kgMW": 0,
    "efficiency": 1,
+   "thrustRating_GW": "69.200",
+   "req power": "0.000",
    "flatMass_tons": 51,
    "requiredPowerPlant": "Any_General",
    "thrustCap": 1,
    "cooling": "Open",
-   "requiredProjectName": "Project_Liquid-FuelRockets",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -226,15 +243,17 @@
    "friendlyName": "Meteor Liquid Rocket x4",
    "thrusters": 4,
    "driveClassification": "Chemical",
+   "requiredProjectName": "Project_Liquid-FuelRockets",
    "thrust_N": 61924000,
    "EV_kps": 2.98,
    "specificPower_kgMW": 0,
    "efficiency": 1,
+   "thrustRating_GW": "92.267",
+   "req power": "0.000",
    "flatMass_tons": 68,
    "requiredPowerPlant": "Any_General",
    "thrustCap": 1,
    "cooling": "Open",
-   "requiredProjectName": "Project_Liquid-FuelRockets",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -250,15 +269,17 @@
    "friendlyName": "Meteor Liquid Rocket x5",
    "thrusters": 5,
    "driveClassification": "Chemical",
+   "requiredProjectName": "Project_Liquid-FuelRockets",
    "thrust_N": 77405000,
    "EV_kps": 2.98,
    "specificPower_kgMW": 0,
    "efficiency": 1,
+   "thrustRating_GW": "115.333",
+   "req power": "0.000",
    "flatMass_tons": 85,
    "requiredPowerPlant": "Any_General",
    "thrustCap": 1,
    "cooling": "Open",
-   "requiredProjectName": "Project_Liquid-FuelRockets",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -274,15 +295,17 @@
    "friendlyName": "Meteor Liquid Rocket x6",
    "thrusters": 6,
    "driveClassification": "Chemical",
+   "requiredProjectName": "Project_Liquid-FuelRockets",
    "thrust_N": 92886000,
    "EV_kps": 2.98,
    "specificPower_kgMW": 0,
    "efficiency": 1,
+   "thrustRating_GW": "138.400",
+   "req power": "0.000",
    "flatMass_tons": 102,
    "requiredPowerPlant": "Any_General",
    "thrustCap": 1,
    "cooling": "Open",
-   "requiredProjectName": "Project_Liquid-FuelRockets",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -299,15 +322,17 @@
    "thrusters": 1,
    "notes": "Proton RD-253 x12",
    "driveClassification": "Chemical",
+   "requiredProjectName": "Project_Liquid-FuelRockets",
    "thrust_N": 20376000,
    "EV_kps": 3.1,
    "specificPower_kgMW": 0,
    "efficiency": 1,
+   "thrustRating_GW": "31.583",
+   "req power": "0.000",
    "flatMass_tons": 13,
    "requiredPowerPlant": "Any_General",
    "thrustCap": 1,
    "cooling": "Open",
-   "requiredProjectName": "Project_Liquid-FuelRockets",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -322,15 +347,17 @@
    "friendlyName": "Neutron Liquid Rocket x2",
    "thrusters": 2,
    "driveClassification": "Chemical",
+   "requiredProjectName": "Project_Liquid-FuelRockets",
    "thrust_N": 40752000,
    "EV_kps": 3.1,
    "specificPower_kgMW": 0,
    "efficiency": 1,
+   "thrustRating_GW": "63.166",
+   "req power": "0.000",
    "flatMass_tons": 26,
    "requiredPowerPlant": "Any_General",
    "thrustCap": 1,
    "cooling": "Open",
-   "requiredProjectName": "Project_Liquid-FuelRockets",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -345,15 +372,17 @@
    "friendlyName": "Neutron Liquid Rocket x3",
    "thrusters": 3,
    "driveClassification": "Chemical",
+   "requiredProjectName": "Project_Liquid-FuelRockets",
    "thrust_N": 61128000,
    "EV_kps": 3.1,
    "specificPower_kgMW": 0,
    "efficiency": 1,
+   "thrustRating_GW": "94.748",
+   "req power": "0.000",
    "flatMass_tons": 39,
    "requiredPowerPlant": "Any_General",
    "thrustCap": 1,
    "cooling": "Open",
-   "requiredProjectName": "Project_Liquid-FuelRockets",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -368,15 +397,17 @@
    "friendlyName": "Neutron Liquid Rocket x4",
    "thrusters": 4,
    "driveClassification": "Chemical",
+   "requiredProjectName": "Project_Liquid-FuelRockets",
    "thrust_N": 81504000,
    "EV_kps": 3.1,
    "specificPower_kgMW": 0,
    "efficiency": 1,
+   "thrustRating_GW": "126.331",
+   "req power": "0.000",
    "flatMass_tons": 52,
    "requiredPowerPlant": "Any_General",
    "thrustCap": 1,
    "cooling": "Open",
-   "requiredProjectName": "Project_Liquid-FuelRockets",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -391,15 +422,17 @@
    "friendlyName": "Neutron Liquid Rocket x5",
    "thrusters": 5,
    "driveClassification": "Chemical",
+   "requiredProjectName": "Project_Liquid-FuelRockets",
    "thrust_N": 101880000,
    "EV_kps": 3.1,
    "specificPower_kgMW": 0,
    "efficiency": 1,
+   "thrustRating_GW": "157.914",
+   "req power": "0.000",
    "flatMass_tons": 65,
    "requiredPowerPlant": "Any_General",
    "thrustCap": 1,
    "cooling": "Open",
-   "requiredProjectName": "Project_Liquid-FuelRockets",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -414,15 +447,17 @@
    "friendlyName": "Neutron Liquid Rocket x6",
    "thrusters": 6,
    "driveClassification": "Chemical",
+   "requiredProjectName": "Project_Liquid-FuelRockets",
    "thrust_N": 122256000,
    "EV_kps": 3.1,
    "specificPower_kgMW": 0,
    "efficiency": 1,
+   "thrustRating_GW": "189.497",
+   "req power": "0.000",
    "flatMass_tons": 78,
    "requiredPowerPlant": "Any_General",
    "thrustCap": 1,
    "cooling": "Open",
-   "requiredProjectName": "Project_Liquid-FuelRockets",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -438,15 +473,17 @@
    "thrusters": 1,
    "notes": "Shuttle RS-25 x4",
    "driveClassification": "Chemical",
+   "requiredProjectName": "Project_CryogenicLiquid-FuelRockets",
    "thrust_N": 9279600,
    "EV_kps": 4.44,
    "specificPower_kgMW": 0,
    "efficiency": 1,
+   "thrustRating_GW": "20.601",
+   "req power": "0.000",
    "flatMass_tons": 14,
    "requiredPowerPlant": "Any_General",
    "thrustCap": 1,
    "cooling": "Open",
-   "requiredProjectName": "Project_CryogenicLiquid-FuelRockets",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -461,15 +498,17 @@
    "friendlyName": "Venture Liquid Rocket x2",
    "thrusters": 2,
    "driveClassification": "Chemical",
+   "requiredProjectName": "Project_CryogenicLiquid-FuelRockets",
    "thrust_N": 18559200,
    "EV_kps": 4.44,
    "specificPower_kgMW": 0,
    "efficiency": 1,
+   "thrustRating_GW": "41.201",
+   "req power": "0.000",
    "flatMass_tons": 28,
    "requiredPowerPlant": "Any_General",
    "thrustCap": 1,
    "cooling": "Open",
-   "requiredProjectName": "Project_CryogenicLiquid-FuelRockets",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -484,15 +523,17 @@
    "friendlyName": "Venture Liquid Rocket x3",
    "thrusters": 3,
    "driveClassification": "Chemical",
+   "requiredProjectName": "Project_CryogenicLiquid-FuelRockets",
    "thrust_N": 27838800,
    "EV_kps": 4.44,
    "specificPower_kgMW": 0,
    "efficiency": 1,
+   "thrustRating_GW": "61.802",
+   "req power": "0.000",
    "flatMass_tons": 42,
    "requiredPowerPlant": "Any_General",
    "thrustCap": 1,
    "cooling": "Open",
-   "requiredProjectName": "Project_CryogenicLiquid-FuelRockets",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -507,15 +548,17 @@
    "friendlyName": "Venture Liquid Rocket x4",
    "thrusters": 4,
    "driveClassification": "Chemical",
+   "requiredProjectName": "Project_CryogenicLiquid-FuelRockets",
    "thrust_N": 37118400,
    "EV_kps": 4.44,
    "specificPower_kgMW": 0,
    "efficiency": 1,
+   "thrustRating_GW": "82.403",
+   "req power": "0.000",
    "flatMass_tons": 56,
    "requiredPowerPlant": "Any_General",
    "thrustCap": 1,
    "cooling": "Open",
-   "requiredProjectName": "Project_CryogenicLiquid-FuelRockets",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -530,15 +573,17 @@
    "friendlyName": "Venture Liquid Rocket x5",
    "thrusters": 5,
    "driveClassification": "Chemical",
+   "requiredProjectName": "Project_CryogenicLiquid-FuelRockets",
    "thrust_N": 46398000,
    "EV_kps": 4.44,
    "specificPower_kgMW": 0,
    "efficiency": 1,
+   "thrustRating_GW": "103.004",
+   "req power": "0.000",
    "flatMass_tons": 70,
    "requiredPowerPlant": "Any_General",
    "thrustCap": 1,
    "cooling": "Open",
-   "requiredProjectName": "Project_CryogenicLiquid-FuelRockets",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -553,15 +598,17 @@
    "friendlyName": "Venture Liquid Rocket x6",
    "thrusters": 6,
    "driveClassification": "Chemical",
+   "requiredProjectName": "Project_CryogenicLiquid-FuelRockets",
    "thrust_N": 55677600,
    "EV_kps": 4.44,
    "specificPower_kgMW": 0,
    "efficiency": 1,
+   "thrustRating_GW": "123.604",
+   "req power": "0.000",
    "flatMass_tons": 84,
    "requiredPowerPlant": "Any_General",
    "thrustCap": 1,
    "cooling": "Open",
-   "requiredProjectName": "Project_CryogenicLiquid-FuelRockets",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -577,15 +624,17 @@
    "thrusters": 1,
    "notes": "Raptor Vacuum x9",
    "driveClassification": "Chemical",
+   "requiredProjectName": "Project_SuperheavyRockets",
    "thrust_N": 20160000,
    "EV_kps": 3.73,
    "specificPower_kgMW": 0,
    "efficiency": 1,
+   "thrustRating_GW": "37.598",
+   "req power": "0.000",
    "flatMass_tons": 14,
    "requiredPowerPlant": "Any_General",
    "thrustCap": 1,
    "cooling": "Open",
-   "requiredProjectName": "Project_SuperheavyRockets",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -601,15 +650,17 @@
    "friendlyName": "Diana Superheavy Rocket x2",
    "thrusters": 2,
    "driveClassification": "Chemical",
+   "requiredProjectName": "Project_SuperheavyRockets",
    "thrust_N": 40320000,
    "EV_kps": 3.73,
    "specificPower_kgMW": 0,
    "efficiency": 1,
+   "thrustRating_GW": "75.197",
+   "req power": "0.000",
    "flatMass_tons": 28,
    "requiredPowerPlant": "Any_General",
    "thrustCap": 1,
    "cooling": "Open",
-   "requiredProjectName": "Project_SuperheavyRockets",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -625,15 +676,17 @@
    "friendlyName": "Diana Superheavy Rocket x3",
    "thrusters": 3,
    "driveClassification": "Chemical",
+   "requiredProjectName": "Project_SuperheavyRockets",
    "thrust_N": 60480000,
    "EV_kps": 3.73,
    "specificPower_kgMW": 0,
    "efficiency": 1,
+   "thrustRating_GW": "112.795",
+   "req power": "0.000",
    "flatMass_tons": 42,
    "requiredPowerPlant": "Any_General",
    "thrustCap": 1,
    "cooling": "Open",
-   "requiredProjectName": "Project_SuperheavyRockets",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -649,15 +702,17 @@
    "friendlyName": "Diana Superheavy Rocket x4",
    "thrusters": 4,
    "driveClassification": "Chemical",
+   "requiredProjectName": "Project_SuperheavyRockets",
    "thrust_N": 80640000,
    "EV_kps": 3.73,
    "specificPower_kgMW": 0,
    "efficiency": 1,
+   "thrustRating_GW": "150.394",
+   "req power": "0.000",
    "flatMass_tons": 56,
    "requiredPowerPlant": "Any_General",
    "thrustCap": 1,
    "cooling": "Open",
-   "requiredProjectName": "Project_SuperheavyRockets",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -673,15 +728,17 @@
    "friendlyName": "Diana Superheavy Rocket x5",
    "thrusters": 5,
    "driveClassification": "Chemical",
+   "requiredProjectName": "Project_SuperheavyRockets",
    "thrust_N": 100800000,
    "EV_kps": 3.73,
    "specificPower_kgMW": 0,
    "efficiency": 1,
+   "thrustRating_GW": "187.992",
+   "req power": "0.000",
    "flatMass_tons": 70,
    "requiredPowerPlant": "Any_General",
    "thrustCap": 1,
    "cooling": "Open",
-   "requiredProjectName": "Project_SuperheavyRockets",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -697,15 +754,17 @@
    "friendlyName": "Diana Superheavy Rocket x6",
    "thrusters": 6,
    "driveClassification": "Chemical",
+   "requiredProjectName": "Project_SuperheavyRockets",
    "thrust_N": 120960000,
    "EV_kps": 3.73,
    "specificPower_kgMW": 0,
    "efficiency": 1,
+   "thrustRating_GW": "225.590",
+   "req power": "0.000",
    "flatMass_tons": 84,
    "requiredPowerPlant": "Any_General",
    "thrustCap": 1,
    "cooling": "Open",
-   "requiredProjectName": "Project_SuperheavyRockets",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -722,15 +781,17 @@
    "thrusters": 1,
    "notes": "Monoatomic Hydrogen",
    "driveClassification": "Chemical",
+   "requiredProjectName": "Project_ImprovedInterplanetaryRockets",
    "thrust_N": 7850000,
    "EV_kps": 5.6,
    "specificPower_kgMW": 0,
    "efficiency": 1,
+   "thrustRating_GW": "21.980",
+   "req power": "0.000",
    "flatMass_tons": 15,
    "requiredPowerPlant": "Any_General",
    "thrustCap": 1,
    "cooling": "Open",
-   "requiredProjectName": "Project_ImprovedInterplanetaryRockets",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -745,15 +806,17 @@
    "friendlyName": "Nova Liquid Rocket x2",
    "thrusters": 2,
    "driveClassification": "Chemical",
+   "requiredProjectName": "Project_ImprovedInterplanetaryRockets",
    "thrust_N": 15700000,
    "EV_kps": 5.6,
    "specificPower_kgMW": 0,
    "efficiency": 1,
+   "thrustRating_GW": "43.960",
+   "req power": "0.000",
    "flatMass_tons": 30,
    "requiredPowerPlant": "Any_General",
    "thrustCap": 1,
    "cooling": "Open",
-   "requiredProjectName": "Project_ImprovedInterplanetaryRockets",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -768,15 +831,17 @@
    "friendlyName": "Nova Liquid Rocket x3",
    "thrusters": 3,
    "driveClassification": "Chemical",
+   "requiredProjectName": "Project_ImprovedInterplanetaryRockets",
    "thrust_N": 23550000,
    "EV_kps": 5.6,
    "specificPower_kgMW": 0,
    "efficiency": 1,
+   "thrustRating_GW": "65.940",
+   "req power": "0.000",
    "flatMass_tons": 45,
    "requiredPowerPlant": "Any_General",
    "thrustCap": 1,
    "cooling": "Open",
-   "requiredProjectName": "Project_ImprovedInterplanetaryRockets",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -791,15 +856,17 @@
    "friendlyName": "Nova Liquid Rocket x4",
    "thrusters": 4,
    "driveClassification": "Chemical",
+   "requiredProjectName": "Project_ImprovedInterplanetaryRockets",
    "thrust_N": 31400000,
    "EV_kps": 5.6,
    "specificPower_kgMW": 0,
    "efficiency": 1,
+   "thrustRating_GW": "87.920",
+   "req power": "0.000",
    "flatMass_tons": 60,
    "requiredPowerPlant": "Any_General",
    "thrustCap": 1,
    "cooling": "Open",
-   "requiredProjectName": "Project_ImprovedInterplanetaryRockets",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -814,15 +881,17 @@
    "friendlyName": "Nova Liquid Rocket x5",
    "thrusters": 5,
    "driveClassification": "Chemical",
+   "requiredProjectName": "Project_ImprovedInterplanetaryRockets",
    "thrust_N": 39250000,
    "EV_kps": 5.6,
    "specificPower_kgMW": 0,
    "efficiency": 1,
+   "thrustRating_GW": "109.900",
+   "req power": "0.000",
    "flatMass_tons": 75,
    "requiredPowerPlant": "Any_General",
    "thrustCap": 1,
    "cooling": "Open",
-   "requiredProjectName": "Project_ImprovedInterplanetaryRockets",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -837,15 +906,17 @@
    "friendlyName": "Nova Liquid Rocket x6",
    "thrusters": 6,
    "driveClassification": "Chemical",
+   "requiredProjectName": "Project_ImprovedInterplanetaryRockets",
    "thrust_N": 47100000,
    "EV_kps": 5.6,
    "specificPower_kgMW": 0,
    "efficiency": 1,
+   "thrustRating_GW": "131.880",
+   "req power": "0.000",
    "flatMass_tons": 90,
    "requiredPowerPlant": "Any_General",
    "thrustCap": 1,
    "cooling": "Open",
-   "requiredProjectName": "Project_ImprovedInterplanetaryRockets",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -861,15 +932,17 @@
    "thrusters": 1,
    "notes": "Metastable Helium",
    "driveClassification": "Chemical",
+   "requiredProjectName": "Project_AdvancedInterplanetaryRockets",
    "thrust_N": 2500000,
    "EV_kps": 21.6,
    "specificPower_kgMW": 0,
    "efficiency": 1,
+   "thrustRating_GW": "27.000",
+   "req power": "0.000",
    "flatMass_tons": 10,
    "requiredPowerPlant": "Any_General",
    "thrustCap": 1,
    "cooling": "Open",
-   "requiredProjectName": "Project_AdvancedInterplanetaryRockets",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -885,15 +958,17 @@
    "friendlyName": "Super Kronos Liquid Rocket x2",
    "thrusters": 2,
    "driveClassification": "Chemical",
+   "requiredProjectName": "Project_AdvancedInterplanetaryRockets",
    "thrust_N": 5000000,
    "EV_kps": 21.6,
    "specificPower_kgMW": 0,
    "efficiency": 1,
+   "thrustRating_GW": "54.000",
+   "req power": "0.000",
    "flatMass_tons": 20,
    "requiredPowerPlant": "Any_General",
    "thrustCap": 1,
    "cooling": "Open",
-   "requiredProjectName": "Project_AdvancedInterplanetaryRockets",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -909,15 +984,17 @@
    "friendlyName": "Super Kronos Liquid Rocket x3",
    "thrusters": 3,
    "driveClassification": "Chemical",
+   "requiredProjectName": "Project_AdvancedInterplanetaryRockets",
    "thrust_N": 7500000,
    "EV_kps": 21.6,
    "specificPower_kgMW": 0,
    "efficiency": 1,
+   "thrustRating_GW": "81.000",
+   "req power": "0.000",
    "flatMass_tons": 30,
    "requiredPowerPlant": "Any_General",
    "thrustCap": 1,
    "cooling": "Open",
-   "requiredProjectName": "Project_AdvancedInterplanetaryRockets",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -933,15 +1010,17 @@
    "friendlyName": "Super Kronos Liquid Rocket x4",
    "thrusters": 4,
    "driveClassification": "Chemical",
+   "requiredProjectName": "Project_AdvancedInterplanetaryRockets",
    "thrust_N": 10000000,
    "EV_kps": 21.6,
    "specificPower_kgMW": 0,
    "efficiency": 1,
+   "thrustRating_GW": "108.000",
+   "req power": "0.000",
    "flatMass_tons": 40,
    "requiredPowerPlant": "Any_General",
    "thrustCap": 1,
    "cooling": "Open",
-   "requiredProjectName": "Project_AdvancedInterplanetaryRockets",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -957,15 +1036,17 @@
    "friendlyName": "Super Kronos Liquid Rocket x5",
    "thrusters": 5,
    "driveClassification": "Chemical",
+   "requiredProjectName": "Project_AdvancedInterplanetaryRockets",
    "thrust_N": 12500000,
    "EV_kps": 21.6,
    "specificPower_kgMW": 0,
    "efficiency": 1,
+   "thrustRating_GW": "135.000",
+   "req power": "0.000",
    "flatMass_tons": 50,
    "requiredPowerPlant": "Any_General",
    "thrustCap": 1,
    "cooling": "Open",
-   "requiredProjectName": "Project_AdvancedInterplanetaryRockets",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -981,15 +1062,17 @@
    "friendlyName": "Super Kronos Liquid Rocket x6",
    "thrusters": 6,
    "driveClassification": "Chemical",
+   "requiredProjectName": "Project_AdvancedInterplanetaryRockets",
    "thrust_N": 15000000,
    "EV_kps": 21.6,
    "specificPower_kgMW": 0,
    "efficiency": 1,
+   "thrustRating_GW": "162.000",
+   "req power": "0.000",
    "flatMass_tons": 60,
    "requiredPowerPlant": "Any_General",
    "thrustCap": 1,
    "cooling": "Open",
-   "requiredProjectName": "Project_AdvancedInterplanetaryRockets",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -1001,19 +1084,21 @@
    "iconResource": "shipbuildericons/ICO_SuperKronosLiquidRocket"
 },
  {
-   "dataName": "Resistojetx1",
-   "friendlyName": "Resistojet x1",
+   "dataName": "TungstenResistojetx1",
+   "friendlyName": "Tungsten Resistojet x1",
    "thrusters": 1,
    "driveClassification": "Electrothermal",
-   "thrust_N": 1000,
-   "EV_kps": 2.9,
+   "requiredProjectName": "Project_TungstenResistojet",
+   "thrust_N": 9900,
+   "EV_kps": 9.8,
    "specificPower_kgMW": 0,
-   "efficiency": 0.8,
+   "efficiency": 0.81,
+   "thrustRating_GW": "0.049",
+   "req power": "0.060",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Any_General",
-   "thrustCap": 20,
+   "thrustCap": 10,
    "cooling": "Calc",
-   "requiredProjectName": "Project_Resistojet",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -1021,22 +1106,24 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_Resistojet"
+   "iconResource": "shipbuildericons/ICO_TungstenResistojet"
 },
  {
-   "dataName": "Resistojetx2",
-   "friendlyName": "Resistojet x2",
+   "dataName": "TungstenResistojetx2",
+   "friendlyName": "Tungsten Resistojet x2",
    "thrusters": 2,
    "driveClassification": "Electrothermal",
-   "thrust_N": 2000,
-   "EV_kps": 2.9,
+   "requiredProjectName": "Project_TungstenResistojet",
+   "thrust_N": 19800,
+   "EV_kps": 9.8,
    "specificPower_kgMW": 0,
-   "efficiency": 0.8,
+   "efficiency": 0.81,
+   "thrustRating_GW": "0.097",
+   "req power": "0.120",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Any_General",
-   "thrustCap": 20,
+   "thrustCap": 10,
    "cooling": "Calc",
-   "requiredProjectName": "Project_Resistojet",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -1044,22 +1131,24 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_Resistojet"
+   "iconResource": "shipbuildericons/ICO_TungstenResistojet"
 },
  {
-   "dataName": "Resistojetx3",
-   "friendlyName": "Resistojet x3",
+   "dataName": "TungstenResistojetx3",
+   "friendlyName": "Tungsten Resistojet x3",
    "thrusters": 3,
    "driveClassification": "Electrothermal",
-   "thrust_N": 3000,
-   "EV_kps": 2.9,
+   "requiredProjectName": "Project_TungstenResistojet",
+   "thrust_N": 29700,
+   "EV_kps": 9.8,
    "specificPower_kgMW": 0,
-   "efficiency": 0.8,
+   "efficiency": 0.81,
+   "thrustRating_GW": "0.146",
+   "req power": "0.180",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Any_General",
-   "thrustCap": 20,
+   "thrustCap": 10,
    "cooling": "Calc",
-   "requiredProjectName": "Project_Resistojet",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -1067,22 +1156,24 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_Resistojet"
+   "iconResource": "shipbuildericons/ICO_TungstenResistojet"
 },
  {
-   "dataName": "Resistojetx4",
-   "friendlyName": "Resistojet x4",
+   "dataName": "TungstenResistojetx4",
+   "friendlyName": "Tungsten Resistojet x4",
    "thrusters": 4,
    "driveClassification": "Electrothermal",
-   "thrust_N": 4000,
-   "EV_kps": 2.9,
+   "requiredProjectName": "Project_TungstenResistojet",
+   "thrust_N": 39600,
+   "EV_kps": 9.8,
    "specificPower_kgMW": 0,
-   "efficiency": 0.8,
+   "efficiency": 0.81,
+   "thrustRating_GW": "0.194",
+   "req power": "0.240",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Any_General",
-   "thrustCap": 20,
+   "thrustCap": 10,
    "cooling": "Calc",
-   "requiredProjectName": "Project_Resistojet",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -1090,22 +1181,24 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_Resistojet"
+   "iconResource": "shipbuildericons/ICO_TungstenResistojet"
 },
  {
-   "dataName": "Resistojetx5",
-   "friendlyName": "Resistojet x5",
+   "dataName": "TungstenResistojetx5",
+   "friendlyName": "Tungsten Resistojet x5",
    "thrusters": 5,
    "driveClassification": "Electrothermal",
-   "thrust_N": 5000,
-   "EV_kps": 2.9,
+   "requiredProjectName": "Project_TungstenResistojet",
+   "thrust_N": 49500,
+   "EV_kps": 9.8,
    "specificPower_kgMW": 0,
-   "efficiency": 0.8,
+   "efficiency": 0.81,
+   "thrustRating_GW": "0.243",
+   "req power": "0.299",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Any_General",
-   "thrustCap": 20,
+   "thrustCap": 10,
    "cooling": "Calc",
-   "requiredProjectName": "Project_Resistojet",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -1113,22 +1206,24 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_Resistojet"
+   "iconResource": "shipbuildericons/ICO_TungstenResistojet"
 },
  {
-   "dataName": "Resistojetx6",
-   "friendlyName": "Resistojet x6",
+   "dataName": "TungstenResistojetx6",
+   "friendlyName": "Tungsten Resistojet x6",
    "thrusters": 6,
    "driveClassification": "Electrothermal",
-   "thrust_N": 6000,
-   "EV_kps": 2.9,
+   "requiredProjectName": "Project_TungstenResistojet",
+   "thrust_N": 59400,
+   "EV_kps": 9.8,
    "specificPower_kgMW": 0,
-   "efficiency": 0.8,
+   "efficiency": 0.81,
+   "thrustRating_GW": "0.291",
+   "req power": "0.359",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Any_General",
-   "thrustCap": 20,
+   "thrustCap": 10,
    "cooling": "Calc",
-   "requiredProjectName": "Project_Resistojet",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -1136,593 +1231,649 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_Resistojet"
+   "iconResource": "shipbuildericons/ICO_TungstenResistojet"
 },
  {
-   "dataName": "TungstenResistojetx1",
-   "friendlyName": "Tungsten Resistojet x1",
+   "dataName": "E-BeamDrivex1",
+   "friendlyName": "E-Beam Drive x1",
    "thrusters": 1,
+   "notes": "Wakefield E-Beamer",
    "driveClassification": "Electrothermal",
-   "thrust_N": 9900,
-   "EV_kps": 9.8,
+   "requiredProjectName": "Project_E-BeamDrive",
+   "thrust_N": 4600,
+   "EV_kps": 19.62,
    "specificPower_kgMW": 0,
-   "efficiency": 0.8,
+   "efficiency": 0.76,
+   "thrustRating_GW": "0.045",
+   "req power": "0.059",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Any_General",
-   "thrustCap": 20,
+   "thrustCap": 16,
    "cooling": "Calc",
-   "requiredProjectName": "Project_TungstenResistojet",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Hydrogen",
+   "propellant": "Anything",
    "perTankPropellantMaterials": {
-      "water": 1
+      "metals": 1
    },
-   "iconResource": "shipbuildericons/ICO_TungstenResistojet"
+   "freeISRU": true,
+   "iconResource": "shipbuildericons/ICO_E-BeamDrive"
 },
  {
-   "dataName": "TungstenResistojetx2",
-   "friendlyName": "Tungsten Resistojet x2",
+   "dataName": "E-BeamDrivex2",
+   "friendlyName": "E-Beam Drive x2",
    "thrusters": 2,
+   "notes": "Wakefield E-Beamer",
    "driveClassification": "Electrothermal",
-   "thrust_N": 19800,
-   "EV_kps": 9.8,
+   "requiredProjectName": "Project_E-BeamDrive",
+   "thrust_N": 9200,
+   "EV_kps": 19.62,
    "specificPower_kgMW": 0,
-   "efficiency": 0.8,
+   "efficiency": 0.76,
+   "thrustRating_GW": "0.090",
+   "req power": "0.119",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Any_General",
-   "thrustCap": 20,
+   "thrustCap": 16,
    "cooling": "Calc",
-   "requiredProjectName": "Project_TungstenResistojet",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Hydrogen",
+   "propellant": "Anything",
    "perTankPropellantMaterials": {
-      "water": 1
+      "metals": 1
    },
-   "iconResource": "shipbuildericons/ICO_TungstenResistojet"
+   "freeISRU": true,
+   "iconResource": "shipbuildericons/ICO_E-BeamDrive"
 },
  {
-   "dataName": "TungstenResistojetx3",
-   "friendlyName": "Tungsten Resistojet x3",
+   "dataName": "E-BeamDrivex3",
+   "friendlyName": "E-Beam Drive x3",
    "thrusters": 3,
+   "notes": "Wakefield E-Beamer",
    "driveClassification": "Electrothermal",
-   "thrust_N": 29700,
-   "EV_kps": 9.8,
+   "requiredProjectName": "Project_E-BeamDrive",
+   "thrust_N": 13800,
+   "EV_kps": 19.62,
    "specificPower_kgMW": 0,
-   "efficiency": 0.8,
+   "efficiency": 0.76,
+   "thrustRating_GW": "0.135",
+   "req power": "0.178",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Any_General",
-   "thrustCap": 20,
+   "thrustCap": 16,
    "cooling": "Calc",
-   "requiredProjectName": "Project_TungstenResistojet",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Hydrogen",
+   "propellant": "Anything",
    "perTankPropellantMaterials": {
-      "water": 1
+      "metals": 1
    },
-   "iconResource": "shipbuildericons/ICO_TungstenResistojet"
+   "freeISRU": true,
+   "iconResource": "shipbuildericons/ICO_E-BeamDrive"
 },
  {
-   "dataName": "TungstenResistojetx4",
-   "friendlyName": "Tungsten Resistojet x4",
+   "dataName": "E-BeamDrivex4",
+   "friendlyName": "E-Beam Drive x4",
    "thrusters": 4,
+   "notes": "Wakefield E-Beamer",
    "driveClassification": "Electrothermal",
-   "thrust_N": 39600,
-   "EV_kps": 9.8,
+   "requiredProjectName": "Project_E-BeamDrive",
+   "thrust_N": 18400,
+   "EV_kps": 19.62,
    "specificPower_kgMW": 0,
-   "efficiency": 0.8,
+   "efficiency": 0.76,
+   "thrustRating_GW": "0.181",
+   "req power": "0.238",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Any_General",
-   "thrustCap": 20,
+   "thrustCap": 16,
    "cooling": "Calc",
-   "requiredProjectName": "Project_TungstenResistojet",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Hydrogen",
+   "propellant": "Anything",
    "perTankPropellantMaterials": {
-      "water": 1
+      "metals": 1
    },
-   "iconResource": "shipbuildericons/ICO_TungstenResistojet"
+   "freeISRU": true,
+   "iconResource": "shipbuildericons/ICO_E-BeamDrive"
 },
  {
-   "dataName": "TungstenResistojetx5",
-   "friendlyName": "Tungsten Resistojet x5",
+   "dataName": "E-BeamDrivex5",
+   "friendlyName": "E-Beam Drive x5",
    "thrusters": 5,
+   "notes": "Wakefield E-Beamer",
    "driveClassification": "Electrothermal",
-   "thrust_N": 49500,
-   "EV_kps": 9.8,
+   "requiredProjectName": "Project_E-BeamDrive",
+   "thrust_N": 23000,
+   "EV_kps": 19.62,
    "specificPower_kgMW": 0,
-   "efficiency": 0.8,
+   "efficiency": 0.76,
+   "thrustRating_GW": "0.226",
+   "req power": "0.297",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Any_General",
-   "thrustCap": 20,
+   "thrustCap": 16,
    "cooling": "Calc",
-   "requiredProjectName": "Project_TungstenResistojet",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Hydrogen",
+   "propellant": "Anything",
    "perTankPropellantMaterials": {
-      "water": 1
+      "metals": 1
    },
-   "iconResource": "shipbuildericons/ICO_TungstenResistojet"
+   "freeISRU": true,
+   "iconResource": "shipbuildericons/ICO_E-BeamDrive"
 },
  {
-   "dataName": "TungstenResistojetx6",
-   "friendlyName": "Tungsten Resistojet x6",
+   "dataName": "E-BeamDrivex6",
+   "friendlyName": "E-Beam Drive x6",
    "thrusters": 6,
+   "notes": "Wakefield E-Beamer",
    "driveClassification": "Electrothermal",
-   "thrust_N": 59400,
-   "EV_kps": 9.8,
+   "requiredProjectName": "Project_E-BeamDrive",
+   "thrust_N": 27600,
+   "EV_kps": 19.62,
    "specificPower_kgMW": 0,
-   "efficiency": 0.8,
+   "efficiency": 0.76,
+   "thrustRating_GW": "0.271",
+   "req power": "0.356",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Any_General",
-   "thrustCap": 20,
+   "thrustCap": 16,
    "cooling": "Calc",
-   "requiredProjectName": "Project_TungstenResistojet",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Hydrogen",
+   "propellant": "Anything",
    "perTankPropellantMaterials": {
-      "water": 1
+      "metals": 1
    },
-   "iconResource": "shipbuildericons/ICO_TungstenResistojet"
+   "freeISRU": true,
+   "iconResource": "shipbuildericons/ICO_E-BeamDrive"
 },
  {
-   "dataName": "ArcjetDrivex1",
-   "friendlyName": "Arcjet Drive x1",
+   "dataName": "AmplitronDrivex1",
+   "friendlyName": "Amplitron Drive x1",
    "thrusters": 1,
+   "notes": "Microwave Steamer Amplitrons",
    "driveClassification": "Electrothermal",
-   "thrust_N": 1000,
-   "EV_kps": 19.6,
+   "requiredProjectName": "Project_AmplitronDrive",
+   "thrust_N": 12000,
+   "EV_kps": 9.81,
    "specificPower_kgMW": 0,
-   "efficiency": 0.52,
+   "efficiency": 0.81,
+   "thrustRating_GW": "0.059",
+   "req power": "0.073",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Any_General",
-   "thrustCap": 40,
+   "thrustCap": 20,
    "cooling": "Calc",
-   "requiredProjectName": "Project_ArcjetDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Hydrogen",
+   "propellant": "Water",
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_ArcjetDrive"
+   "iconResource": "shipbuildericons/ICO_AmplitronDrive"
 },
  {
-   "dataName": "ArcjetDrivex2",
-   "friendlyName": "Arcjet Drive x2",
+   "dataName": "AmplitronDrivex2",
+   "friendlyName": "Amplitron Drive x2",
    "thrusters": 2,
+   "notes": "Microwave Steamer Amplitrons",
    "driveClassification": "Electrothermal",
-   "thrust_N": 2000,
-   "EV_kps": 19.6,
+   "requiredProjectName": "Project_AmplitronDrive",
+   "thrust_N": 24000,
+   "EV_kps": 9.81,
    "specificPower_kgMW": 0,
-   "efficiency": 0.52,
+   "efficiency": 0.81,
+   "thrustRating_GW": "0.118",
+   "req power": "0.145",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Any_General",
-   "thrustCap": 40,
+   "thrustCap": 20,
    "cooling": "Calc",
-   "requiredProjectName": "Project_ArcjetDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Hydrogen",
+   "propellant": "Water",
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_ArcjetDrive"
+   "iconResource": "shipbuildericons/ICO_AmplitronDrive"
 },
  {
-   "dataName": "ArcjetDrivex3",
-   "friendlyName": "Arcjet Drive x3",
+   "dataName": "AmplitronDrivex3",
+   "friendlyName": "Amplitron Drive x3",
    "thrusters": 3,
+   "notes": "Microwave Steamer Amplitrons",
    "driveClassification": "Electrothermal",
-   "thrust_N": 3000,
-   "EV_kps": 19.6,
+   "requiredProjectName": "Project_AmplitronDrive",
+   "thrust_N": 36000,
+   "EV_kps": 9.81,
    "specificPower_kgMW": 0,
-   "efficiency": 0.52,
+   "efficiency": 0.81,
+   "thrustRating_GW": "0.177",
+   "req power": "0.218",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Any_General",
-   "thrustCap": 40,
+   "thrustCap": 20,
    "cooling": "Calc",
-   "requiredProjectName": "Project_ArcjetDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Hydrogen",
+   "propellant": "Water",
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_ArcjetDrive"
+   "iconResource": "shipbuildericons/ICO_AmplitronDrive"
 },
  {
-   "dataName": "ArcjetDrivex4",
-   "friendlyName": "Arcjet Drive x4",
+   "dataName": "AmplitronDrivex4",
+   "friendlyName": "Amplitron Drive x4",
    "thrusters": 4,
+   "notes": "Microwave Steamer Amplitrons",
    "driveClassification": "Electrothermal",
-   "thrust_N": 4000,
-   "EV_kps": 19.6,
+   "requiredProjectName": "Project_AmplitronDrive",
+   "thrust_N": 48000,
+   "EV_kps": 9.81,
    "specificPower_kgMW": 0,
-   "efficiency": 0.52,
+   "efficiency": 0.81,
+   "thrustRating_GW": "0.235",
+   "req power": "0.291",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Any_General",
-   "thrustCap": 40,
+   "thrustCap": 20,
    "cooling": "Calc",
-   "requiredProjectName": "Project_ArcjetDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Hydrogen",
+   "propellant": "Water",
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_ArcjetDrive"
+   "iconResource": "shipbuildericons/ICO_AmplitronDrive"
 },
  {
-   "dataName": "ArcjetDrivex5",
-   "friendlyName": "Arcjet Drive x5",
+   "dataName": "AmplitronDrivex5",
+   "friendlyName": "Amplitron Drive x5",
    "thrusters": 5,
+   "notes": "Microwave Steamer Amplitrons",
    "driveClassification": "Electrothermal",
-   "thrust_N": 5000,
-   "EV_kps": 19.6,
+   "requiredProjectName": "Project_AmplitronDrive",
+   "thrust_N": 60000,
+   "EV_kps": 9.81,
    "specificPower_kgMW": 0,
-   "efficiency": 0.52,
+   "efficiency": 0.81,
+   "thrustRating_GW": "0.294",
+   "req power": "0.363",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Any_General",
-   "thrustCap": 40,
+   "thrustCap": 20,
    "cooling": "Calc",
-   "requiredProjectName": "Project_ArcjetDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Hydrogen",
+   "propellant": "Water",
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_ArcjetDrive"
+   "iconResource": "shipbuildericons/ICO_AmplitronDrive"
 },
  {
-   "dataName": "ArcjetDrivex6",
-   "friendlyName": "Arcjet Drive x6",
+   "dataName": "AmplitronDrivex6",
+   "friendlyName": "Amplitron Drive x6",
    "thrusters": 6,
+   "notes": "Microwave Steamer Amplitrons",
    "driveClassification": "Electrothermal",
-   "thrust_N": 6000,
-   "EV_kps": 19.6,
+   "requiredProjectName": "Project_AmplitronDrive",
+   "thrust_N": 72000,
+   "EV_kps": 9.81,
    "specificPower_kgMW": 0,
-   "efficiency": 0.52,
+   "efficiency": 0.81,
+   "thrustRating_GW": "0.353",
+   "req power": "0.436",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Any_General",
-   "thrustCap": 40,
+   "thrustCap": 20,
    "cooling": "Calc",
-   "requiredProjectName": "Project_ArcjetDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Hydrogen",
+   "propellant": "Water",
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_ArcjetDrive"
+   "iconResource": "shipbuildericons/ICO_AmplitronDrive"
 },
  {
-   "dataName": "PlasmaWaveDrivex1",
-   "friendlyName": "Plasma Wave Drive x1",
+   "dataName": "IonDrivex1",
+   "friendlyName": "Ion Drive x1",
    "thrusters": 1,
-   "notes": "MPD T-Wave 1",
-   "driveClassification": "Electromagnetic",
-   "thrust_N": 1200,
+   "driveClassification": "Electrostatic",
+   "requiredProjectName": "Project_IonDrive",
+   "thrust_N": 3300,
    "EV_kps": 78.4,
    "specificPower_kgMW": 0,
-   "efficiency": 0.81,
+   "efficiency": 0.95,
+   "thrustRating_GW": "0.129",
+   "req power": "0.136",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Any_General",
-   "thrustCap": 10,
+   "thrustCap": 1,
    "cooling": "Calc",
-   "requiredProjectName": "Project_PlasmaWaveDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Anything",
+   "propellant": "NobleGases",
    "perTankPropellantMaterials": {
-      "metals": 1
+      "water": 0.9,
+      "metals": 0.1
    },
-   "iconResource": "shipbuildericons/ICO_PlasmaWaveDrive"
+   "iconResource": "shipbuildericons/ICO_IonDrive"
 },
  {
-   "dataName": "PlasmaWaveDrivex2",
-   "friendlyName": "Plasma Wave Drive x2",
+   "dataName": "IonDrivex2",
+   "friendlyName": "Ion Drive x2",
    "thrusters": 2,
-   "notes": "MPD T-Wave 1",
-   "driveClassification": "Electromagnetic",
-   "thrust_N": 2400,
+   "driveClassification": "Electrostatic",
+   "requiredProjectName": "Project_IonDrive",
+   "thrust_N": 6600,
    "EV_kps": 78.4,
    "specificPower_kgMW": 0,
-   "efficiency": 0.81,
+   "efficiency": 0.95,
+   "thrustRating_GW": "0.259",
+   "req power": "0.272",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Any_General",
-   "thrustCap": 10,
+   "thrustCap": 1,
    "cooling": "Calc",
-   "requiredProjectName": "Project_PlasmaWaveDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Anything",
+   "propellant": "NobleGases",
    "perTankPropellantMaterials": {
-      "metals": 1
+      "water": 0.9,
+      "metals": 0.1
    },
-   "iconResource": "shipbuildericons/ICO_PlasmaWaveDrive"
+   "iconResource": "shipbuildericons/ICO_IonDrive"
 },
  {
-   "dataName": "PlasmaWaveDrivex3",
-   "friendlyName": "Plasma Wave Drive x3",
+   "dataName": "IonDrivex3",
+   "friendlyName": "Ion Drive x3",
    "thrusters": 3,
-   "notes": "MPD T-Wave 1",
-   "driveClassification": "Electromagnetic",
-   "thrust_N": 3600,
+   "driveClassification": "Electrostatic",
+   "requiredProjectName": "Project_IonDrive",
+   "thrust_N": 9900,
    "EV_kps": 78.4,
    "specificPower_kgMW": 0,
-   "efficiency": 0.81,
+   "efficiency": 0.95,
+   "thrustRating_GW": "0.388",
+   "req power": "0.409",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Any_General",
-   "thrustCap": 10,
+   "thrustCap": 1,
    "cooling": "Calc",
-   "requiredProjectName": "Project_PlasmaWaveDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Anything",
+   "propellant": "NobleGases",
    "perTankPropellantMaterials": {
-      "metals": 1
+      "water": 0.9,
+      "metals": 0.1
    },
-   "iconResource": "shipbuildericons/ICO_PlasmaWaveDrive"
+   "iconResource": "shipbuildericons/ICO_IonDrive"
 },
  {
-   "dataName": "PlasmaWaveDrivex4",
-   "friendlyName": "Plasma Wave Drive x4",
+   "dataName": "IonDrivex4",
+   "friendlyName": "Ion Drive x4",
    "thrusters": 4,
-   "notes": "MPD T-Wave 1",
-   "driveClassification": "Electromagnetic",
-   "thrust_N": 4800,
+   "driveClassification": "Electrostatic",
+   "requiredProjectName": "Project_IonDrive",
+   "thrust_N": 13200,
    "EV_kps": 78.4,
    "specificPower_kgMW": 0,
-   "efficiency": 0.81,
+   "efficiency": 0.95,
+   "thrustRating_GW": "0.517",
+   "req power": "0.545",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Any_General",
-   "thrustCap": 10,
+   "thrustCap": 1,
    "cooling": "Calc",
-   "requiredProjectName": "Project_PlasmaWaveDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Anything",
+   "propellant": "NobleGases",
    "perTankPropellantMaterials": {
-      "metals": 1
+      "water": 0.9,
+      "metals": 0.1
    },
-   "iconResource": "shipbuildericons/ICO_PlasmaWaveDrive"
+   "iconResource": "shipbuildericons/ICO_IonDrive"
 },
  {
-   "dataName": "PlasmaWaveDrivex5",
-   "friendlyName": "Plasma Wave Drive x5",
+   "dataName": "IonDrivex5",
+   "friendlyName": "Ion Drive x5",
    "thrusters": 5,
-   "notes": "MPD T-Wave 1",
-   "driveClassification": "Electromagnetic",
-   "thrust_N": 6000,
+   "driveClassification": "Electrostatic",
+   "requiredProjectName": "Project_IonDrive",
+   "thrust_N": 16500,
    "EV_kps": 78.4,
    "specificPower_kgMW": 0,
-   "efficiency": 0.81,
+   "efficiency": 0.95,
+   "thrustRating_GW": "0.647",
+   "req power": "0.681",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Any_General",
-   "thrustCap": 10,
+   "thrustCap": 1,
    "cooling": "Calc",
-   "requiredProjectName": "Project_PlasmaWaveDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Anything",
+   "propellant": "NobleGases",
    "perTankPropellantMaterials": {
-      "metals": 1
+      "water": 0.9,
+      "metals": 0.1
    },
-   "iconResource": "shipbuildericons/ICO_PlasmaWaveDrive"
+   "iconResource": "shipbuildericons/ICO_IonDrive"
 },
  {
-   "dataName": "PlasmaWaveDrivex6",
-   "friendlyName": "Plasma Wave Drive x6",
+   "dataName": "IonDrivex6",
+   "friendlyName": "Ion Drive x6",
    "thrusters": 6,
-   "notes": "MPD T-Wave 1",
-   "driveClassification": "Electromagnetic",
-   "thrust_N": 7200,
+   "driveClassification": "Electrostatic",
+   "requiredProjectName": "Project_IonDrive",
+   "thrust_N": 19800,
    "EV_kps": 78.4,
    "specificPower_kgMW": 0,
-   "efficiency": 0.81,
+   "efficiency": 0.95,
+   "thrustRating_GW": "0.776",
+   "req power": "0.817",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Any_General",
-   "thrustCap": 10,
+   "thrustCap": 1,
    "cooling": "Calc",
-   "requiredProjectName": "Project_PlasmaWaveDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Anything",
+   "propellant": "NobleGases",
    "perTankPropellantMaterials": {
-      "metals": 1
+      "water": 0.9,
+      "metals": 0.1
    },
-   "iconResource": "shipbuildericons/ICO_PlasmaWaveDrive"
+   "iconResource": "shipbuildericons/ICO_IonDrive"
 },
  {
-   "dataName": "LorentzDrivex1",
-   "friendlyName": "Lorentz Drive x1",
+   "dataName": "ColloidDrivex1",
+   "friendlyName": "Colloid Drive x1",
    "thrusters": 1,
-   "notes": "Magnetoplasmadynamic 2",
-   "driveClassification": "Electromagnetic",
-   "thrust_N": 20000,
-   "EV_kps": 110,
+   "driveClassification": "Electrostatic",
+   "requiredProjectName": "Project_ColloidDrive",
+   "thrust_N": 8000,
+   "EV_kps": 43,
    "specificPower_kgMW": 0,
-   "efficiency": 0.79,
+   "efficiency": 0.85,
+   "thrustRating_GW": "0.172",
+   "req power": "0.202",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Any_General",
-   "thrustCap": 20,
+   "thrustCap": 2,
    "cooling": "Calc",
-   "requiredProjectName": "Project_LorentzDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "NobleGases",
+   "propellant": "Volatiles",
    "perTankPropellantMaterials": {
-      "water": 0.75,
-      "metals": 0.25
+      "volatiles": 1
    },
-   "iconResource": "shipbuildericons/ICO_LorentzDrive"
+   "iconResource": "shipbuildericons/ICO_ColloidDrive"
 },
  {
-   "dataName": "LorentzDrivex2",
-   "friendlyName": "Lorentz Drive x2",
+   "dataName": "ColloidDrivex2",
+   "friendlyName": "Colloid Drive x2",
    "thrusters": 2,
-   "notes": "Magnetoplasmadynamic 2",
-   "driveClassification": "Electromagnetic",
-   "thrust_N": 40000,
-   "EV_kps": 110,
+   "driveClassification": "Electrostatic",
+   "requiredProjectName": "Project_ColloidDrive",
+   "thrust_N": 16000,
+   "EV_kps": 43,
    "specificPower_kgMW": 0,
-   "efficiency": 0.79,
+   "efficiency": 0.85,
+   "thrustRating_GW": "0.344",
+   "req power": "0.405",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Any_General",
-   "thrustCap": 20,
+   "thrustCap": 2,
    "cooling": "Calc",
-   "requiredProjectName": "Project_LorentzDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "NobleGases",
+   "propellant": "Volatiles",
    "perTankPropellantMaterials": {
-      "water": 0.75,
-      "metals": 0.25
+      "volatiles": 1
    },
-   "iconResource": "shipbuildericons/ICO_LorentzDrive"
+   "iconResource": "shipbuildericons/ICO_ColloidDrive"
 },
  {
-   "dataName": "LorentzDrivex3",
-   "friendlyName": "Lorentz Drive x3",
+   "dataName": "ColloidDrivex3",
+   "friendlyName": "Colloid Drive x3",
    "thrusters": 3,
-   "notes": "Magnetoplasmadynamic 2",
-   "driveClassification": "Electromagnetic",
-   "thrust_N": 60000,
-   "EV_kps": 110,
+   "driveClassification": "Electrostatic",
+   "requiredProjectName": "Project_ColloidDrive",
+   "thrust_N": 24000,
+   "EV_kps": 43,
    "specificPower_kgMW": 0,
-   "efficiency": 0.79,
+   "efficiency": 0.85,
+   "thrustRating_GW": "0.516",
+   "req power": "0.607",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Any_General",
-   "thrustCap": 20,
+   "thrustCap": 2,
    "cooling": "Calc",
-   "requiredProjectName": "Project_LorentzDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "NobleGases",
+   "propellant": "Volatiles",
    "perTankPropellantMaterials": {
-      "water": 0.75,
-      "metals": 0.25
+      "volatiles": 1
    },
-   "iconResource": "shipbuildericons/ICO_LorentzDrive"
+   "iconResource": "shipbuildericons/ICO_ColloidDrive"
 },
  {
-   "dataName": "LorentzDrivex4",
-   "friendlyName": "Lorentz Drive x4",
+   "dataName": "ColloidDrivex4",
+   "friendlyName": "Colloid Drive x4",
    "thrusters": 4,
-   "notes": "Magnetoplasmadynamic 2",
-   "driveClassification": "Electromagnetic",
-   "thrust_N": 80000,
-   "EV_kps": 110,
+   "driveClassification": "Electrostatic",
+   "requiredProjectName": "Project_ColloidDrive",
+   "thrust_N": 32000,
+   "EV_kps": 43,
    "specificPower_kgMW": 0,
-   "efficiency": 0.79,
+   "efficiency": 0.85,
+   "thrustRating_GW": "0.688",
+   "req power": "0.809",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Any_General",
-   "thrustCap": 20,
+   "thrustCap": 2,
    "cooling": "Calc",
-   "requiredProjectName": "Project_LorentzDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "NobleGases",
+   "propellant": "Volatiles",
    "perTankPropellantMaterials": {
-      "water": 0.75,
-      "metals": 0.25
+      "volatiles": 1
    },
-   "iconResource": "shipbuildericons/ICO_LorentzDrive"
+   "iconResource": "shipbuildericons/ICO_ColloidDrive"
 },
  {
-   "dataName": "LorentzDrivex5",
-   "friendlyName": "Lorentz Drive x5",
+   "dataName": "ColloidDrivex5",
+   "friendlyName": "Colloid Drive x5",
    "thrusters": 5,
-   "notes": "Magnetoplasmadynamic 2",
-   "driveClassification": "Electromagnetic",
-   "thrust_N": 100000,
-   "EV_kps": 110,
+   "driveClassification": "Electrostatic",
+   "requiredProjectName": "Project_ColloidDrive",
+   "thrust_N": 40000,
+   "EV_kps": 43,
    "specificPower_kgMW": 0,
-   "efficiency": 0.79,
+   "efficiency": 0.85,
+   "thrustRating_GW": "0.860",
+   "req power": "1.012",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Any_General",
-   "thrustCap": 20,
+   "thrustCap": 2,
    "cooling": "Calc",
-   "requiredProjectName": "Project_LorentzDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "NobleGases",
+   "propellant": "Volatiles",
    "perTankPropellantMaterials": {
-      "water": 0.75,
-      "metals": 0.25
+      "volatiles": 1
    },
-   "iconResource": "shipbuildericons/ICO_LorentzDrive"
+   "iconResource": "shipbuildericons/ICO_ColloidDrive"
 },
  {
-   "dataName": "LorentzDrivex6",
-   "friendlyName": "Lorentz Drive x6",
+   "dataName": "ColloidDrivex6",
+   "friendlyName": "Colloid Drive x6",
    "thrusters": 6,
-   "notes": "Magnetoplasmadynamic 2",
-   "driveClassification": "Electromagnetic",
-   "thrust_N": 120000,
-   "EV_kps": 110,
+   "driveClassification": "Electrostatic",
+   "requiredProjectName": "Project_ColloidDrive",
+   "thrust_N": 48000,
+   "EV_kps": 43,
    "specificPower_kgMW": 0,
-   "efficiency": 0.79,
+   "efficiency": 0.85,
+   "thrustRating_GW": "1.032",
+   "req power": "1.214",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Any_General",
-   "thrustCap": 20,
+   "thrustCap": 2,
    "cooling": "Calc",
-   "requiredProjectName": "Project_LorentzDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "NobleGases",
+   "propellant": "Volatiles",
    "perTankPropellantMaterials": {
-      "water": 0.75,
-      "metals": 0.25
+      "volatiles": 1
    },
-   "iconResource": "shipbuildericons/ICO_LorentzDrive"
+   "iconResource": "shipbuildericons/ICO_ColloidDrive"
 },
  {
-   "dataName": "HeliconDrivex1",
-   "friendlyName": "Helicon Drive x1",
+   "dataName": "GridDrivex1",
+   "friendlyName": "Grid Drive x1",
    "thrusters": 1,
-   "notes": "Magnetoplasmadynamic 3",
-   "driveClassification": "Electromagnetic",
-   "thrust_N": 20000,
-   "EV_kps": 314,
+   "notes": "Ion Drive 2 (Gridded Electrostatic)",
+   "driveClassification": "Electrostatic",
+   "requiredProjectName": "Project_GridDrive",
+   "thrust_N": 10000,
+   "EV_kps": 210,
    "specificPower_kgMW": 0,
-   "efficiency": 0.79,
+   "efficiency": 0.95,
+   "thrustRating_GW": "1.050",
+   "req power": "1.105",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Any_General",
-   "thrustCap": 20,
+   "thrustCap": 1,
    "cooling": "Calc",
-   "requiredProjectName": "Project_HeliconDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -1731,23 +1882,25 @@
       "water": 0.9,
       "metals": 0.1
    },
-   "iconResource": "shipbuildericons/ICO_HeliconDrive"
+   "iconResource": "shipbuildericons/ICO_GridDrive"
 },
  {
-   "dataName": "HeliconDrivex2",
-   "friendlyName": "Helicon Drive x2",
+   "dataName": "GridDrivex2",
+   "friendlyName": "Grid Drive x2",
    "thrusters": 2,
-   "notes": "Magnetoplasmadynamic 3",
-   "driveClassification": "Electromagnetic",
-   "thrust_N": 40000,
-   "EV_kps": 314,
+   "notes": "Ion Drive 2 (Gridded Electrostatic)",
+   "driveClassification": "Electrostatic",
+   "requiredProjectName": "Project_GridDrive",
+   "thrust_N": 20000,
+   "EV_kps": 210,
    "specificPower_kgMW": 0,
-   "efficiency": 0.79,
+   "efficiency": 0.95,
+   "thrustRating_GW": "2.100",
+   "req power": "2.211",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Any_General",
-   "thrustCap": 20,
+   "thrustCap": 1,
    "cooling": "Calc",
-   "requiredProjectName": "Project_HeliconDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -1756,23 +1909,25 @@
       "water": 0.9,
       "metals": 0.1
    },
-   "iconResource": "shipbuildericons/ICO_HeliconDrive"
+   "iconResource": "shipbuildericons/ICO_GridDrive"
 },
  {
-   "dataName": "HeliconDrivex3",
-   "friendlyName": "Helicon Drive x3",
+   "dataName": "GridDrivex3",
+   "friendlyName": "Grid Drive x3",
    "thrusters": 3,
-   "notes": "Magnetoplasmadynamic 3",
-   "driveClassification": "Electromagnetic",
-   "thrust_N": 60000,
-   "EV_kps": 314,
+   "notes": "Ion Drive 2 (Gridded Electrostatic)",
+   "driveClassification": "Electrostatic",
+   "requiredProjectName": "Project_GridDrive",
+   "thrust_N": 30000,
+   "EV_kps": 210,
    "specificPower_kgMW": 0,
-   "efficiency": 0.79,
+   "efficiency": 0.95,
+   "thrustRating_GW": "3.150",
+   "req power": "3.316",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Any_General",
-   "thrustCap": 20,
+   "thrustCap": 1,
    "cooling": "Calc",
-   "requiredProjectName": "Project_HeliconDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -1781,23 +1936,25 @@
       "water": 0.9,
       "metals": 0.1
    },
-   "iconResource": "shipbuildericons/ICO_HeliconDrive"
+   "iconResource": "shipbuildericons/ICO_GridDrive"
 },
  {
-   "dataName": "HeliconDrivex4",
-   "friendlyName": "Helicon Drive x4",
+   "dataName": "GridDrivex4",
+   "friendlyName": "Grid Drive x4",
    "thrusters": 4,
-   "notes": "Magnetoplasmadynamic 3",
-   "driveClassification": "Electromagnetic",
-   "thrust_N": 80000,
-   "EV_kps": 314,
+   "notes": "Ion Drive 2 (Gridded Electrostatic)",
+   "driveClassification": "Electrostatic",
+   "requiredProjectName": "Project_GridDrive",
+   "thrust_N": 40000,
+   "EV_kps": 210,
    "specificPower_kgMW": 0,
-   "efficiency": 0.79,
+   "efficiency": 0.95,
+   "thrustRating_GW": "4.200",
+   "req power": "4.421",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Any_General",
-   "thrustCap": 20,
+   "thrustCap": 1,
    "cooling": "Calc",
-   "requiredProjectName": "Project_HeliconDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -1806,23 +1963,25 @@
       "water": 0.9,
       "metals": 0.1
    },
-   "iconResource": "shipbuildericons/ICO_HeliconDrive"
+   "iconResource": "shipbuildericons/ICO_GridDrive"
 },
  {
-   "dataName": "HeliconDrivex5",
-   "friendlyName": "Helicon Drive x5",
+   "dataName": "GridDrivex5",
+   "friendlyName": "Grid Drive x5",
    "thrusters": 5,
-   "notes": "Magnetoplasmadynamic 3",
-   "driveClassification": "Electromagnetic",
-   "thrust_N": 100000,
-   "EV_kps": 314,
+   "notes": "Ion Drive 2 (Gridded Electrostatic)",
+   "driveClassification": "Electrostatic",
+   "requiredProjectName": "Project_GridDrive",
+   "thrust_N": 50000,
+   "EV_kps": 210,
    "specificPower_kgMW": 0,
-   "efficiency": 0.79,
+   "efficiency": 0.95,
+   "thrustRating_GW": "5.250",
+   "req power": "5.526",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Any_General",
-   "thrustCap": 20,
+   "thrustCap": 1,
    "cooling": "Calc",
-   "requiredProjectName": "Project_HeliconDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -1831,23 +1990,25 @@
       "water": 0.9,
       "metals": 0.1
    },
-   "iconResource": "shipbuildericons/ICO_HeliconDrive"
+   "iconResource": "shipbuildericons/ICO_GridDrive"
 },
  {
-   "dataName": "HeliconDrivex6",
-   "friendlyName": "Helicon Drive x6",
+   "dataName": "GridDrivex6",
+   "friendlyName": "Grid Drive x6",
    "thrusters": 6,
-   "notes": "Magnetoplasmadynamic 3",
-   "driveClassification": "Electromagnetic",
-   "thrust_N": 120000,
-   "EV_kps": 314,
+   "notes": "Ion Drive 2 (Gridded Electrostatic)",
+   "driveClassification": "Electrostatic",
+   "requiredProjectName": "Project_GridDrive",
+   "thrust_N": 60000,
+   "EV_kps": 210,
    "specificPower_kgMW": 0,
-   "efficiency": 0.79,
+   "efficiency": 0.95,
+   "thrustRating_GW": "6.300",
+   "req power": "6.632",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Any_General",
-   "thrustCap": 20,
+   "thrustCap": 1,
    "cooling": "Calc",
-   "requiredProjectName": "Project_HeliconDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -1856,869 +2017,960 @@
       "water": 0.9,
       "metals": 0.1
    },
-   "iconResource": "shipbuildericons/ICO_HeliconDrive"
+   "iconResource": "shipbuildericons/ICO_GridDrive"
 },
  {
-   "dataName": "HallDrivex1",
-   "friendlyName": "Hall Drive x1",
+   "dataName": "VASIMRx1",
+   "friendlyName": "VASIMR x1",
    "thrusters": 1,
-   "notes": "Hall Effect Thruster",
-   "driveClassification": "Electrostatic",
-   "thrust_N": 3300,
-   "EV_kps": 19.62,
+   "driveClassification": "Electromagnetic",
+   "requiredProjectName": "Project_VASIMR",
+   "thrust_N": 1000,
+   "EV_kps": 147,
    "specificPower_kgMW": 0,
-   "efficiency": 0.53,
+   "efficiency": 0.6,
+   "thrustRating_GW": "0.074",
+   "req power": "0.123",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Any_General",
-   "thrustCap": 1,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_HallDrive",
+   "thrustCap": 60,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Metals",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "metals": 1
+      "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_HallDrive"
+   "iconResource": "shipbuildericons/ICO_VASIMR"
 },
  {
-   "dataName": "HallDrivex2",
-   "friendlyName": "Hall Drive x2",
+   "dataName": "VASIMRx2",
+   "friendlyName": "VASIMR x2",
    "thrusters": 2,
-   "driveClassification": "Electrostatic",
-   "thrust_N": 6600,
-   "EV_kps": 19.62,
+   "driveClassification": "Electromagnetic",
+   "requiredProjectName": "Project_VASIMR",
+   "thrust_N": 2000,
+   "EV_kps": 147,
    "specificPower_kgMW": 0,
-   "efficiency": 0.53,
+   "efficiency": 0.6,
+   "thrustRating_GW": "0.147",
+   "req power": "0.245",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Any_General",
-   "thrustCap": 1,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_HallDrive",
+   "thrustCap": 60,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Metals",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "metals": 1
+      "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_HallDrive"
+   "iconResource": "shipbuildericons/ICO_VASIMR"
 },
  {
-   "dataName": "HallDrivex3",
-   "friendlyName": "Hall Drive x3",
+   "dataName": "VASIMRx3",
+   "friendlyName": "VASIMR x3",
    "thrusters": 3,
-   "driveClassification": "Electrostatic",
-   "thrust_N": 9900,
-   "EV_kps": 19.62,
+   "driveClassification": "Electromagnetic",
+   "requiredProjectName": "Project_VASIMR",
+   "thrust_N": 3000,
+   "EV_kps": 147,
    "specificPower_kgMW": 0,
-   "efficiency": 0.53,
+   "efficiency": 0.6,
+   "thrustRating_GW": "0.221",
+   "req power": "0.368",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Any_General",
-   "thrustCap": 1,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_HallDrive",
+   "thrustCap": 60,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Metals",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "metals": 1
+      "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_HallDrive"
+   "iconResource": "shipbuildericons/ICO_VASIMR"
 },
  {
-   "dataName": "HallDrivex4",
-   "friendlyName": "Hall Drive x4",
+   "dataName": "VASIMRx4",
+   "friendlyName": "VASIMR x4",
    "thrusters": 4,
-   "driveClassification": "Electrostatic",
-   "thrust_N": 13200,
-   "EV_kps": 19.62,
+   "driveClassification": "Electromagnetic",
+   "requiredProjectName": "Project_VASIMR",
+   "thrust_N": 4000,
+   "EV_kps": 147,
    "specificPower_kgMW": 0,
-   "efficiency": 0.53,
+   "efficiency": 0.6,
+   "thrustRating_GW": "0.294",
+   "req power": "0.490",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Any_General",
-   "thrustCap": 1,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_HallDrive",
+   "thrustCap": 60,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Metals",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "metals": 1
+      "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_HallDrive"
+   "iconResource": "shipbuildericons/ICO_VASIMR"
 },
  {
-   "dataName": "HallDrivex5",
-   "friendlyName": "Hall Drive x5",
+   "dataName": "VASIMRx5",
+   "friendlyName": "VASIMR x5",
    "thrusters": 5,
-   "driveClassification": "Electrostatic",
-   "thrust_N": 16500,
-   "EV_kps": 19.62,
+   "driveClassification": "Electromagnetic",
+   "requiredProjectName": "Project_VASIMR",
+   "thrust_N": 5000,
+   "EV_kps": 147,
    "specificPower_kgMW": 0,
-   "efficiency": 0.53,
+   "efficiency": 0.6,
+   "thrustRating_GW": "0.368",
+   "req power": "0.613",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Any_General",
-   "thrustCap": 1,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_HallDrive",
+   "thrustCap": 60,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Metals",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "metals": 1
+      "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_HallDrive"
+   "iconResource": "shipbuildericons/ICO_VASIMR"
 },
  {
-   "dataName": "HallDrivex6",
-   "friendlyName": "Hall Drive x6",
+   "dataName": "VASIMRx6",
+   "friendlyName": "VASIMR x6",
    "thrusters": 6,
-   "driveClassification": "Electrostatic",
-   "thrust_N": 19800,
-   "EV_kps": 19.62,
+   "driveClassification": "Electromagnetic",
+   "requiredProjectName": "Project_VASIMR",
+   "thrust_N": 6000,
+   "EV_kps": 147,
    "specificPower_kgMW": 0,
-   "efficiency": 0.53,
+   "efficiency": 0.6,
+   "thrustRating_GW": "0.441",
+   "req power": "0.735",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Any_General",
-   "thrustCap": 1,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_HallDrive",
+   "thrustCap": 60,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Metals",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "metals": 1
+      "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_HallDrive"
+   "iconResource": "shipbuildericons/ICO_VASIMR"
 },
  {
-   "dataName": "IonDrivex1",
-   "friendlyName": "Ion Drive x1",
+   "dataName": "PonderomotiveVASIMRx1",
+   "friendlyName": "Ponderomotive VASIMR x1",
    "thrusters": 1,
-   "driveClassification": "Electrostatic",
-   "thrust_N": 1444,
-   "EV_kps": 78.4,
+   "driveClassification": "Electromagnetic",
+   "requiredProjectName": "Project_PonderomotiveVASIMR",
+   "thrust_N": 2250,
+   "EV_kps": 147,
    "specificPower_kgMW": 0,
-   "efficiency": 0.95,
+   "efficiency": 0.72,
+   "thrustRating_GW": "0.165",
+   "req power": "0.230",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Any_General",
-   "thrustCap": 20,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_IonDrive",
+   "thrustCap": 80,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "NobleGases",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 0.9,
-      "metals": 0.1
+      "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_IonDrive"
+   "iconResource": "shipbuildericons/ICO_PonderomotiveVASIMR"
 },
  {
-   "dataName": "IonDrivex2",
-   "friendlyName": "Ion Drive x2",
+   "dataName": "PonderomotiveVASIMRx2",
+   "friendlyName": "Ponderomotive VASIMR x2",
    "thrusters": 2,
-   "driveClassification": "Electrostatic",
-   "thrust_N": 2888,
-   "EV_kps": 78.4,
+   "driveClassification": "Electromagnetic",
+   "requiredProjectName": "Project_PonderomotiveVASIMR",
+   "thrust_N": 4500,
+   "EV_kps": 147,
    "specificPower_kgMW": 0,
-   "efficiency": 0.95,
+   "efficiency": 0.72,
+   "thrustRating_GW": "0.331",
+   "req power": "0.459",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Any_General",
-   "thrustCap": 20,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_IonDrive",
+   "thrustCap": 80,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "NobleGases",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 0.9,
-      "metals": 0.1
+      "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_IonDrive"
+   "iconResource": "shipbuildericons/ICO_PonderomotiveVASIMR"
 },
  {
-   "dataName": "IonDrivex3",
-   "friendlyName": "Ion Drive x3",
+   "dataName": "PonderomotiveVASIMRx3",
+   "friendlyName": "Ponderomotive VASIMR x3",
    "thrusters": 3,
-   "driveClassification": "Electrostatic",
-   "thrust_N": 4332,
-   "EV_kps": 78.4,
+   "driveClassification": "Electromagnetic",
+   "requiredProjectName": "Project_PonderomotiveVASIMR",
+   "thrust_N": 6750,
+   "EV_kps": 147,
    "specificPower_kgMW": 0,
-   "efficiency": 0.95,
+   "efficiency": 0.72,
+   "thrustRating_GW": "0.496",
+   "req power": "0.689",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Any_General",
-   "thrustCap": 20,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_IonDrive",
+   "thrustCap": 80,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "NobleGases",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 0.9,
-      "metals": 0.1
+      "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_IonDrive"
+   "iconResource": "shipbuildericons/ICO_PonderomotiveVASIMR"
 },
  {
-   "dataName": "IonDrivex4",
-   "friendlyName": "Ion Drive x4",
+   "dataName": "PonderomotiveVASIMRx4",
+   "friendlyName": "Ponderomotive VASIMR x4",
    "thrusters": 4,
-   "driveClassification": "Electrostatic",
-   "thrust_N": 5776,
-   "EV_kps": 78.4,
+   "driveClassification": "Electromagnetic",
+   "requiredProjectName": "Project_PonderomotiveVASIMR",
+   "thrust_N": 9000,
+   "EV_kps": 147,
    "specificPower_kgMW": 0,
-   "efficiency": 0.95,
+   "efficiency": 0.72,
+   "thrustRating_GW": "0.662",
+   "req power": "0.919",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Any_General",
-   "thrustCap": 20,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_IonDrive",
+   "thrustCap": 80,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "NobleGases",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 0.9,
-      "metals": 0.1
+      "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_IonDrive"
+   "iconResource": "shipbuildericons/ICO_PonderomotiveVASIMR"
 },
  {
-   "dataName": "IonDrivex5",
-   "friendlyName": "Ion Drive x5",
+   "dataName": "PonderomotiveVASIMRx5",
+   "friendlyName": "Ponderomotive VASIMR x5",
    "thrusters": 5,
-   "driveClassification": "Electrostatic",
-   "thrust_N": 7220,
-   "EV_kps": 78.4,
+   "driveClassification": "Electromagnetic",
+   "requiredProjectName": "Project_PonderomotiveVASIMR",
+   "thrust_N": 11250,
+   "EV_kps": 147,
    "specificPower_kgMW": 0,
-   "efficiency": 0.95,
+   "efficiency": 0.72,
+   "thrustRating_GW": "0.827",
+   "req power": "1.148",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Any_General",
-   "thrustCap": 20,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_IonDrive",
+   "thrustCap": 80,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "NobleGases",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 0.9,
-      "metals": 0.1
+      "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_IonDrive"
+   "iconResource": "shipbuildericons/ICO_PonderomotiveVASIMR"
 },
  {
-   "dataName": "IonDrivex6",
-   "friendlyName": "Ion Drive x6",
+   "dataName": "PonderomotiveVASIMRx6",
+   "friendlyName": "Ponderomotive VASIMR x6",
    "thrusters": 6,
-   "driveClassification": "Electrostatic",
-   "thrust_N": 8664,
-   "EV_kps": 78.4,
+   "driveClassification": "Electromagnetic",
+   "requiredProjectName": "Project_PonderomotiveVASIMR",
+   "thrust_N": 13500,
+   "EV_kps": 147,
    "specificPower_kgMW": 0,
-   "efficiency": 0.95,
+   "efficiency": 0.72,
+   "thrustRating_GW": "0.992",
+   "req power": "1.378",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Any_General",
-   "thrustCap": 20,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_IonDrive",
+   "thrustCap": 80,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "NobleGases",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 0.9,
-      "metals": 0.1
+      "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_IonDrive"
+   "iconResource": "shipbuildericons/ICO_PonderomotiveVASIMR"
 },
  {
-   "dataName": "GridDrivex1",
-   "friendlyName": "Grid Drive x1",
+   "dataName": "PulsedPlasmoidDrivex1",
+   "friendlyName": "Pulsed Plasmoid Drive x1",
    "thrusters": 1,
-   "notes": "Ion Drive 2 (Gridded Electrostatic)",
-   "driveClassification": "Electrostatic",
-   "thrust_N": 10000,
-   "EV_kps": 210,
+   "driveClassification": "Electromagnetic",
+   "requiredProjectName": "Project_PulsedPlasmoidDrive",
+   "thrust_N": 2200,
+   "EV_kps": 425,
    "specificPower_kgMW": 0,
-   "efficiency": 0.95,
+   "efficiency": 0.72,
+   "thrustRating_GW": "0.468",
+   "req power": "0.649",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Any_General",
-   "thrustCap": 20,
+   "thrustCap": 1,
    "cooling": "Calc",
-   "requiredProjectName": "Project_GridDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "NobleGases",
+   "propellant": "Anything",
    "perTankPropellantMaterials": {
-      "water": 0.9,
-      "metals": 0.1
+      "metals": 1
    },
-   "iconResource": "shipbuildericons/ICO_GridDrive"
+   "freeISRU": true,
+   "iconResource": "shipbuildericons/ICO_PulsedPlasmoidDrive"
 },
  {
-   "dataName": "GridDrivex2",
-   "friendlyName": "Grid Drive x2",
+   "dataName": "PulsedPlasmoidDrivex2",
+   "friendlyName": "Pulsed Plasmoid Drive x2",
    "thrusters": 2,
-   "notes": "Ion Drive 2 (Gridded Electrostatic)",
-   "driveClassification": "Electrostatic",
-   "thrust_N": 20000,
-   "EV_kps": 210,
+   "driveClassification": "Electromagnetic",
+   "requiredProjectName": "Project_PulsedPlasmoidDrive",
+   "thrust_N": 4400,
+   "EV_kps": 425,
    "specificPower_kgMW": 0,
-   "efficiency": 0.95,
+   "efficiency": 0.72,
+   "thrustRating_GW": "0.935",
+   "req power": "1.299",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Any_General",
-   "thrustCap": 20,
+   "thrustCap": 1,
    "cooling": "Calc",
-   "requiredProjectName": "Project_GridDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "NobleGases",
+   "propellant": "Anything",
    "perTankPropellantMaterials": {
-      "water": 0.9,
-      "metals": 0.1
+      "metals": 1
    },
-   "iconResource": "shipbuildericons/ICO_GridDrive"
+   "freeISRU": true,
+   "iconResource": "shipbuildericons/ICO_PulsedPlasmoidDrive"
 },
  {
-   "dataName": "GridDrivex3",
-   "friendlyName": "Grid Drive x3",
+   "dataName": "PulsedPlasmoidDrivex3",
+   "friendlyName": "Pulsed Plasmoid Drive x3",
    "thrusters": 3,
-   "notes": "Ion Drive 2 (Gridded Electrostatic)",
-   "driveClassification": "Electrostatic",
-   "thrust_N": 30000,
-   "EV_kps": 210,
+   "driveClassification": "Electromagnetic",
+   "requiredProjectName": "Project_PulsedPlasmoidDrive",
+   "thrust_N": 6600,
+   "EV_kps": 425,
    "specificPower_kgMW": 0,
-   "efficiency": 0.95,
+   "efficiency": 0.72,
+   "thrustRating_GW": "1.403",
+   "req power": "1.948",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Any_General",
-   "thrustCap": 20,
+   "thrustCap": 1,
    "cooling": "Calc",
-   "requiredProjectName": "Project_GridDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "NobleGases",
+   "propellant": "Anything",
    "perTankPropellantMaterials": {
-      "water": 0.9,
-      "metals": 0.1
+      "metals": 1
    },
-   "iconResource": "shipbuildericons/ICO_GridDrive"
+   "freeISRU": true,
+   "iconResource": "shipbuildericons/ICO_PulsedPlasmoidDrive"
 },
  {
-   "dataName": "GridDrivex4",
-   "friendlyName": "Grid Drive x4",
+   "dataName": "PulsedPlasmoidDrivex4",
+   "friendlyName": "Pulsed Plasmoid Drive x4",
    "thrusters": 4,
-   "notes": "Ion Drive 2 (Gridded Electrostatic)",
-   "driveClassification": "Electrostatic",
-   "thrust_N": 40000,
-   "EV_kps": 210,
+   "driveClassification": "Electromagnetic",
+   "requiredProjectName": "Project_PulsedPlasmoidDrive",
+   "thrust_N": 8800,
+   "EV_kps": 425,
    "specificPower_kgMW": 0,
-   "efficiency": 0.95,
+   "efficiency": 0.72,
+   "thrustRating_GW": "1.870",
+   "req power": "2.597",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Any_General",
-   "thrustCap": 20,
+   "thrustCap": 1,
    "cooling": "Calc",
-   "requiredProjectName": "Project_GridDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "NobleGases",
+   "propellant": "Anything",
    "perTankPropellantMaterials": {
-      "water": 0.9,
-      "metals": 0.1
+      "metals": 1
    },
-   "iconResource": "shipbuildericons/ICO_GridDrive"
+   "freeISRU": true,
+   "iconResource": "shipbuildericons/ICO_PulsedPlasmoidDrive"
 },
  {
-   "dataName": "GridDrivex5",
-   "friendlyName": "Grid Drive x5",
+   "dataName": "PulsedPlasmoidDrivex5",
+   "friendlyName": "Pulsed Plasmoid Drive x5",
    "thrusters": 5,
-   "notes": "Ion Drive 2 (Gridded Electrostatic)",
-   "driveClassification": "Electrostatic",
-   "thrust_N": 50000,
-   "EV_kps": 210,
+   "driveClassification": "Electromagnetic",
+   "requiredProjectName": "Project_PulsedPlasmoidDrive",
+   "thrust_N": 11000,
+   "EV_kps": 425,
    "specificPower_kgMW": 0,
-   "efficiency": 0.95,
+   "efficiency": 0.72,
+   "thrustRating_GW": "2.338",
+   "req power": "3.247",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Any_General",
-   "thrustCap": 20,
+   "thrustCap": 1,
    "cooling": "Calc",
-   "requiredProjectName": "Project_GridDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "NobleGases",
+   "propellant": "Anything",
    "perTankPropellantMaterials": {
-      "water": 0.9,
-      "metals": 0.1
+      "metals": 1
    },
-   "iconResource": "shipbuildericons/ICO_GridDrive"
+   "freeISRU": true,
+   "iconResource": "shipbuildericons/ICO_PulsedPlasmoidDrive"
 },
  {
-   "dataName": "GridDrivex6",
-   "friendlyName": "Grid Drive x6",
+   "dataName": "PulsedPlasmoidDrivex6",
+   "friendlyName": "Pulsed Plasmoid Drive x6",
    "thrusters": 6,
-   "notes": "Ion Drive 2 (Gridded Electrostatic)",
-   "driveClassification": "Electrostatic",
-   "thrust_N": 60000,
-   "EV_kps": 210,
+   "driveClassification": "Electromagnetic",
+   "requiredProjectName": "Project_PulsedPlasmoidDrive",
+   "thrust_N": 13200,
+   "EV_kps": 425,
    "specificPower_kgMW": 0,
-   "efficiency": 0.95,
+   "efficiency": 0.72,
+   "thrustRating_GW": "2.805",
+   "req power": "3.896",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Any_General",
-   "thrustCap": 20,
+   "thrustCap": 1,
    "cooling": "Calc",
-   "requiredProjectName": "Project_GridDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "NobleGases",
+   "propellant": "Anything",
    "perTankPropellantMaterials": {
-      "water": 0.9,
-      "metals": 0.1
+      "metals": 1
    },
-   "iconResource": "shipbuildericons/ICO_GridDrive"
+   "freeISRU": true,
+   "iconResource": "shipbuildericons/ICO_PulsedPlasmoidDrive"
 },
  {
-   "dataName": "ColloidDrivex1",
-   "friendlyName": "Colloid Drive x1",
+   "dataName": "PlasmaWaveDrivex1",
+   "friendlyName": "Plasma Wave Drive x1",
    "thrusters": 1,
-   "driveClassification": "Electrostatic",
-   "thrust_N": 8000,
-   "EV_kps": 43,
+   "notes": "MPD T-Wave 1",
+   "driveClassification": "Electromagnetic",
+   "requiredProjectName": "Project_PlasmaWaveDrive",
+   "thrust_N": 1200,
+   "EV_kps": 78.4,
    "specificPower_kgMW": 0,
-   "efficiency": 0.85,
+   "efficiency": 0.81,
+   "thrustRating_GW": "0.047",
+   "req power": "0.058",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Any_General",
-   "thrustCap": 20,
+   "thrustCap": 10,
    "cooling": "Calc",
-   "requiredProjectName": "Project_ColloidDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Volatiles",
+   "propellant": "Anything",
    "perTankPropellantMaterials": {
-      "volatiles": 1
+      "metals": 1
    },
-   "iconResource": "shipbuildericons/ICO_ColloidDrive"
+   "iconResource": "shipbuildericons/ICO_PlasmaWaveDrive"
 },
  {
-   "dataName": "ColloidDrivex2",
-   "friendlyName": "Colloid Drive x2",
+   "dataName": "PlasmaWaveDrivex2",
+   "friendlyName": "Plasma Wave Drive x2",
    "thrusters": 2,
-   "driveClassification": "Electrostatic",
-   "thrust_N": 16000,
-   "EV_kps": 43,
+   "notes": "MPD T-Wave 1",
+   "driveClassification": "Electromagnetic",
+   "requiredProjectName": "Project_PlasmaWaveDrive",
+   "thrust_N": 2400,
+   "EV_kps": 78.4,
    "specificPower_kgMW": 0,
-   "efficiency": 0.85,
+   "efficiency": 0.81,
+   "thrustRating_GW": "0.094",
+   "req power": "0.116",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Any_General",
-   "thrustCap": 20,
+   "thrustCap": 10,
    "cooling": "Calc",
-   "requiredProjectName": "Project_ColloidDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Volatiles",
+   "propellant": "Anything",
    "perTankPropellantMaterials": {
-      "volatiles": 1
+      "metals": 1
    },
-   "iconResource": "shipbuildericons/ICO_ColloidDrive"
+   "iconResource": "shipbuildericons/ICO_PlasmaWaveDrive"
 },
  {
-   "dataName": "ColloidDrivex3",
-   "friendlyName": "Colloid Drive x3",
+   "dataName": "PlasmaWaveDrivex3",
+   "friendlyName": "Plasma Wave Drive x3",
    "thrusters": 3,
-   "driveClassification": "Electrostatic",
-   "thrust_N": 24000,
-   "EV_kps": 43,
+   "notes": "MPD T-Wave 1",
+   "driveClassification": "Electromagnetic",
+   "requiredProjectName": "Project_PlasmaWaveDrive",
+   "thrust_N": 3600,
+   "EV_kps": 78.4,
    "specificPower_kgMW": 0,
-   "efficiency": 0.85,
+   "efficiency": 0.81,
+   "thrustRating_GW": "0.141",
+   "req power": "0.174",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Any_General",
-   "thrustCap": 20,
+   "thrustCap": 10,
    "cooling": "Calc",
-   "requiredProjectName": "Project_ColloidDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Volatiles",
+   "propellant": "Anything",
    "perTankPropellantMaterials": {
-      "volatiles": 1
+      "metals": 1
    },
-   "iconResource": "shipbuildericons/ICO_ColloidDrive"
+   "iconResource": "shipbuildericons/ICO_PlasmaWaveDrive"
 },
  {
-   "dataName": "ColloidDrivex4",
-   "friendlyName": "Colloid Drive x4",
+   "dataName": "PlasmaWaveDrivex4",
+   "friendlyName": "Plasma Wave Drive x4",
    "thrusters": 4,
-   "driveClassification": "Electrostatic",
-   "thrust_N": 32000,
-   "EV_kps": 43,
+   "notes": "MPD T-Wave 1",
+   "driveClassification": "Electromagnetic",
+   "requiredProjectName": "Project_PlasmaWaveDrive",
+   "thrust_N": 4800,
+   "EV_kps": 78.4,
    "specificPower_kgMW": 0,
-   "efficiency": 0.85,
+   "efficiency": 0.81,
+   "thrustRating_GW": "0.188",
+   "req power": "0.232",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Any_General",
-   "thrustCap": 20,
+   "thrustCap": 10,
    "cooling": "Calc",
-   "requiredProjectName": "Project_ColloidDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Volatiles",
+   "propellant": "Anything",
    "perTankPropellantMaterials": {
-      "volatiles": 1
+      "metals": 1
    },
-   "iconResource": "shipbuildericons/ICO_ColloidDrive"
+   "iconResource": "shipbuildericons/ICO_PlasmaWaveDrive"
 },
  {
-   "dataName": "ColloidDrivex5",
-   "friendlyName": "Colloid Drive x5",
+   "dataName": "PlasmaWaveDrivex5",
+   "friendlyName": "Plasma Wave Drive x5",
    "thrusters": 5,
-   "driveClassification": "Electrostatic",
-   "thrust_N": 40000,
-   "EV_kps": 43,
+   "notes": "MPD T-Wave 1",
+   "driveClassification": "Electromagnetic",
+   "requiredProjectName": "Project_PlasmaWaveDrive",
+   "thrust_N": 6000,
+   "EV_kps": 78.4,
    "specificPower_kgMW": 0,
-   "efficiency": 0.85,
+   "efficiency": 0.81,
+   "thrustRating_GW": "0.235",
+   "req power": "0.290",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Any_General",
-   "thrustCap": 20,
+   "thrustCap": 10,
    "cooling": "Calc",
-   "requiredProjectName": "Project_ColloidDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Volatiles",
+   "propellant": "Anything",
    "perTankPropellantMaterials": {
-      "volatiles": 1
+      "metals": 1
    },
-   "iconResource": "shipbuildericons/ICO_ColloidDrive"
+   "iconResource": "shipbuildericons/ICO_PlasmaWaveDrive"
 },
  {
-   "dataName": "ColloidDrivex6",
-   "friendlyName": "Colloid Drive x6",
+   "dataName": "PlasmaWaveDrivex6",
+   "friendlyName": "Plasma Wave Drive x6",
    "thrusters": 6,
-   "driveClassification": "Electrostatic",
-   "thrust_N": 48000,
-   "EV_kps": 43,
+   "notes": "MPD T-Wave 1",
+   "driveClassification": "Electromagnetic",
+   "requiredProjectName": "Project_PlasmaWaveDrive",
+   "thrust_N": 7200,
+   "EV_kps": 78.4,
    "specificPower_kgMW": 0,
-   "efficiency": 0.85,
+   "efficiency": 0.81,
+   "thrustRating_GW": "0.282",
+   "req power": "0.348",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Any_General",
-   "thrustCap": 20,
+   "thrustCap": 10,
    "cooling": "Calc",
-   "requiredProjectName": "Project_ColloidDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Volatiles",
+   "propellant": "Anything",
    "perTankPropellantMaterials": {
-      "volatiles": 1
+      "metals": 1
    },
-   "iconResource": "shipbuildericons/ICO_ColloidDrive"
+   "iconResource": "shipbuildericons/ICO_PlasmaWaveDrive"
 },
  {
-   "dataName": "VASIMRx1",
-   "friendlyName": "VASIMR x1",
+   "dataName": "LorentzDrivex1",
+   "friendlyName": "Lorentz Drive x1",
    "thrusters": 1,
+   "notes": "Magnetoplasmadynamic 2",
    "driveClassification": "Electromagnetic",
-   "thrust_N": 1000,
-   "EV_kps": 147,
+   "requiredProjectName": "Project_LorentzDrive",
+   "thrust_N": 20000,
+   "EV_kps": 110,
    "specificPower_kgMW": 0,
-   "efficiency": 0.6,
+   "efficiency": 0.79,
+   "thrustRating_GW": "1.100",
+   "req power": "1.392",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Any_General",
-   "thrustCap": 40,
+   "thrustCap": 20,
    "cooling": "Calc",
-   "requiredProjectName": "Project_VASIMR",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Hydrogen",
+   "propellant": "NobleGases",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.75,
+      "metals": 0.25
    },
-   "iconResource": "shipbuildericons/ICO_VASIMR"
+   "iconResource": "shipbuildericons/ICO_LorentzDrive"
 },
  {
-   "dataName": "VASIMRx2",
-   "friendlyName": "VASIMR x2",
+   "dataName": "LorentzDrivex2",
+   "friendlyName": "Lorentz Drive x2",
    "thrusters": 2,
+   "notes": "Magnetoplasmadynamic 2",
    "driveClassification": "Electromagnetic",
-   "thrust_N": 2000,
-   "EV_kps": 147,
+   "requiredProjectName": "Project_LorentzDrive",
+   "thrust_N": 40000,
+   "EV_kps": 110,
    "specificPower_kgMW": 0,
-   "efficiency": 0.6,
+   "efficiency": 0.79,
+   "thrustRating_GW": "2.200",
+   "req power": "2.785",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Any_General",
-   "thrustCap": 40,
+   "thrustCap": 20,
    "cooling": "Calc",
-   "requiredProjectName": "Project_VASIMR",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Hydrogen",
+   "propellant": "NobleGases",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.75,
+      "metals": 0.25
    },
-   "iconResource": "shipbuildericons/ICO_VASIMR"
+   "iconResource": "shipbuildericons/ICO_LorentzDrive"
 },
  {
-   "dataName": "VASIMRx3",
-   "friendlyName": "VASIMR x3",
+   "dataName": "LorentzDrivex3",
+   "friendlyName": "Lorentz Drive x3",
    "thrusters": 3,
+   "notes": "Magnetoplasmadynamic 2",
    "driveClassification": "Electromagnetic",
-   "thrust_N": 3000,
-   "EV_kps": 147,
+   "requiredProjectName": "Project_LorentzDrive",
+   "thrust_N": 60000,
+   "EV_kps": 110,
    "specificPower_kgMW": 0,
-   "efficiency": 0.6,
+   "efficiency": 0.79,
+   "thrustRating_GW": "3.300",
+   "req power": "4.177",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Any_General",
-   "thrustCap": 40,
+   "thrustCap": 20,
    "cooling": "Calc",
-   "requiredProjectName": "Project_VASIMR",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Hydrogen",
+   "propellant": "NobleGases",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.75,
+      "metals": 0.25
    },
-   "iconResource": "shipbuildericons/ICO_VASIMR"
+   "iconResource": "shipbuildericons/ICO_LorentzDrive"
 },
  {
-   "dataName": "VASIMRx4",
-   "friendlyName": "VASIMR x4",
+   "dataName": "LorentzDrivex4",
+   "friendlyName": "Lorentz Drive x4",
    "thrusters": 4,
+   "notes": "Magnetoplasmadynamic 2",
    "driveClassification": "Electromagnetic",
-   "thrust_N": 4000,
-   "EV_kps": 147,
+   "requiredProjectName": "Project_LorentzDrive",
+   "thrust_N": 80000,
+   "EV_kps": 110,
    "specificPower_kgMW": 0,
-   "efficiency": 0.6,
+   "efficiency": 0.79,
+   "thrustRating_GW": "4.400",
+   "req power": "5.570",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Any_General",
-   "thrustCap": 40,
+   "thrustCap": 20,
    "cooling": "Calc",
-   "requiredProjectName": "Project_VASIMR",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Hydrogen",
+   "propellant": "NobleGases",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.75,
+      "metals": 0.25
    },
-   "iconResource": "shipbuildericons/ICO_VASIMR"
+   "iconResource": "shipbuildericons/ICO_LorentzDrive"
 },
  {
-   "dataName": "VASIMRx5",
-   "friendlyName": "VASIMR x5",
+   "dataName": "LorentzDrivex5",
+   "friendlyName": "Lorentz Drive x5",
    "thrusters": 5,
+   "notes": "Magnetoplasmadynamic 2",
    "driveClassification": "Electromagnetic",
-   "thrust_N": 5000,
-   "EV_kps": 147,
+   "requiredProjectName": "Project_LorentzDrive",
+   "thrust_N": 100000,
+   "EV_kps": 110,
    "specificPower_kgMW": 0,
-   "efficiency": 0.6,
+   "efficiency": 0.79,
+   "thrustRating_GW": "5.500",
+   "req power": "6.962",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Any_General",
-   "thrustCap": 40,
+   "thrustCap": 20,
    "cooling": "Calc",
-   "requiredProjectName": "Project_VASIMR",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Hydrogen",
+   "propellant": "NobleGases",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.75,
+      "metals": 0.25
    },
-   "iconResource": "shipbuildericons/ICO_VASIMR"
+   "iconResource": "shipbuildericons/ICO_LorentzDrive"
 },
  {
-   "dataName": "VASIMRx6",
-   "friendlyName": "VASIMR x6",
+   "dataName": "LorentzDrivex6",
+   "friendlyName": "Lorentz Drive x6",
    "thrusters": 6,
+   "notes": "Magnetoplasmadynamic 2",
    "driveClassification": "Electromagnetic",
-   "thrust_N": 6000,
-   "EV_kps": 147,
+   "requiredProjectName": "Project_LorentzDrive",
+   "thrust_N": 120000,
+   "EV_kps": 110,
    "specificPower_kgMW": 0,
-   "efficiency": 0.6,
+   "efficiency": 0.79,
+   "thrustRating_GW": "6.600",
+   "req power": "8.354",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Any_General",
-   "thrustCap": 40,
+   "thrustCap": 20,
    "cooling": "Calc",
-   "requiredProjectName": "Project_VASIMR",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Hydrogen",
+   "propellant": "NobleGases",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.75,
+      "metals": 0.25
    },
-   "iconResource": "shipbuildericons/ICO_VASIMR"
+   "iconResource": "shipbuildericons/ICO_LorentzDrive"
 },
  {
-   "dataName": "PonderomotiveVASIMRx1",
-   "friendlyName": "Ponderomotive VASIMR x1",
+   "dataName": "HeliconDrivex1",
+   "friendlyName": "Helicon Drive x1",
    "thrusters": 1,
+   "notes": "Magnetoplasmadynamic 3",
    "driveClassification": "Electromagnetic",
-   "thrust_N": 2250,
-   "EV_kps": 147,
+   "requiredProjectName": "Project_HeliconDrive",
+   "thrust_N": 20000,
+   "EV_kps": 314,
    "specificPower_kgMW": 0,
-   "efficiency": 0.72,
+   "efficiency": 0.79,
+   "thrustRating_GW": "3.140",
+   "req power": "3.975",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Any_General",
-   "thrustCap": 40,
+   "thrustCap": 20,
    "cooling": "Calc",
-   "requiredProjectName": "Project_PonderomotiveVASIMR",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Hydrogen",
+   "propellant": "NobleGases",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.9,
+      "metals": 0.1
    },
-   "iconResource": "shipbuildericons/ICO_PonderomotiveVASIMR"
+   "iconResource": "shipbuildericons/ICO_HeliconDrive"
 },
  {
-   "dataName": "PonderomotiveVASIMRx2",
-   "friendlyName": "Ponderomotive VASIMR x2",
+   "dataName": "HeliconDrivex2",
+   "friendlyName": "Helicon Drive x2",
    "thrusters": 2,
+   "notes": "Magnetoplasmadynamic 3",
    "driveClassification": "Electromagnetic",
-   "thrust_N": 4500,
-   "EV_kps": 147,
+   "requiredProjectName": "Project_HeliconDrive",
+   "thrust_N": 40000,
+   "EV_kps": 314,
    "specificPower_kgMW": 0,
-   "efficiency": 0.72,
+   "efficiency": 0.79,
+   "thrustRating_GW": "6.280",
+   "req power": "7.949",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Any_General",
-   "thrustCap": 40,
+   "thrustCap": 20,
    "cooling": "Calc",
-   "requiredProjectName": "Project_PonderomotiveVASIMR",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Hydrogen",
+   "propellant": "NobleGases",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.9,
+      "metals": 0.1
    },
-   "iconResource": "shipbuildericons/ICO_PonderomotiveVASIMR"
+   "iconResource": "shipbuildericons/ICO_HeliconDrive"
 },
  {
-   "dataName": "PonderomotiveVASIMRx3",
-   "friendlyName": "Ponderomotive VASIMR x3",
+   "dataName": "HeliconDrivex3",
+   "friendlyName": "Helicon Drive x3",
    "thrusters": 3,
+   "notes": "Magnetoplasmadynamic 3",
    "driveClassification": "Electromagnetic",
-   "thrust_N": 6750,
-   "EV_kps": 147,
+   "requiredProjectName": "Project_HeliconDrive",
+   "thrust_N": 60000,
+   "EV_kps": 314,
    "specificPower_kgMW": 0,
-   "efficiency": 0.72,
+   "efficiency": 0.79,
+   "thrustRating_GW": "9.420",
+   "req power": "11.924",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Any_General",
-   "thrustCap": 40,
+   "thrustCap": 20,
    "cooling": "Calc",
-   "requiredProjectName": "Project_PonderomotiveVASIMR",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Hydrogen",
+   "propellant": "NobleGases",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.9,
+      "metals": 0.1
    },
-   "iconResource": "shipbuildericons/ICO_PonderomotiveVASIMR"
+   "iconResource": "shipbuildericons/ICO_HeliconDrive"
 },
  {
-   "dataName": "PonderomotiveVASIMRx4",
-   "friendlyName": "Ponderomotive VASIMR x4",
+   "dataName": "HeliconDrivex4",
+   "friendlyName": "Helicon Drive x4",
    "thrusters": 4,
+   "notes": "Magnetoplasmadynamic 3",
    "driveClassification": "Electromagnetic",
-   "thrust_N": 9000,
-   "EV_kps": 147,
+   "requiredProjectName": "Project_HeliconDrive",
+   "thrust_N": 80000,
+   "EV_kps": 314,
    "specificPower_kgMW": 0,
-   "efficiency": 0.72,
+   "efficiency": 0.79,
+   "thrustRating_GW": "12.560",
+   "req power": "15.899",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Any_General",
-   "thrustCap": 40,
+   "thrustCap": 20,
    "cooling": "Calc",
-   "requiredProjectName": "Project_PonderomotiveVASIMR",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Hydrogen",
+   "propellant": "NobleGases",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.9,
+      "metals": 0.1
    },
-   "iconResource": "shipbuildericons/ICO_PonderomotiveVASIMR"
+   "iconResource": "shipbuildericons/ICO_HeliconDrive"
 },
  {
-   "dataName": "PonderomotiveVASIMRx5",
-   "friendlyName": "Ponderomotive VASIMR x5",
+   "dataName": "HeliconDrivex5",
+   "friendlyName": "Helicon Drive x5",
    "thrusters": 5,
+   "notes": "Magnetoplasmadynamic 3",
    "driveClassification": "Electromagnetic",
-   "thrust_N": 11250,
-   "EV_kps": 147,
+   "requiredProjectName": "Project_HeliconDrive",
+   "thrust_N": 100000,
+   "EV_kps": 314,
    "specificPower_kgMW": 0,
-   "efficiency": 0.72,
+   "efficiency": 0.79,
+   "thrustRating_GW": "15.700",
+   "req power": "19.873",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Any_General",
-   "thrustCap": 40,
+   "thrustCap": 20,
    "cooling": "Calc",
-   "requiredProjectName": "Project_PonderomotiveVASIMR",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Hydrogen",
+   "propellant": "NobleGases",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.9,
+      "metals": 0.1
    },
-   "iconResource": "shipbuildericons/ICO_PonderomotiveVASIMR"
+   "iconResource": "shipbuildericons/ICO_HeliconDrive"
 },
  {
-   "dataName": "PonderomotiveVASIMRx6",
-   "friendlyName": "Ponderomotive VASIMR x6",
+   "dataName": "HeliconDrivex6",
+   "friendlyName": "Helicon Drive x6",
    "thrusters": 6,
+   "notes": "Magnetoplasmadynamic 3",
    "driveClassification": "Electromagnetic",
-   "thrust_N": 13500,
-   "EV_kps": 147,
+   "requiredProjectName": "Project_HeliconDrive",
+   "thrust_N": 120000,
+   "EV_kps": 314,
    "specificPower_kgMW": 0,
-   "efficiency": 0.72,
+   "efficiency": 0.79,
+   "thrustRating_GW": "18.840",
+   "req power": "23.848",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Any_General",
-   "thrustCap": 40,
+   "thrustCap": 20,
    "cooling": "Calc",
-   "requiredProjectName": "Project_PonderomotiveVASIMR",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Hydrogen",
+   "propellant": "NobleGases",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.9,
+      "metals": 0.1
    },
-   "iconResource": "shipbuildericons/ICO_PonderomotiveVASIMR"
+   "iconResource": "shipbuildericons/ICO_HeliconDrive"
 },
  {
-   "dataName": "PulsedPlasmoidDrivex1",
-   "friendlyName": "Pulsed Plasmoid Drive x1",
+   "dataName": "MassDriverx1",
+   "friendlyName": "Mass Driver x1",
    "thrusters": 1,
    "driveClassification": "Electromagnetic",
-   "thrust_N": 1100,
-   "EV_kps": 425,
-   "specificPower_kgMW": 0,
-   "efficiency": 0.72,
+   "requiredProjectName": "Project_MassDriver",
+   "thrust_N": 10400,
+   "EV_kps": 9.81,
+   "specificPower_kgMW": 50,
+   "efficiency": 0.65,
+   "thrustRating_GW": "0.051",
+   "req power": "0.078",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Any_General",
-   "thrustCap": 20,
+   "thrustCap": 10,
    "cooling": "Calc",
-   "requiredProjectName": "Project_PulsedPlasmoidDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -2726,23 +2978,25 @@
    "perTankPropellantMaterials": {
       "metals": 1
    },
-   "moduleGranted": "ISRUModule",
-   "iconResource": "shipbuildericons/ICO_PulsedPlasmoidDrive"
+   "freeISRU": true,
+   "iconResource": "shipbuildericons/ICO_MassDriver"
 },
  {
-   "dataName": "PulsedPlasmoidDrivex2",
-   "friendlyName": "Pulsed Plasmoid Drive x2",
+   "dataName": "MassDriverx2",
+   "friendlyName": "Mass Driver x2",
    "thrusters": 2,
    "driveClassification": "Electromagnetic",
-   "thrust_N": 2200,
-   "EV_kps": 425,
-   "specificPower_kgMW": 0,
-   "efficiency": 0.72,
+   "requiredProjectName": "Project_MassDriver",
+   "thrust_N": 20800,
+   "EV_kps": 9.81,
+   "specificPower_kgMW": 50,
+   "efficiency": 0.65,
+   "thrustRating_GW": "0.102",
+   "req power": "0.157",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Any_General",
-   "thrustCap": 20,
+   "thrustCap": 10,
    "cooling": "Calc",
-   "requiredProjectName": "Project_PulsedPlasmoidDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -2750,23 +3004,25 @@
    "perTankPropellantMaterials": {
       "metals": 1
    },
-   "moduleGranted": "ISRUModule",
-   "iconResource": "shipbuildericons/ICO_PulsedPlasmoidDrive"
+   "freeISRU": true,
+   "iconResource": "shipbuildericons/ICO_MassDriver"
 },
  {
-   "dataName": "PulsedPlasmoidDrivex3",
-   "friendlyName": "Pulsed Plasmoid Drive x3",
+   "dataName": "MassDriverx3",
+   "friendlyName": "Mass Driver x3",
    "thrusters": 3,
    "driveClassification": "Electromagnetic",
-   "thrust_N": 3300,
-   "EV_kps": 425,
-   "specificPower_kgMW": 0,
-   "efficiency": 0.72,
+   "requiredProjectName": "Project_MassDriver",
+   "thrust_N": 31200,
+   "EV_kps": 9.81,
+   "specificPower_kgMW": 50,
+   "efficiency": 0.65,
+   "thrustRating_GW": "0.153",
+   "req power": "0.235",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Any_General",
-   "thrustCap": 20,
+   "thrustCap": 10,
    "cooling": "Calc",
-   "requiredProjectName": "Project_PulsedPlasmoidDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -2774,23 +3030,25 @@
    "perTankPropellantMaterials": {
       "metals": 1
    },
-   "moduleGranted": "ISRUModule",
-   "iconResource": "shipbuildericons/ICO_PulsedPlasmoidDrive"
+   "freeISRU": true,
+   "iconResource": "shipbuildericons/ICO_MassDriver"
 },
  {
-   "dataName": "PulsedPlasmoidDrivex4",
-   "friendlyName": "Pulsed Plasmoid Drive x4",
+   "dataName": "MassDriverx4",
+   "friendlyName": "Mass Driver x4",
    "thrusters": 4,
    "driveClassification": "Electromagnetic",
-   "thrust_N": 4400,
-   "EV_kps": 425,
-   "specificPower_kgMW": 0,
-   "efficiency": 0.72,
+   "requiredProjectName": "Project_MassDriver",
+   "thrust_N": 41600,
+   "EV_kps": 9.81,
+   "specificPower_kgMW": 50,
+   "efficiency": 0.65,
+   "thrustRating_GW": "0.204",
+   "req power": "0.314",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Any_General",
-   "thrustCap": 20,
+   "thrustCap": 10,
    "cooling": "Calc",
-   "requiredProjectName": "Project_PulsedPlasmoidDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -2798,23 +3056,25 @@
    "perTankPropellantMaterials": {
       "metals": 1
    },
-   "moduleGranted": "ISRUModule",
-   "iconResource": "shipbuildericons/ICO_PulsedPlasmoidDrive"
+   "freeISRU": true,
+   "iconResource": "shipbuildericons/ICO_MassDriver"
 },
  {
-   "dataName": "PulsedPlasmoidDrivex5",
-   "friendlyName": "Pulsed Plasmoid Drive x5",
+   "dataName": "MassDriverx5",
+   "friendlyName": "Mass Driver x5",
    "thrusters": 5,
    "driveClassification": "Electromagnetic",
-   "thrust_N": 5500,
-   "EV_kps": 425,
-   "specificPower_kgMW": 0,
-   "efficiency": 0.72,
+   "requiredProjectName": "Project_MassDriver",
+   "thrust_N": 52000,
+   "EV_kps": 9.81,
+   "specificPower_kgMW": 50,
+   "efficiency": 0.65,
+   "thrustRating_GW": "0.255",
+   "req power": "0.392",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Any_General",
-   "thrustCap": 20,
+   "thrustCap": 10,
    "cooling": "Calc",
-   "requiredProjectName": "Project_PulsedPlasmoidDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -2822,23 +3082,25 @@
    "perTankPropellantMaterials": {
       "metals": 1
    },
-   "moduleGranted": "ISRUModule",
-   "iconResource": "shipbuildericons/ICO_PulsedPlasmoidDrive"
+   "freeISRU": true,
+   "iconResource": "shipbuildericons/ICO_MassDriver"
 },
  {
-   "dataName": "PulsedPlasmoidDrivex6",
-   "friendlyName": "Pulsed Plasmoid Drive x6",
+   "dataName": "MassDriverx6",
+   "friendlyName": "Mass Driver x6",
    "thrusters": 6,
    "driveClassification": "Electromagnetic",
-   "thrust_N": 6600,
-   "EV_kps": 425,
-   "specificPower_kgMW": 0,
-   "efficiency": 0.72,
+   "requiredProjectName": "Project_MassDriver",
+   "thrust_N": 62400,
+   "EV_kps": 9.81,
+   "specificPower_kgMW": 50,
+   "efficiency": 0.65,
+   "thrustRating_GW": "0.306",
+   "req power": "0.471",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Any_General",
-   "thrustCap": 20,
+   "thrustCap": 10,
    "cooling": "Calc",
-   "requiredProjectName": "Project_PulsedPlasmoidDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -2846,24 +3108,25 @@
    "perTankPropellantMaterials": {
       "metals": 1
    },
-   "moduleGranted": "ISRUModule",
-   "iconResource": "shipbuildericons/ICO_PulsedPlasmoidDrive"
+   "freeISRU": true,
+   "iconResource": "shipbuildericons/ICO_MassDriver"
 },
  {
-   "dataName": "E-BeamDrivex1",
-   "friendlyName": "E-Beam Drive x1",
+   "dataName": "SuperconductingMassDriverx1",
+   "friendlyName": "Superconducting Mass Driver x1",
    "thrusters": 1,
-   "notes": "Wakefield E-Beamer",
-   "driveClassification": "Electrothermal",
-   "thrust_N": 4600,
-   "EV_kps": 19.62,
-   "specificPower_kgMW": 0,
-   "efficiency": 0.76,
+   "driveClassification": "Electromagnetic",
+   "requiredProjectName": "Project_SuperconductingMassDriver",
+   "thrust_N": 20000,
+   "EV_kps": 30,
+   "specificPower_kgMW": 10,
+   "efficiency": 0.85,
+   "thrustRating_GW": "0.300",
+   "req power": "0.353",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Any_General",
-   "thrustCap": 40,
+   "thrustCap": 20,
    "cooling": "Calc",
-   "requiredProjectName": "Project_E-BeamDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -2871,24 +3134,25 @@
    "perTankPropellantMaterials": {
       "metals": 1
    },
-   "moduleGranted": "ISRUModule",
-   "iconResource": "shipbuildericons/ICO_E-BeamDrive"
+   "freeISRU": true,
+   "iconResource": "shipbuildericons/ICO_SuperconductingMassDriver"
 },
  {
-   "dataName": "E-BeamDrivex2",
-   "friendlyName": "E-Beam Drive x2",
+   "dataName": "SuperconductingMassDriverx2",
+   "friendlyName": "Superconducting Mass Driver x2",
    "thrusters": 2,
-   "notes": "Wakefield E-Beamer",
-   "driveClassification": "Electrothermal",
-   "thrust_N": 9200,
-   "EV_kps": 19.62,
-   "specificPower_kgMW": 0,
-   "efficiency": 0.76,
+   "driveClassification": "Electromagnetic",
+   "requiredProjectName": "Project_SuperconductingMassDriver",
+   "thrust_N": 40000,
+   "EV_kps": 30,
+   "specificPower_kgMW": 10,
+   "efficiency": 0.85,
+   "thrustRating_GW": "0.600",
+   "req power": "0.706",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Any_General",
-   "thrustCap": 40,
+   "thrustCap": 20,
    "cooling": "Calc",
-   "requiredProjectName": "Project_E-BeamDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -2896,24 +3160,25 @@
    "perTankPropellantMaterials": {
       "metals": 1
    },
-   "moduleGranted": "ISRUModule",
-   "iconResource": "shipbuildericons/ICO_E-BeamDrive"
+   "freeISRU": true,
+   "iconResource": "shipbuildericons/ICO_SuperconductingMassDriver"
 },
  {
-   "dataName": "E-BeamDrivex3",
-   "friendlyName": "E-Beam Drive x3",
+   "dataName": "SuperconductingMassDriverx3",
+   "friendlyName": "Superconducting Mass Driver x3",
    "thrusters": 3,
-   "notes": "Wakefield E-Beamer",
-   "driveClassification": "Electrothermal",
-   "thrust_N": 13800,
-   "EV_kps": 19.62,
-   "specificPower_kgMW": 0,
-   "efficiency": 0.76,
+   "driveClassification": "Electromagnetic",
+   "requiredProjectName": "Project_SuperconductingMassDriver",
+   "thrust_N": 60000,
+   "EV_kps": 30,
+   "specificPower_kgMW": 10,
+   "efficiency": 0.85,
+   "thrustRating_GW": "0.900",
+   "req power": "1.059",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Any_General",
-   "thrustCap": 40,
+   "thrustCap": 20,
    "cooling": "Calc",
-   "requiredProjectName": "Project_E-BeamDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -2921,24 +3186,25 @@
    "perTankPropellantMaterials": {
       "metals": 1
    },
-   "moduleGranted": "ISRUModule",
-   "iconResource": "shipbuildericons/ICO_E-BeamDrive"
+   "freeISRU": true,
+   "iconResource": "shipbuildericons/ICO_SuperconductingMassDriver"
 },
  {
-   "dataName": "E-BeamDrivex4",
-   "friendlyName": "E-Beam Drive x4",
+   "dataName": "SuperconductingMassDriverx4",
+   "friendlyName": "Superconducting Mass Driver x4",
    "thrusters": 4,
-   "notes": "Wakefield E-Beamer",
-   "driveClassification": "Electrothermal",
-   "thrust_N": 18400,
-   "EV_kps": 19.62,
-   "specificPower_kgMW": 0,
-   "efficiency": 0.76,
+   "driveClassification": "Electromagnetic",
+   "requiredProjectName": "Project_SuperconductingMassDriver",
+   "thrust_N": 80000,
+   "EV_kps": 30,
+   "specificPower_kgMW": 10,
+   "efficiency": 0.85,
+   "thrustRating_GW": "1.200",
+   "req power": "1.412",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Any_General",
-   "thrustCap": 40,
+   "thrustCap": 20,
    "cooling": "Calc",
-   "requiredProjectName": "Project_E-BeamDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -2946,24 +3212,25 @@
    "perTankPropellantMaterials": {
       "metals": 1
    },
-   "moduleGranted": "ISRUModule",
-   "iconResource": "shipbuildericons/ICO_E-BeamDrive"
+   "freeISRU": true,
+   "iconResource": "shipbuildericons/ICO_SuperconductingMassDriver"
 },
  {
-   "dataName": "E-BeamDrivex5",
-   "friendlyName": "E-Beam Drive x5",
+   "dataName": "SuperconductingMassDriverx5",
+   "friendlyName": "Superconducting Mass Driver x5",
    "thrusters": 5,
-   "notes": "Wakefield E-Beamer",
-   "driveClassification": "Electrothermal",
-   "thrust_N": 23000,
-   "EV_kps": 19.62,
-   "specificPower_kgMW": 0,
-   "efficiency": 0.76,
+   "driveClassification": "Electromagnetic",
+   "requiredProjectName": "Project_SuperconductingMassDriver",
+   "thrust_N": 100000,
+   "EV_kps": 30,
+   "specificPower_kgMW": 10,
+   "efficiency": 0.85,
+   "thrustRating_GW": "1.500",
+   "req power": "1.765",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Any_General",
-   "thrustCap": 40,
+   "thrustCap": 20,
    "cooling": "Calc",
-   "requiredProjectName": "Project_E-BeamDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -2971,24 +3238,25 @@
    "perTankPropellantMaterials": {
       "metals": 1
    },
-   "moduleGranted": "ISRUModule",
-   "iconResource": "shipbuildericons/ICO_E-BeamDrive"
+   "freeISRU": true,
+   "iconResource": "shipbuildericons/ICO_SuperconductingMassDriver"
 },
  {
-   "dataName": "E-BeamDrivex6",
-   "friendlyName": "E-Beam Drive x6",
+   "dataName": "SuperconductingMassDriverx6",
+   "friendlyName": "Superconducting Mass Driver x6",
    "thrusters": 6,
-   "notes": "Wakefield E-Beamer",
-   "driveClassification": "Electrothermal",
-   "thrust_N": 27600,
-   "EV_kps": 19.62,
-   "specificPower_kgMW": 0,
-   "efficiency": 0.76,
+   "driveClassification": "Electromagnetic",
+   "requiredProjectName": "Project_SuperconductingMassDriver",
+   "thrust_N": 120000,
+   "EV_kps": 30,
+   "specificPower_kgMW": 10,
+   "efficiency": 0.85,
+   "thrustRating_GW": "1.800",
+   "req power": "2.118",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Any_General",
-   "thrustCap": 40,
+   "thrustCap": 20,
    "cooling": "Calc",
-   "requiredProjectName": "Project_E-BeamDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -2996,456 +3264,481 @@
    "perTankPropellantMaterials": {
       "metals": 1
    },
-   "moduleGranted": "ISRUModule",
-   "iconResource": "shipbuildericons/ICO_E-BeamDrive"
+   "freeISRU": true,
+   "iconResource": "shipbuildericons/ICO_SuperconductingMassDriver"
 },
  {
-   "dataName": "AmplitronDrivex1",
-   "friendlyName": "Amplitron Drive x1",
+   "dataName": "KiwiDrivex1",
+   "friendlyName": "Kiwi Drive x1",
    "thrusters": 1,
-   "notes": "Microwave Steamer Amplitrons",
-   "driveClassification": "Electrothermal",
-   "thrust_N": 12000,
-   "EV_kps": 9.81,
+   "notes": "Criticality Limited Solid Core",
+   "driveClassification": "Fission_Thermal",
+   "requiredProjectName": "Project_KiwiDrive",
+   "thrust_N": 33000,
+   "EV_kps": 8.77,
    "specificPower_kgMW": 0,
-   "efficiency": 0.81,
+   "efficiency": 0.7,
+   "thrustRating_GW": "0.145",
+   "req power": "0.207",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Any_General",
-   "thrustCap": 20,
+   "requiredPowerPlant": "Solid_Core_Fission",
+   "thrustCap": 10,
    "cooling": "Calc",
-   "requiredProjectName": "Project_AmplitronDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Water",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_AmplitronDrive"
+   "iconResource": "shipbuildericons/ICO_KiwiDrive"
 },
  {
-   "dataName": "AmplitronDrivex2",
-   "friendlyName": "Amplitron Drive x2",
+   "dataName": "KiwiDrivex2",
+   "friendlyName": "Kiwi Drive x2",
    "thrusters": 2,
-   "notes": "Microwave Steamer Amplitrons",
-   "driveClassification": "Electrothermal",
-   "thrust_N": 24000,
-   "EV_kps": 9.81,
+   "notes": "Criticality Limited Solid Core",
+   "driveClassification": "Fission_Thermal",
+   "requiredProjectName": "Project_KiwiDrive",
+   "thrust_N": 66000,
+   "EV_kps": 8.77,
    "specificPower_kgMW": 0,
-   "efficiency": 0.81,
+   "efficiency": 0.7,
+   "thrustRating_GW": "0.289",
+   "req power": "0.413",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Any_General",
-   "thrustCap": 20,
+   "requiredPowerPlant": "Solid_Core_Fission",
+   "thrustCap": 10,
    "cooling": "Calc",
-   "requiredProjectName": "Project_AmplitronDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Water",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_AmplitronDrive"
+   "iconResource": "shipbuildericons/ICO_KiwiDrive"
 },
  {
-   "dataName": "AmplitronDrivex3",
-   "friendlyName": "Amplitron Drive x3",
+   "dataName": "KiwiDrivex3",
+   "friendlyName": "Kiwi Drive x3",
    "thrusters": 3,
-   "notes": "Microwave Steamer Amplitrons",
-   "driveClassification": "Electrothermal",
-   "thrust_N": 36000,
-   "EV_kps": 9.81,
+   "notes": "Criticality Limited Solid Core",
+   "driveClassification": "Fission_Thermal",
+   "requiredProjectName": "Project_KiwiDrive",
+   "thrust_N": 99000,
+   "EV_kps": 8.77,
    "specificPower_kgMW": 0,
-   "efficiency": 0.81,
+   "efficiency": 0.7,
+   "thrustRating_GW": "0.434",
+   "req power": "0.620",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Any_General",
-   "thrustCap": 20,
+   "requiredPowerPlant": "Solid_Core_Fission",
+   "thrustCap": 10,
    "cooling": "Calc",
-   "requiredProjectName": "Project_AmplitronDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Water",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_AmplitronDrive"
+   "iconResource": "shipbuildericons/ICO_KiwiDrive"
 },
  {
-   "dataName": "AmplitronDrivex4",
-   "friendlyName": "Amplitron Drive x4",
+   "dataName": "KiwiDrivex4",
+   "friendlyName": "Kiwi Drive x4",
    "thrusters": 4,
-   "notes": "Microwave Steamer Amplitrons",
-   "driveClassification": "Electrothermal",
-   "thrust_N": 48000,
-   "EV_kps": 9.81,
+   "notes": "Criticality Limited Solid Core",
+   "driveClassification": "Fission_Thermal",
+   "requiredProjectName": "Project_KiwiDrive",
+   "thrust_N": 132000,
+   "EV_kps": 8.77,
    "specificPower_kgMW": 0,
-   "efficiency": 0.81,
+   "efficiency": 0.7,
+   "thrustRating_GW": "0.579",
+   "req power": "0.827",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Any_General",
-   "thrustCap": 20,
+   "requiredPowerPlant": "Solid_Core_Fission",
+   "thrustCap": 10,
    "cooling": "Calc",
-   "requiredProjectName": "Project_AmplitronDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Water",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_AmplitronDrive"
+   "iconResource": "shipbuildericons/ICO_KiwiDrive"
 },
  {
-   "dataName": "AmplitronDrivex5",
-   "friendlyName": "Amplitron Drive x5",
+   "dataName": "KiwiDrivex5",
+   "friendlyName": "Kiwi Drive x5",
    "thrusters": 5,
-   "notes": "Microwave Steamer Amplitrons",
-   "driveClassification": "Electrothermal",
-   "thrust_N": 60000,
-   "EV_kps": 9.81,
+   "notes": "Criticality Limited Solid Core",
+   "driveClassification": "Fission_Thermal",
+   "requiredProjectName": "Project_KiwiDrive",
+   "thrust_N": 165000,
+   "EV_kps": 8.77,
    "specificPower_kgMW": 0,
-   "efficiency": 0.81,
+   "efficiency": 0.7,
+   "thrustRating_GW": "0.724",
+   "req power": "1.034",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Any_General",
-   "thrustCap": 20,
+   "requiredPowerPlant": "Solid_Core_Fission",
+   "thrustCap": 10,
    "cooling": "Calc",
-   "requiredProjectName": "Project_AmplitronDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Water",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_AmplitronDrive"
+   "iconResource": "shipbuildericons/ICO_KiwiDrive"
 },
  {
-   "dataName": "AmplitronDrivex6",
-   "friendlyName": "Amplitron Drive x6",
+   "dataName": "KiwiDrivex6",
+   "friendlyName": "Kiwi Drive x6",
    "thrusters": 6,
-   "notes": "Microwave Steamer Amplitrons",
-   "driveClassification": "Electrothermal",
-   "thrust_N": 72000,
-   "EV_kps": 9.81,
+   "notes": "Criticality Limited Solid Core",
+   "driveClassification": "Fission_Thermal",
+   "requiredProjectName": "Project_KiwiDrive",
+   "thrust_N": 198000,
+   "EV_kps": 8.77,
    "specificPower_kgMW": 0,
-   "efficiency": 0.81,
+   "efficiency": 0.7,
+   "thrustRating_GW": "0.868",
+   "req power": "1.240",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Any_General",
-   "thrustCap": 20,
+   "requiredPowerPlant": "Solid_Core_Fission",
+   "thrustCap": 10,
    "cooling": "Calc",
-   "requiredProjectName": "Project_AmplitronDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Water",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_AmplitronDrive"
+   "iconResource": "shipbuildericons/ICO_KiwiDrive"
 },
  {
-   "dataName": "MassDriverx1",
-   "friendlyName": "Mass Driver x1",
+   "dataName": "NervaDrivex1",
+   "friendlyName": "Nerva Drive x1",
    "thrusters": 1,
-   "driveClassification": "Electromagnetic",
-   "thrust_N": 10400,
-   "EV_kps": 9.81,
-   "specificPower_kgMW": 500,
-   "efficiency": 0.57,
+   "driveClassification": "Fission_Thermal",
+   "requiredProjectName": "Project_NervaDrive",
+   "thrust_N": 49000,
+   "EV_kps": 8.09,
+   "specificPower_kgMW": 0,
+   "efficiency": 0.7,
+   "thrustRating_GW": "0.198",
+   "req power": "0.283",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Any_General",
-   "thrustCap": 10,
+   "requiredPowerPlant": "Solid_Core_Fission",
+   "thrustCap": 9,
    "cooling": "Calc",
-   "requiredProjectName": "Project_MassDriver",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Anything",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "metals": 1
+      "water": 1
    },
-   "moduleGranted": "ISRUModule",
-   "iconResource": "shipbuildericons/ICO_MassDriver"
+   "iconResource": "shipbuildericons/ICO_NervaDrive"
 },
  {
-   "dataName": "MassDriverx2",
-   "friendlyName": "Mass Driver x2",
+   "dataName": "NervaDrivex2",
+   "friendlyName": "Nerva Drive x2",
    "thrusters": 2,
-   "driveClassification": "Electromagnetic",
-   "thrust_N": 20800,
-   "EV_kps": 9.81,
-   "specificPower_kgMW": 500,
-   "efficiency": 0.57,
+   "driveClassification": "Fission_Thermal",
+   "requiredProjectName": "Project_NervaDrive",
+   "thrust_N": 98000,
+   "EV_kps": 8.09,
+   "specificPower_kgMW": 0,
+   "efficiency": 0.7,
+   "thrustRating_GW": "0.397",
+   "req power": "0.567",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Any_General",
-   "thrustCap": 10,
+   "requiredPowerPlant": "Solid_Core_Fission",
+   "thrustCap": 9,
    "cooling": "Calc",
-   "requiredProjectName": "Project_MassDriver",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Anything",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "metals": 1
+      "water": 1
    },
-   "moduleGranted": "ISRUModule",
-   "iconResource": "shipbuildericons/ICO_MassDriver"
+   "iconResource": "shipbuildericons/ICO_NervaDrive"
 },
  {
-   "dataName": "MassDriverx3",
-   "friendlyName": "Mass Driver x3",
+   "dataName": "NervaDrivex3",
+   "friendlyName": "Nerva Drive x3",
    "thrusters": 3,
-   "driveClassification": "Electromagnetic",
-   "thrust_N": 31200,
-   "EV_kps": 9.81,
-   "specificPower_kgMW": 500,
-   "efficiency": 0.57,
+   "driveClassification": "Fission_Thermal",
+   "requiredProjectName": "Project_NervaDrive",
+   "thrust_N": 147000,
+   "EV_kps": 8.09,
+   "specificPower_kgMW": 0,
+   "efficiency": 0.7,
+   "thrustRating_GW": "0.595",
+   "req power": "0.850",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Any_General",
-   "thrustCap": 10,
+   "requiredPowerPlant": "Solid_Core_Fission",
+   "thrustCap": 9,
    "cooling": "Calc",
-   "requiredProjectName": "Project_MassDriver",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Anything",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "metals": 1
+      "water": 1
    },
-   "moduleGranted": "ISRUModule",
-   "iconResource": "shipbuildericons/ICO_MassDriver"
+   "iconResource": "shipbuildericons/ICO_NervaDrive"
 },
  {
-   "dataName": "MassDriverx4",
-   "friendlyName": "Mass Driver x4",
+   "dataName": "NervaDrivex4",
+   "friendlyName": "Nerva Drive x4",
    "thrusters": 4,
-   "driveClassification": "Electromagnetic",
-   "thrust_N": 41600,
-   "EV_kps": 9.81,
-   "specificPower_kgMW": 500,
-   "efficiency": 0.57,
+   "driveClassification": "Fission_Thermal",
+   "requiredProjectName": "Project_NervaDrive",
+   "thrust_N": 196000,
+   "EV_kps": 8.09,
+   "specificPower_kgMW": 0,
+   "efficiency": 0.7,
+   "thrustRating_GW": "0.793",
+   "req power": "1.133",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Any_General",
-   "thrustCap": 10,
+   "requiredPowerPlant": "Solid_Core_Fission",
+   "thrustCap": 9,
    "cooling": "Calc",
-   "requiredProjectName": "Project_MassDriver",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Anything",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "metals": 1
+      "water": 1
    },
-   "moduleGranted": "ISRUModule",
-   "iconResource": "shipbuildericons/ICO_MassDriver"
+   "iconResource": "shipbuildericons/ICO_NervaDrive"
 },
  {
-   "dataName": "MassDriverx5",
-   "friendlyName": "Mass Driver x5",
+   "dataName": "NervaDrivex5",
+   "friendlyName": "Nerva Drive x5",
    "thrusters": 5,
-   "driveClassification": "Electromagnetic",
-   "thrust_N": 52000,
-   "EV_kps": 9.81,
-   "specificPower_kgMW": 500,
-   "efficiency": 0.57,
+   "driveClassification": "Fission_Thermal",
+   "requiredProjectName": "Project_NervaDrive",
+   "thrust_N": 245000,
+   "EV_kps": 8.09,
+   "specificPower_kgMW": 0,
+   "efficiency": 0.7,
+   "thrustRating_GW": "0.991",
+   "req power": "1.416",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Any_General",
-   "thrustCap": 10,
+   "requiredPowerPlant": "Solid_Core_Fission",
+   "thrustCap": 9,
    "cooling": "Calc",
-   "requiredProjectName": "Project_MassDriver",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Anything",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "metals": 1
+      "water": 1
    },
-   "moduleGranted": "ISRUModule",
-   "iconResource": "shipbuildericons/ICO_MassDriver"
+   "iconResource": "shipbuildericons/ICO_NervaDrive"
 },
  {
-   "dataName": "MassDriverx6",
-   "friendlyName": "Mass Driver x6",
+   "dataName": "NervaDrivex6",
+   "friendlyName": "Nerva Drive x6",
    "thrusters": 6,
-   "driveClassification": "Electromagnetic",
-   "thrust_N": 62400,
-   "EV_kps": 9.81,
-   "specificPower_kgMW": 500,
-   "efficiency": 0.57,
+   "driveClassification": "Fission_Thermal",
+   "requiredProjectName": "Project_NervaDrive",
+   "thrust_N": 294000,
+   "EV_kps": 8.09,
+   "specificPower_kgMW": 0,
+   "efficiency": 0.7,
+   "thrustRating_GW": "1.190",
+   "req power": "1.700",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Any_General",
-   "thrustCap": 10,
+   "requiredPowerPlant": "Solid_Core_Fission",
+   "thrustCap": 9,
    "cooling": "Calc",
-   "requiredProjectName": "Project_MassDriver",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Anything",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "metals": 1
+      "water": 1
    },
-   "moduleGranted": "ISRUModule",
-   "iconResource": "shipbuildericons/ICO_MassDriver"
+   "iconResource": "shipbuildericons/ICO_NervaDrive"
 },
  {
-   "dataName": "SuperconductingMassDriverx1",
-   "friendlyName": "Superconducting Mass Driver x1",
+   "dataName": "SnareDrivex1",
+   "friendlyName": "Snare Drive x1",
    "thrusters": 1,
-   "driveClassification": "Electromagnetic",
-   "thrust_N": 20000,
-   "EV_kps": 30,
-   "specificPower_kgMW": 100,
-   "efficiency": 0.85,
+   "driveClassification": "Fission_Thermal",
+   "requiredProjectName": "Project_SnareDrive",
+   "thrust_N": 73000,
+   "EV_kps": 8.83,
+   "specificPower_kgMW": 0,
+   "efficiency": 0.7,
+   "thrustRating_GW": "0.322",
+   "req power": "0.460",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Any_General",
+   "requiredPowerPlant": "Solid_Core_Fission",
    "thrustCap": 10,
    "cooling": "Calc",
-   "requiredProjectName": "Project_SuperconductingMassDriver",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Anything",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "metals": 1
+      "water": 1
    },
-   "moduleGranted": "ISRUModule",
-   "iconResource": "shipbuildericons/ICO_SuperconductingMassDriver"
+   "iconResource": "shipbuildericons/ICO_SnareDrive"
 },
  {
-   "dataName": "SuperconductingMassDriverx2",
-   "friendlyName": "Superconducting Mass Driver x2",
+   "dataName": "SnareDrivex2",
+   "friendlyName": "Snare Drive x2",
    "thrusters": 2,
-   "driveClassification": "Electromagnetic",
-   "thrust_N": 40000,
-   "EV_kps": 30,
-   "specificPower_kgMW": 100,
-   "efficiency": 0.85,
+   "driveClassification": "Fission_Thermal",
+   "requiredProjectName": "Project_SnareDrive",
+   "thrust_N": 146000,
+   "EV_kps": 8.83,
+   "specificPower_kgMW": 0,
+   "efficiency": 0.7,
+   "thrustRating_GW": "0.645",
+   "req power": "0.921",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Any_General",
+   "requiredPowerPlant": "Solid_Core_Fission",
    "thrustCap": 10,
    "cooling": "Calc",
-   "requiredProjectName": "Project_SuperconductingMassDriver",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Anything",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "metals": 1
+      "water": 1
    },
-   "moduleGranted": "ISRUModule",
-   "iconResource": "shipbuildericons/ICO_SuperconductingMassDriver"
+   "iconResource": "shipbuildericons/ICO_SnareDrive"
 },
  {
-   "dataName": "SuperconductingMassDriverx3",
-   "friendlyName": "Superconducting Mass Driver x3",
+   "dataName": "SnareDrivex3",
+   "friendlyName": "Snare Drive x3",
    "thrusters": 3,
-   "driveClassification": "Electromagnetic",
-   "thrust_N": 60000,
-   "EV_kps": 30,
-   "specificPower_kgMW": 100,
-   "efficiency": 0.85,
+   "driveClassification": "Fission_Thermal",
+   "requiredProjectName": "Project_SnareDrive",
+   "thrust_N": 219000,
+   "EV_kps": 8.83,
+   "specificPower_kgMW": 0,
+   "efficiency": 0.7,
+   "thrustRating_GW": "0.967",
+   "req power": "1.381",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Any_General",
+   "requiredPowerPlant": "Solid_Core_Fission",
    "thrustCap": 10,
    "cooling": "Calc",
-   "requiredProjectName": "Project_SuperconductingMassDriver",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Anything",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "metals": 1
+      "water": 1
    },
-   "moduleGranted": "ISRUModule",
-   "iconResource": "shipbuildericons/ICO_SuperconductingMassDriver"
+   "iconResource": "shipbuildericons/ICO_SnareDrive"
 },
  {
-   "dataName": "SuperconductingMassDriverx4",
-   "friendlyName": "Superconducting Mass Driver x4",
+   "dataName": "SnareDrivex4",
+   "friendlyName": "Snare Drive x4",
    "thrusters": 4,
-   "driveClassification": "Electromagnetic",
-   "thrust_N": 80000,
-   "EV_kps": 30,
-   "specificPower_kgMW": 100,
-   "efficiency": 0.85,
+   "driveClassification": "Fission_Thermal",
+   "requiredProjectName": "Project_SnareDrive",
+   "thrust_N": 292000,
+   "EV_kps": 8.83,
+   "specificPower_kgMW": 0,
+   "efficiency": 0.7,
+   "thrustRating_GW": "1.289",
+   "req power": "1.841",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Any_General",
+   "requiredPowerPlant": "Solid_Core_Fission",
    "thrustCap": 10,
    "cooling": "Calc",
-   "requiredProjectName": "Project_SuperconductingMassDriver",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Anything",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "metals": 1
+      "water": 1
    },
-   "moduleGranted": "ISRUModule",
-   "iconResource": "shipbuildericons/ICO_SuperconductingMassDriver"
+   "iconResource": "shipbuildericons/ICO_SnareDrive"
 },
  {
-   "dataName": "SuperconductingMassDriverx5",
-   "friendlyName": "Superconducting Mass Driver x5",
+   "dataName": "SnareDrivex5",
+   "friendlyName": "Snare Drive x5",
    "thrusters": 5,
-   "driveClassification": "Electromagnetic",
-   "thrust_N": 100000,
-   "EV_kps": 30,
-   "specificPower_kgMW": 100,
-   "efficiency": 0.85,
+   "driveClassification": "Fission_Thermal",
+   "requiredProjectName": "Project_SnareDrive",
+   "thrust_N": 365000,
+   "EV_kps": 8.83,
+   "specificPower_kgMW": 0,
+   "efficiency": 0.7,
+   "thrustRating_GW": "1.611",
+   "req power": "2.302",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Any_General",
+   "requiredPowerPlant": "Solid_Core_Fission",
    "thrustCap": 10,
    "cooling": "Calc",
-   "requiredProjectName": "Project_SuperconductingMassDriver",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Anything",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "metals": 1
+      "water": 1
    },
-   "moduleGranted": "ISRUModule",
-   "iconResource": "shipbuildericons/ICO_SuperconductingMassDriver"
+   "iconResource": "shipbuildericons/ICO_SnareDrive"
 },
  {
-   "dataName": "SuperconductingMassDriverx6",
-   "friendlyName": "Superconducting Mass Driver x6",
+   "dataName": "SnareDrivex6",
+   "friendlyName": "Snare Drive x6",
    "thrusters": 6,
-   "driveClassification": "Electromagnetic",
-   "thrust_N": 120000,
-   "EV_kps": 30,
-   "specificPower_kgMW": 100,
-   "efficiency": 0.85,
+   "driveClassification": "Fission_Thermal",
+   "requiredProjectName": "Project_SnareDrive",
+   "thrust_N": 438000,
+   "EV_kps": 8.83,
+   "specificPower_kgMW": 0,
+   "efficiency": 0.7,
+   "thrustRating_GW": "1.934",
+   "req power": "2.762",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Any_General",
+   "requiredPowerPlant": "Solid_Core_Fission",
    "thrustCap": 10,
    "cooling": "Calc",
-   "requiredProjectName": "Project_SuperconductingMassDriver",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Anything",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "metals": 1
+      "water": 1
    },
-   "moduleGranted": "ISRUModule",
-   "iconResource": "shipbuildericons/ICO_SuperconductingMassDriver"
+   "iconResource": "shipbuildericons/ICO_SnareDrive"
 },
  {
-   "dataName": "KiwiDrivex1",
-   "friendlyName": "Kiwi Drive x1",
+   "dataName": "RoverDrivex1",
+   "friendlyName": "Rover Drive x1",
    "thrusters": 1,
-   "notes": "Criticality Limited Solid Core",
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 33000,
-   "EV_kps": 8.77,
+   "requiredProjectName": "Project_RoverDrive",
+   "thrust_N": 245000,
+   "EV_kps": 8.18,
    "specificPower_kgMW": 0,
    "efficiency": 0.7,
+   "thrustRating_GW": "1.002",
+   "req power": "1.432",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Solid_Core_Fission",
-   "thrustCap": 20,
+   "thrustCap": 10,
    "cooling": "Calc",
-   "requiredProjectName": "Project_KiwiDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -3453,23 +3746,24 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_KiwiDrive"
+   "iconResource": "shipbuildericons/ICO_RoverDrive"
 },
  {
-   "dataName": "KiwiDrivex2",
-   "friendlyName": "Kiwi Drive x2",
+   "dataName": "RoverDrivex2",
+   "friendlyName": "Rover Drive x2",
    "thrusters": 2,
-   "notes": "Criticality Limited Solid Core",
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 66000,
-   "EV_kps": 8.77,
+   "requiredProjectName": "Project_RoverDrive",
+   "thrust_N": 490000,
+   "EV_kps": 8.18,
    "specificPower_kgMW": 0,
    "efficiency": 0.7,
+   "thrustRating_GW": "2.004",
+   "req power": "2.863",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Solid_Core_Fission",
-   "thrustCap": 20,
+   "thrustCap": 10,
    "cooling": "Calc",
-   "requiredProjectName": "Project_KiwiDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -3477,23 +3771,24 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_KiwiDrive"
+   "iconResource": "shipbuildericons/ICO_RoverDrive"
 },
  {
-   "dataName": "KiwiDrivex3",
-   "friendlyName": "Kiwi Drive x3",
+   "dataName": "RoverDrivex3",
+   "friendlyName": "Rover Drive x3",
    "thrusters": 3,
-   "notes": "Criticality Limited Solid Core",
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 99000,
-   "EV_kps": 8.77,
+   "requiredProjectName": "Project_RoverDrive",
+   "thrust_N": 735000,
+   "EV_kps": 8.18,
    "specificPower_kgMW": 0,
    "efficiency": 0.7,
+   "thrustRating_GW": "3.006",
+   "req power": "4.295",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Solid_Core_Fission",
-   "thrustCap": 20,
+   "thrustCap": 10,
    "cooling": "Calc",
-   "requiredProjectName": "Project_KiwiDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -3501,23 +3796,24 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_KiwiDrive"
+   "iconResource": "shipbuildericons/ICO_RoverDrive"
 },
  {
-   "dataName": "KiwiDrivex4",
-   "friendlyName": "Kiwi Drive x4",
+   "dataName": "RoverDrivex4",
+   "friendlyName": "Rover Drive x4",
    "thrusters": 4,
-   "notes": "Criticality Limited Solid Core",
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 132000,
-   "EV_kps": 8.77,
+   "requiredProjectName": "Project_RoverDrive",
+   "thrust_N": 980000,
+   "EV_kps": 8.18,
    "specificPower_kgMW": 0,
    "efficiency": 0.7,
+   "thrustRating_GW": "4.008",
+   "req power": "5.726",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Solid_Core_Fission",
-   "thrustCap": 20,
+   "thrustCap": 10,
    "cooling": "Calc",
-   "requiredProjectName": "Project_KiwiDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -3525,23 +3821,24 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_KiwiDrive"
+   "iconResource": "shipbuildericons/ICO_RoverDrive"
 },
  {
-   "dataName": "KiwiDrivex5",
-   "friendlyName": "Kiwi Drive x5",
+   "dataName": "RoverDrivex5",
+   "friendlyName": "Rover Drive x5",
    "thrusters": 5,
-   "notes": "Criticality Limited Solid Core",
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 165000,
-   "EV_kps": 8.77,
+   "requiredProjectName": "Project_RoverDrive",
+   "thrust_N": 1225000,
+   "EV_kps": 8.18,
    "specificPower_kgMW": 0,
    "efficiency": 0.7,
+   "thrustRating_GW": "5.010",
+   "req power": "7.158",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Solid_Core_Fission",
-   "thrustCap": 20,
+   "thrustCap": 10,
    "cooling": "Calc",
-   "requiredProjectName": "Project_KiwiDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -3549,23 +3846,24 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_KiwiDrive"
+   "iconResource": "shipbuildericons/ICO_RoverDrive"
 },
  {
-   "dataName": "KiwiDrivex6",
-   "friendlyName": "Kiwi Drive x6",
+   "dataName": "RoverDrivex6",
+   "friendlyName": "Rover Drive x6",
    "thrusters": 6,
-   "notes": "Criticality Limited Solid Core",
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 198000,
-   "EV_kps": 8.77,
+   "requiredProjectName": "Project_RoverDrive",
+   "thrust_N": 1470000,
+   "EV_kps": 8.18,
    "specificPower_kgMW": 0,
    "efficiency": 0.7,
+   "thrustRating_GW": "6.012",
+   "req power": "8.589",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Solid_Core_Fission",
-   "thrustCap": 20,
+   "thrustCap": 10,
    "cooling": "Calc",
-   "requiredProjectName": "Project_KiwiDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -3573,22 +3871,24 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_KiwiDrive"
+   "iconResource": "shipbuildericons/ICO_RoverDrive"
 },
  {
-   "dataName": "NervaDrivex1",
-   "friendlyName": "Nerva Drive x1",
+   "dataName": "CermetNervax1",
+   "friendlyName": "Cermet Nerva x1",
    "thrusters": 1,
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 49000,
-   "EV_kps": 8.09,
+   "requiredProjectName": "Project_CermetNerva",
+   "thrust_N": 134400,
+   "EV_kps": 9.81,
    "specificPower_kgMW": 0,
    "efficiency": 0.7,
+   "thrustRating_GW": "0.659",
+   "req power": "0.942",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Solid_Core_Fission",
-   "thrustCap": 20,
+   "thrustCap": 12,
    "cooling": "Calc",
-   "requiredProjectName": "Project_NervaDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -3596,22 +3896,24 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_NervaDrive"
+   "iconResource": "shipbuildericons/ICO_CermetNerva"
 },
  {
-   "dataName": "NervaDrivex2",
-   "friendlyName": "Nerva Drive x2",
+   "dataName": "CermetNervax2",
+   "friendlyName": "Cermet Nerva x2",
    "thrusters": 2,
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 98000,
-   "EV_kps": 8.09,
+   "requiredProjectName": "Project_CermetNerva",
+   "thrust_N": 268800,
+   "EV_kps": 9.81,
    "specificPower_kgMW": 0,
    "efficiency": 0.7,
+   "thrustRating_GW": "1.318",
+   "req power": "1.884",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Solid_Core_Fission",
-   "thrustCap": 20,
+   "thrustCap": 12,
    "cooling": "Calc",
-   "requiredProjectName": "Project_NervaDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -3619,22 +3921,24 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_NervaDrive"
+   "iconResource": "shipbuildericons/ICO_CermetNerva"
 },
  {
-   "dataName": "NervaDrivex3",
-   "friendlyName": "Nerva Drive x3",
+   "dataName": "CermetNervax3",
+   "friendlyName": "Cermet Nerva x3",
    "thrusters": 3,
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 147000,
-   "EV_kps": 8.09,
+   "requiredProjectName": "Project_CermetNerva",
+   "thrust_N": 403200,
+   "EV_kps": 9.81,
    "specificPower_kgMW": 0,
    "efficiency": 0.7,
+   "thrustRating_GW": "1.978",
+   "req power": "2.825",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Solid_Core_Fission",
-   "thrustCap": 20,
+   "thrustCap": 12,
    "cooling": "Calc",
-   "requiredProjectName": "Project_NervaDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -3642,22 +3946,24 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_NervaDrive"
+   "iconResource": "shipbuildericons/ICO_CermetNerva"
 },
  {
-   "dataName": "NervaDrivex4",
-   "friendlyName": "Nerva Drive x4",
+   "dataName": "CermetNervax4",
+   "friendlyName": "Cermet Nerva x4",
    "thrusters": 4,
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 196000,
-   "EV_kps": 8.09,
+   "requiredProjectName": "Project_CermetNerva",
+   "thrust_N": 537600,
+   "EV_kps": 9.81,
    "specificPower_kgMW": 0,
    "efficiency": 0.7,
+   "thrustRating_GW": "2.637",
+   "req power": "3.767",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Solid_Core_Fission",
-   "thrustCap": 20,
+   "thrustCap": 12,
    "cooling": "Calc",
-   "requiredProjectName": "Project_NervaDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -3665,22 +3971,24 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_NervaDrive"
+   "iconResource": "shipbuildericons/ICO_CermetNerva"
 },
  {
-   "dataName": "NervaDrivex5",
-   "friendlyName": "Nerva Drive x5",
+   "dataName": "CermetNervax5",
+   "friendlyName": "Cermet Nerva x5",
    "thrusters": 5,
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 245000,
-   "EV_kps": 8.09,
+   "requiredProjectName": "Project_CermetNerva",
+   "thrust_N": 672000,
+   "EV_kps": 9.81,
    "specificPower_kgMW": 0,
    "efficiency": 0.7,
+   "thrustRating_GW": "3.296",
+   "req power": "4.709",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Solid_Core_Fission",
-   "thrustCap": 20,
+   "thrustCap": 12,
    "cooling": "Calc",
-   "requiredProjectName": "Project_NervaDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -3688,22 +3996,24 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_NervaDrive"
+   "iconResource": "shipbuildericons/ICO_CermetNerva"
 },
  {
-   "dataName": "NervaDrivex6",
-   "friendlyName": "Nerva Drive x6",
+   "dataName": "CermetNervax6",
+   "friendlyName": "Cermet Nerva x6",
    "thrusters": 6,
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 294000,
-   "EV_kps": 8.09,
+   "requiredProjectName": "Project_CermetNerva",
+   "thrust_N": 806400,
+   "EV_kps": 9.81,
    "specificPower_kgMW": 0,
    "efficiency": 0.7,
+   "thrustRating_GW": "3.955",
+   "req power": "5.651",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Solid_Core_Fission",
-   "thrustCap": 20,
+   "thrustCap": 12,
    "cooling": "Calc",
-   "requiredProjectName": "Project_NervaDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -3711,22 +4021,25 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_NervaDrive"
+   "iconResource": "shipbuildericons/ICO_CermetNerva"
 },
  {
-   "dataName": "SnareDrivex1",
-   "friendlyName": "Snare Drive x1",
+   "dataName": "AdvancedNervaDrivex1",
+   "friendlyName": "Advanced Nerva Drive x1",
    "thrusters": 1,
+   "notes": "Nerva Derivative",
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 73000,
-   "EV_kps": 8.83,
+   "requiredProjectName": "Project_AdvancedNervaDrive",
+   "thrust_N": 334061,
+   "EV_kps": 8.09,
    "specificPower_kgMW": 0,
    "efficiency": 0.7,
+   "thrustRating_GW": "1.350",
+   "req power": "1.929",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Solid_Core_Fission",
-   "thrustCap": 20,
+   "thrustCap": 9,
    "cooling": "Calc",
-   "requiredProjectName": "Project_SnareDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -3734,22 +4047,24 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_SnareDrive"
+   "iconResource": "shipbuildericons/ICO_AdvancedNervaDrive"
 },
  {
-   "dataName": "SnareDrivex2",
-   "friendlyName": "Snare Drive x2",
+   "dataName": "AdvancedNervaDrivex2",
+   "friendlyName": "Advanced Nerva Drive x2",
    "thrusters": 2,
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 146000,
-   "EV_kps": 8.83,
+   "requiredProjectName": "Project_AdvancedNervaDrive",
+   "thrust_N": 668122,
+   "EV_kps": 8.09,
    "specificPower_kgMW": 0,
    "efficiency": 0.7,
+   "thrustRating_GW": "2.701",
+   "req power": "3.858",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Solid_Core_Fission",
-   "thrustCap": 20,
+   "thrustCap": 9,
    "cooling": "Calc",
-   "requiredProjectName": "Project_SnareDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -3757,22 +4072,24 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_SnareDrive"
+   "iconResource": "shipbuildericons/ICO_AdvancedNervaDrive"
 },
  {
-   "dataName": "SnareDrivex3",
-   "friendlyName": "Snare Drive x3",
+   "dataName": "AdvancedNervaDrivex3",
+   "friendlyName": "Advanced Nerva Drive x3",
    "thrusters": 3,
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 219000,
-   "EV_kps": 8.83,
+   "requiredProjectName": "Project_AdvancedNervaDrive",
+   "thrust_N": 1002183,
+   "EV_kps": 8.09,
    "specificPower_kgMW": 0,
    "efficiency": 0.7,
+   "thrustRating_GW": "4.051",
+   "req power": "5.788",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Solid_Core_Fission",
-   "thrustCap": 20,
+   "thrustCap": 9,
    "cooling": "Calc",
-   "requiredProjectName": "Project_SnareDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -3780,22 +4097,24 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_SnareDrive"
+   "iconResource": "shipbuildericons/ICO_AdvancedNervaDrive"
 },
  {
-   "dataName": "SnareDrivex4",
-   "friendlyName": "Snare Drive x4",
+   "dataName": "AdvancedNervaDrivex4",
+   "friendlyName": "Advanced Nerva Drive x4",
    "thrusters": 4,
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 292000,
-   "EV_kps": 8.83,
+   "requiredProjectName": "Project_AdvancedNervaDrive",
+   "thrust_N": 1336244,
+   "EV_kps": 8.09,
    "specificPower_kgMW": 0,
    "efficiency": 0.7,
+   "thrustRating_GW": "5.402",
+   "req power": "7.717",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Solid_Core_Fission",
-   "thrustCap": 20,
+   "thrustCap": 9,
    "cooling": "Calc",
-   "requiredProjectName": "Project_SnareDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -3803,22 +4122,24 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_SnareDrive"
+   "iconResource": "shipbuildericons/ICO_AdvancedNervaDrive"
 },
  {
-   "dataName": "SnareDrivex5",
-   "friendlyName": "Snare Drive x5",
+   "dataName": "AdvancedNervaDrivex5",
+   "friendlyName": "Advanced Nerva Drive x5",
    "thrusters": 5,
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 365000,
-   "EV_kps": 8.83,
+   "requiredProjectName": "Project_AdvancedNervaDrive",
+   "thrust_N": 1670305,
+   "EV_kps": 8.09,
    "specificPower_kgMW": 0,
    "efficiency": 0.7,
+   "thrustRating_GW": "6.752",
+   "req power": "9.646",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Solid_Core_Fission",
-   "thrustCap": 20,
+   "thrustCap": 9,
    "cooling": "Calc",
-   "requiredProjectName": "Project_SnareDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -3826,22 +4147,24 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_SnareDrive"
+   "iconResource": "shipbuildericons/ICO_AdvancedNervaDrive"
 },
  {
-   "dataName": "SnareDrivex6",
-   "friendlyName": "Snare Drive x6",
+   "dataName": "AdvancedNervaDrivex6",
+   "friendlyName": "Advanced Nerva Drive x6",
    "thrusters": 6,
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 438000,
-   "EV_kps": 8.83,
+   "requiredProjectName": "Project_AdvancedNervaDrive",
+   "thrust_N": 2004366,
+   "EV_kps": 8.09,
    "specificPower_kgMW": 0,
    "efficiency": 0.7,
+   "thrustRating_GW": "8.103",
+   "req power": "11.575",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Solid_Core_Fission",
-   "thrustCap": 20,
+   "thrustCap": 9,
    "cooling": "Calc",
-   "requiredProjectName": "Project_SnareDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -3849,22 +4172,24 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_SnareDrive"
+   "iconResource": "shipbuildericons/ICO_AdvancedNervaDrive"
 },
  {
-   "dataName": "RoverDrivex1",
-   "friendlyName": "Rover Drive x1",
+   "dataName": "Dumbox1",
+   "friendlyName": "Dumbo x1",
    "thrusters": 1,
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 111200,
-   "EV_kps": 9.2,
+   "requiredProjectName": "Project_Dumbo",
+   "thrust_N": 400000,
+   "EV_kps": 8.3,
    "specificPower_kgMW": 0,
-   "efficiency": 0.7,
+   "efficiency": 0.725,
+   "thrustRating_GW": "1.660",
+   "req power": "2.290",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Solid_Core_Fission",
-   "thrustCap": 20,
+   "thrustCap": 9,
    "cooling": "Calc",
-   "requiredProjectName": "Project_RoverDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -3872,22 +4197,24 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_RoverDrive"
+   "iconResource": "shipbuildericons/ICO_Dumbo"
 },
  {
-   "dataName": "RoverDrivex2",
-   "friendlyName": "Rover Drive x2",
+   "dataName": "Dumbox2",
+   "friendlyName": "Dumbo x2",
    "thrusters": 2,
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 222400,
-   "EV_kps": 9.2,
+   "requiredProjectName": "Project_Dumbo",
+   "thrust_N": 800000,
+   "EV_kps": 8.3,
    "specificPower_kgMW": 0,
-   "efficiency": 0.7,
+   "efficiency": 0.725,
+   "thrustRating_GW": "3.320",
+   "req power": "4.579",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Solid_Core_Fission",
-   "thrustCap": 20,
+   "thrustCap": 9,
    "cooling": "Calc",
-   "requiredProjectName": "Project_RoverDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -3895,22 +4222,24 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_RoverDrive"
+   "iconResource": "shipbuildericons/ICO_Dumbo"
 },
  {
-   "dataName": "RoverDrivex3",
-   "friendlyName": "Rover Drive x3",
+   "dataName": "Dumbox3",
+   "friendlyName": "Dumbo x3",
    "thrusters": 3,
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 333600,
-   "EV_kps": 9.2,
+   "requiredProjectName": "Project_Dumbo",
+   "thrust_N": 1200000,
+   "EV_kps": 8.3,
    "specificPower_kgMW": 0,
-   "efficiency": 0.7,
+   "efficiency": 0.725,
+   "thrustRating_GW": "4.980",
+   "req power": "6.869",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Solid_Core_Fission",
-   "thrustCap": 20,
+   "thrustCap": 9,
    "cooling": "Calc",
-   "requiredProjectName": "Project_RoverDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -3918,22 +4247,24 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_RoverDrive"
+   "iconResource": "shipbuildericons/ICO_Dumbo"
 },
  {
-   "dataName": "RoverDrivex4",
-   "friendlyName": "Rover Drive x4",
+   "dataName": "Dumbox4",
+   "friendlyName": "Dumbo x4",
    "thrusters": 4,
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 444800,
-   "EV_kps": 9.2,
+   "requiredProjectName": "Project_Dumbo",
+   "thrust_N": 1600000,
+   "EV_kps": 8.3,
    "specificPower_kgMW": 0,
-   "efficiency": 0.7,
+   "efficiency": 0.725,
+   "thrustRating_GW": "6.640",
+   "req power": "9.159",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Solid_Core_Fission",
-   "thrustCap": 20,
+   "thrustCap": 9,
    "cooling": "Calc",
-   "requiredProjectName": "Project_RoverDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -3941,22 +4272,24 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_RoverDrive"
+   "iconResource": "shipbuildericons/ICO_Dumbo"
 },
  {
-   "dataName": "RoverDrivex5",
-   "friendlyName": "Rover Drive x5",
+   "dataName": "Dumbox5",
+   "friendlyName": "Dumbo x5",
    "thrusters": 5,
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 556000,
-   "EV_kps": 9.2,
+   "requiredProjectName": "Project_Dumbo",
+   "thrust_N": 2000000,
+   "EV_kps": 8.3,
    "specificPower_kgMW": 0,
-   "efficiency": 0.7,
+   "efficiency": 0.725,
+   "thrustRating_GW": "8.300",
+   "req power": "11.448",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Solid_Core_Fission",
-   "thrustCap": 20,
+   "thrustCap": 9,
    "cooling": "Calc",
-   "requiredProjectName": "Project_RoverDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -3964,22 +4297,24 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_RoverDrive"
+   "iconResource": "shipbuildericons/ICO_Dumbo"
 },
  {
-   "dataName": "RoverDrivex6",
-   "friendlyName": "Rover Drive x6",
+   "dataName": "Dumbox6",
+   "friendlyName": "Dumbo x6",
    "thrusters": 6,
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 667200,
-   "EV_kps": 9.2,
+   "requiredProjectName": "Project_Dumbo",
+   "thrust_N": 2400000,
+   "EV_kps": 8.3,
    "specificPower_kgMW": 0,
-   "efficiency": 0.7,
+   "efficiency": 0.725,
+   "thrustRating_GW": "9.960",
+   "req power": "13.738",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Solid_Core_Fission",
-   "thrustCap": 20,
+   "thrustCap": 9,
    "cooling": "Calc",
-   "requiredProjectName": "Project_RoverDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -3987,22 +4322,24 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_RoverDrive"
+   "iconResource": "shipbuildericons/ICO_Dumbo"
 },
  {
-   "dataName": "CermetNervax1",
-   "friendlyName": "Cermet Nerva x1",
+   "dataName": "AdvancedCermetNervax1",
+   "friendlyName": "Advanced Cermet Nerva x1",
    "thrusters": 1,
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 134400,
-   "EV_kps": 9.81,
+   "requiredProjectName": "Project_AdvancedCermetNerva",
+   "thrust_N": 445267,
+   "EV_kps": 9.12,
    "specificPower_kgMW": 0,
-   "efficiency": 0.7,
+   "efficiency": 0.75,
+   "thrustRating_GW": "2.030",
+   "req power": "2.707",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Solid_Core_Fission",
-   "thrustCap": 20,
+   "thrustCap": 12,
    "cooling": "Calc",
-   "requiredProjectName": "Project_CermetNerva",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -4010,22 +4347,24 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_CermetNerva"
+   "iconResource": "shipbuildericons/ICO_AdvancedCermetNerva"
 },
  {
-   "dataName": "CermetNervax2",
-   "friendlyName": "Cermet Nerva x2",
+   "dataName": "AdvancedCermetNervax2",
+   "friendlyName": "Advanced Cermet Nerva x2",
    "thrusters": 2,
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 268800,
-   "EV_kps": 9.81,
+   "requiredProjectName": "Project_AdvancedCermetNerva",
+   "thrust_N": 890534,
+   "EV_kps": 9.12,
    "specificPower_kgMW": 0,
-   "efficiency": 0.7,
+   "efficiency": 0.75,
+   "thrustRating_GW": "4.061",
+   "req power": "5.414",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Solid_Core_Fission",
-   "thrustCap": 20,
+   "thrustCap": 12,
    "cooling": "Calc",
-   "requiredProjectName": "Project_CermetNerva",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -4033,22 +4372,24 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_CermetNerva"
+   "iconResource": "shipbuildericons/ICO_AdvancedCermetNerva"
 },
  {
-   "dataName": "CermetNervax3",
-   "friendlyName": "Cermet Nerva x3",
+   "dataName": "AdvancedCermetNervax3",
+   "friendlyName": "Advanced Cermet Nerva x3",
    "thrusters": 3,
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 403200,
-   "EV_kps": 9.81,
+   "requiredProjectName": "Project_AdvancedCermetNerva",
+   "thrust_N": 1335801,
+   "EV_kps": 9.12,
    "specificPower_kgMW": 0,
-   "efficiency": 0.7,
+   "efficiency": 0.75,
+   "thrustRating_GW": "6.091",
+   "req power": "8.122",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Solid_Core_Fission",
-   "thrustCap": 20,
+   "thrustCap": 12,
    "cooling": "Calc",
-   "requiredProjectName": "Project_CermetNerva",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -4056,22 +4397,24 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_CermetNerva"
+   "iconResource": "shipbuildericons/ICO_AdvancedCermetNerva"
 },
  {
-   "dataName": "CermetNervax4",
-   "friendlyName": "Cermet Nerva x4",
+   "dataName": "AdvancedCermetNervax4",
+   "friendlyName": "Advanced Cermet Nerva x4",
    "thrusters": 4,
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 537600,
-   "EV_kps": 9.81,
+   "requiredProjectName": "Project_AdvancedCermetNerva",
+   "thrust_N": 1781068,
+   "EV_kps": 9.12,
    "specificPower_kgMW": 0,
-   "efficiency": 0.7,
+   "efficiency": 0.75,
+   "thrustRating_GW": "8.122",
+   "req power": "10.829",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Solid_Core_Fission",
-   "thrustCap": 20,
+   "thrustCap": 12,
    "cooling": "Calc",
-   "requiredProjectName": "Project_CermetNerva",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -4079,22 +4422,24 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_CermetNerva"
+   "iconResource": "shipbuildericons/ICO_AdvancedCermetNerva"
 },
  {
-   "dataName": "CermetNervax5",
-   "friendlyName": "Cermet Nerva x5",
+   "dataName": "AdvancedCermetNervax5",
+   "friendlyName": "Advanced Cermet Nerva x5",
    "thrusters": 5,
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 672000,
-   "EV_kps": 9.81,
+   "requiredProjectName": "Project_AdvancedCermetNerva",
+   "thrust_N": 2226335,
+   "EV_kps": 9.12,
    "specificPower_kgMW": 0,
-   "efficiency": 0.7,
+   "efficiency": 0.75,
+   "thrustRating_GW": "10.152",
+   "req power": "13.536",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Solid_Core_Fission",
-   "thrustCap": 20,
+   "thrustCap": 12,
    "cooling": "Calc",
-   "requiredProjectName": "Project_CermetNerva",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -4102,22 +4447,24 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_CermetNerva"
+   "iconResource": "shipbuildericons/ICO_AdvancedCermetNerva"
 },
  {
-   "dataName": "CermetNervax6",
-   "friendlyName": "Cermet Nerva x6",
+   "dataName": "AdvancedCermetNervax6",
+   "friendlyName": "Advanced Cermet Nerva x6",
    "thrusters": 6,
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 806400,
-   "EV_kps": 9.81,
+   "requiredProjectName": "Project_AdvancedCermetNerva",
+   "thrust_N": 2671602,
+   "EV_kps": 9.12,
    "specificPower_kgMW": 0,
-   "efficiency": 0.7,
+   "efficiency": 0.75,
+   "thrustRating_GW": "12.183",
+   "req power": "16.243",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Solid_Core_Fission",
-   "thrustCap": 20,
+   "thrustCap": 12,
    "cooling": "Calc",
-   "requiredProjectName": "Project_CermetNerva",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -4125,23 +4472,24 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_CermetNerva"
+   "iconResource": "shipbuildericons/ICO_AdvancedCermetNerva"
 },
  {
-   "dataName": "AdvancedNervaDrivex1",
-   "friendlyName": "Advanced Nerva Drive x1",
+   "dataName": "HeavyDumbox1",
+   "friendlyName": "Heavy Dumbo x1",
    "thrusters": 1,
-   "notes": "Nerva Derivative",
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 334061,
+   "requiredProjectName": "Project_HeavyDumbo",
+   "thrust_N": 3500000,
    "EV_kps": 8.09,
    "specificPower_kgMW": 0,
-   "efficiency": 0.7,
+   "efficiency": 0.725,
+   "thrustRating_GW": "14.163",
+   "req power": "19.535",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Solid_Core_Fission",
-   "thrustCap": 20,
+   "thrustCap": 9,
    "cooling": "Calc",
-   "requiredProjectName": "Project_AdvancedNervaDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -4149,22 +4497,24 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_AdvancedNervaDrive"
+   "iconResource": "shipbuildericons/ICO_HeavyDumbo"
 },
  {
-   "dataName": "AdvancedNervaDrivex2",
-   "friendlyName": "Advanced Nerva Drive x2",
+   "dataName": "HeavyDumbox2",
+   "friendlyName": "Heavy Dumbo x2",
    "thrusters": 2,
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 668122,
+   "requiredProjectName": "Project_HeavyDumbo",
+   "thrust_N": 7000000,
    "EV_kps": 8.09,
    "specificPower_kgMW": 0,
-   "efficiency": 0.7,
+   "efficiency": 0.725,
+   "thrustRating_GW": "28.326",
+   "req power": "39.070",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Solid_Core_Fission",
-   "thrustCap": 20,
+   "thrustCap": 9,
    "cooling": "Calc",
-   "requiredProjectName": "Project_AdvancedNervaDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -4172,22 +4522,24 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_AdvancedNervaDrive"
+   "iconResource": "shipbuildericons/ICO_HeavyDumbo"
 },
  {
-   "dataName": "AdvancedNervaDrivex3",
-   "friendlyName": "Advanced Nerva Drive x3",
+   "dataName": "HeavyDumbox3",
+   "friendlyName": "Heavy Dumbo x3",
    "thrusters": 3,
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 1002183,
+   "requiredProjectName": "Project_HeavyDumbo",
+   "thrust_N": 10500000,
    "EV_kps": 8.09,
    "specificPower_kgMW": 0,
-   "efficiency": 0.7,
+   "efficiency": 0.725,
+   "thrustRating_GW": "42.488",
+   "req power": "58.604",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Solid_Core_Fission",
-   "thrustCap": 20,
+   "thrustCap": 9,
    "cooling": "Calc",
-   "requiredProjectName": "Project_AdvancedNervaDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -4195,22 +4547,24 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_AdvancedNervaDrive"
+   "iconResource": "shipbuildericons/ICO_HeavyDumbo"
 },
  {
-   "dataName": "AdvancedNervaDrivex4",
-   "friendlyName": "Advanced Nerva Drive x4",
+   "dataName": "HeavyDumbox4",
+   "friendlyName": "Heavy Dumbo x4",
    "thrusters": 4,
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 1336244,
+   "requiredProjectName": "Project_HeavyDumbo",
+   "thrust_N": 14000000,
    "EV_kps": 8.09,
    "specificPower_kgMW": 0,
-   "efficiency": 0.7,
+   "efficiency": 0.725,
+   "thrustRating_GW": "56.651",
+   "req power": "78.139",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Solid_Core_Fission",
-   "thrustCap": 20,
+   "thrustCap": 9,
    "cooling": "Calc",
-   "requiredProjectName": "Project_AdvancedNervaDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -4218,22 +4572,24 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_AdvancedNervaDrive"
+   "iconResource": "shipbuildericons/ICO_HeavyDumbo"
 },
  {
-   "dataName": "AdvancedNervaDrivex5",
-   "friendlyName": "Advanced Nerva Drive x5",
+   "dataName": "HeavyDumbox5",
+   "friendlyName": "Heavy Dumbo x5",
    "thrusters": 5,
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 1670305,
+   "requiredProjectName": "Project_HeavyDumbo",
+   "thrust_N": 17500000,
    "EV_kps": 8.09,
    "specificPower_kgMW": 0,
-   "efficiency": 0.7,
+   "efficiency": 0.725,
+   "thrustRating_GW": "70.814",
+   "req power": "97.674",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Solid_Core_Fission",
-   "thrustCap": 20,
+   "thrustCap": 9,
    "cooling": "Calc",
-   "requiredProjectName": "Project_AdvancedNervaDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -4241,22 +4597,24 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_AdvancedNervaDrive"
+   "iconResource": "shipbuildericons/ICO_HeavyDumbo"
 },
  {
-   "dataName": "AdvancedNervaDrivex6",
-   "friendlyName": "Advanced Nerva Drive x6",
+   "dataName": "HeavyDumbox6",
+   "friendlyName": "Heavy Dumbo x6",
    "thrusters": 6,
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 2004366,
+   "requiredProjectName": "Project_HeavyDumbo",
+   "thrust_N": 21000000,
    "EV_kps": 8.09,
    "specificPower_kgMW": 0,
-   "efficiency": 0.7,
+   "efficiency": 0.725,
+   "thrustRating_GW": "84.977",
+   "req power": "117.209",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Solid_Core_Fission",
-   "thrustCap": 20,
+   "thrustCap": 9,
    "cooling": "Calc",
-   "requiredProjectName": "Project_AdvancedNervaDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -4264,22 +4622,25 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_AdvancedNervaDrive"
+   "iconResource": "shipbuildericons/ICO_HeavyDumbo"
 },
  {
-   "dataName": "Dumbox1",
-   "friendlyName": "Dumbo x1",
+   "dataName": "PulsarDrivex1",
+   "friendlyName": "Pulsar Drive x1",
    "thrusters": 1,
+   "notes": "Fission Pulse Drive",
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 400000,
-   "EV_kps": 8.3,
+   "requiredProjectName": "Project_PulsarDrive",
+   "thrust_N": 100000,
+   "EV_kps": 16,
    "specificPower_kgMW": 0,
-   "efficiency": 0.725,
+   "efficiency": 0.85,
+   "thrustRating_GW": "0.800",
+   "req power": "0.941",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Solid_Core_Fission",
-   "thrustCap": 20,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_Dumbo",
+   "thrustCap": 5,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -4287,22 +4648,24 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_Dumbo"
+   "iconResource": "shipbuildericons/ICO_PulsarDrive"
 },
  {
-   "dataName": "Dumbox2",
-   "friendlyName": "Dumbo x2",
+   "dataName": "PulsarDrivex2",
+   "friendlyName": "Pulsar Drive x2",
    "thrusters": 2,
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 800000,
-   "EV_kps": 8.3,
+   "requiredProjectName": "Project_PulsarDrive",
+   "thrust_N": 200000,
+   "EV_kps": 16,
    "specificPower_kgMW": 0,
-   "efficiency": 0.725,
+   "efficiency": 0.85,
+   "thrustRating_GW": "1.600",
+   "req power": "1.882",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Solid_Core_Fission",
-   "thrustCap": 20,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_Dumbo",
+   "thrustCap": 5,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -4310,22 +4673,24 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_Dumbo"
+   "iconResource": "shipbuildericons/ICO_PulsarDrive"
 },
  {
-   "dataName": "Dumbox3",
-   "friendlyName": "Dumbo x3",
+   "dataName": "PulsarDrivex3",
+   "friendlyName": "Pulsar Drive x3",
    "thrusters": 3,
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 1200000,
-   "EV_kps": 8.3,
+   "requiredProjectName": "Project_PulsarDrive",
+   "thrust_N": 300000,
+   "EV_kps": 16,
    "specificPower_kgMW": 0,
-   "efficiency": 0.725,
+   "efficiency": 0.85,
+   "thrustRating_GW": "2.400",
+   "req power": "2.824",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Solid_Core_Fission",
-   "thrustCap": 20,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_Dumbo",
+   "thrustCap": 5,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -4333,22 +4698,24 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_Dumbo"
+   "iconResource": "shipbuildericons/ICO_PulsarDrive"
 },
  {
-   "dataName": "Dumbox4",
-   "friendlyName": "Dumbo x4",
+   "dataName": "PulsarDrivex4",
+   "friendlyName": "Pulsar Drive x4",
    "thrusters": 4,
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 1600000,
-   "EV_kps": 8.3,
+   "requiredProjectName": "Project_PulsarDrive",
+   "thrust_N": 400000,
+   "EV_kps": 16,
    "specificPower_kgMW": 0,
-   "efficiency": 0.725,
+   "efficiency": 0.85,
+   "thrustRating_GW": "3.200",
+   "req power": "3.765",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Solid_Core_Fission",
-   "thrustCap": 20,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_Dumbo",
+   "thrustCap": 5,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -4356,22 +4723,24 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_Dumbo"
+   "iconResource": "shipbuildericons/ICO_PulsarDrive"
 },
  {
-   "dataName": "Dumbox5",
-   "friendlyName": "Dumbo x5",
+   "dataName": "PulsarDrivex5",
+   "friendlyName": "Pulsar Drive x5",
    "thrusters": 5,
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 2000000,
-   "EV_kps": 8.3,
+   "requiredProjectName": "Project_PulsarDrive",
+   "thrust_N": 500000,
+   "EV_kps": 16,
    "specificPower_kgMW": 0,
-   "efficiency": 0.725,
+   "efficiency": 0.85,
+   "thrustRating_GW": "4.000",
+   "req power": "4.706",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Solid_Core_Fission",
-   "thrustCap": 20,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_Dumbo",
+   "thrustCap": 5,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -4379,22 +4748,24 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_Dumbo"
+   "iconResource": "shipbuildericons/ICO_PulsarDrive"
 },
  {
-   "dataName": "Dumbox6",
-   "friendlyName": "Dumbo x6",
+   "dataName": "PulsarDrivex6",
+   "friendlyName": "Pulsar Drive x6",
    "thrusters": 6,
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 2400000,
-   "EV_kps": 8.3,
+   "requiredProjectName": "Project_PulsarDrive",
+   "thrust_N": 600000,
+   "EV_kps": 16,
    "specificPower_kgMW": 0,
-   "efficiency": 0.725,
+   "efficiency": 0.85,
+   "thrustRating_GW": "4.800",
+   "req power": "5.647",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Solid_Core_Fission",
-   "thrustCap": 20,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_Dumbo",
+   "thrustCap": 5,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -4402,22 +4773,24 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_Dumbo"
+   "iconResource": "shipbuildericons/ICO_PulsarDrive"
 },
  {
-   "dataName": "AdvancedCermetNervax1",
-   "friendlyName": "Advanced Cermet Nerva x1",
+   "dataName": "AdvancedPulsarDrivex1",
+   "friendlyName": "Advanced Pulsar Drive x1",
    "thrusters": 1,
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 445267,
-   "EV_kps": 9.81,
+   "requiredProjectName": "Project_AdvancedPulsarDrive",
+   "thrust_N": 180000,
+   "EV_kps": 32,
    "specificPower_kgMW": 0,
-   "efficiency": 0.75,
+   "efficiency": 0.9,
+   "thrustRating_GW": "2.880",
+   "req power": "3.200",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Solid_Core_Fission",
-   "thrustCap": 20,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_AdvancedCermetNerva",
+   "thrustCap": 5,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -4425,22 +4798,24 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_AdvancedCermetNerva"
+   "iconResource": "shipbuildericons/ICO_AdvancedPulsarDrive"
 },
  {
-   "dataName": "AdvancedCermetNervax2",
-   "friendlyName": "Advanced Cermet Nerva x2",
+   "dataName": "AdvancedPulsarDrivex2",
+   "friendlyName": "Advanced Pulsar Drive x2",
    "thrusters": 2,
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 890534,
-   "EV_kps": 9.81,
+   "requiredProjectName": "Project_AdvancedPulsarDrive",
+   "thrust_N": 360000,
+   "EV_kps": 32,
    "specificPower_kgMW": 0,
-   "efficiency": 0.75,
+   "efficiency": 0.9,
+   "thrustRating_GW": "5.760",
+   "req power": "6.400",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Solid_Core_Fission",
-   "thrustCap": 20,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_AdvancedCermetNerva",
+   "thrustCap": 5,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -4448,22 +4823,24 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_AdvancedCermetNerva"
+   "iconResource": "shipbuildericons/ICO_AdvancedPulsarDrive"
 },
  {
-   "dataName": "AdvancedCermetNervax3",
-   "friendlyName": "Advanced Cermet Nerva x3",
+   "dataName": "AdvancedPulsarDrivex3",
+   "friendlyName": "Advanced Pulsar Drive x3",
    "thrusters": 3,
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 1335801,
-   "EV_kps": 9.81,
+   "requiredProjectName": "Project_AdvancedPulsarDrive",
+   "thrust_N": 540000,
+   "EV_kps": 32,
    "specificPower_kgMW": 0,
-   "efficiency": 0.75,
+   "efficiency": 0.9,
+   "thrustRating_GW": "8.640",
+   "req power": "9.600",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Solid_Core_Fission",
-   "thrustCap": 20,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_AdvancedCermetNerva",
+   "thrustCap": 5,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -4471,22 +4848,24 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_AdvancedCermetNerva"
+   "iconResource": "shipbuildericons/ICO_AdvancedPulsarDrive"
 },
  {
-   "dataName": "AdvancedCermetNervax4",
-   "friendlyName": "Advanced Cermet Nerva x4",
+   "dataName": "AdvancedPulsarDrivex4",
+   "friendlyName": "Advanced Pulsar Drive x4",
    "thrusters": 4,
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 1781068,
-   "EV_kps": 9.81,
+   "requiredProjectName": "Project_AdvancedPulsarDrive",
+   "thrust_N": 720000,
+   "EV_kps": 32,
    "specificPower_kgMW": 0,
-   "efficiency": 0.75,
+   "efficiency": 0.9,
+   "thrustRating_GW": "11.520",
+   "req power": "12.800",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Solid_Core_Fission",
-   "thrustCap": 20,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_AdvancedCermetNerva",
+   "thrustCap": 5,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -4494,22 +4873,24 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_AdvancedCermetNerva"
+   "iconResource": "shipbuildericons/ICO_AdvancedPulsarDrive"
 },
  {
-   "dataName": "AdvancedCermetNervax5",
-   "friendlyName": "Advanced Cermet Nerva x5",
+   "dataName": "AdvancedPulsarDrivex5",
+   "friendlyName": "Advanced Pulsar Drive x5",
    "thrusters": 5,
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 2226335,
-   "EV_kps": 9.81,
+   "requiredProjectName": "Project_AdvancedPulsarDrive",
+   "thrust_N": 900000,
+   "EV_kps": 32,
    "specificPower_kgMW": 0,
-   "efficiency": 0.75,
+   "efficiency": 0.9,
+   "thrustRating_GW": "14.400",
+   "req power": "16.000",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Solid_Core_Fission",
-   "thrustCap": 20,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_AdvancedCermetNerva",
+   "thrustCap": 5,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -4517,22 +4898,24 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_AdvancedCermetNerva"
+   "iconResource": "shipbuildericons/ICO_AdvancedPulsarDrive"
 },
  {
-   "dataName": "AdvancedCermetNervax6",
-   "friendlyName": "Advanced Cermet Nerva x6",
+   "dataName": "AdvancedPulsarDrivex6",
+   "friendlyName": "Advanced Pulsar Drive x6",
    "thrusters": 6,
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 2671602,
-   "EV_kps": 9.81,
+   "requiredProjectName": "Project_AdvancedPulsarDrive",
+   "thrust_N": 1080000,
+   "EV_kps": 32,
    "specificPower_kgMW": 0,
-   "efficiency": 0.75,
+   "efficiency": 0.9,
+   "thrustRating_GW": "17.280",
+   "req power": "19.200",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Solid_Core_Fission",
-   "thrustCap": 20,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_AdvancedCermetNerva",
+   "thrustCap": 5,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -4540,22 +4923,24 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_AdvancedCermetNerva"
+   "iconResource": "shipbuildericons/ICO_AdvancedPulsarDrive"
 },
  {
-   "dataName": "HeavyDumbox1",
-   "friendlyName": "Heavy Dumbo x1",
+   "dataName": "PebbleDrivex1",
+   "friendlyName": "Pebble Drive x1",
    "thrusters": 1,
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 3500000,
-   "EV_kps": 8.09,
+   "requiredProjectName": "Project_PebbleDrive",
+   "thrust_N": 172700,
+   "EV_kps": 9.81,
    "specificPower_kgMW": 0,
-   "efficiency": 0.725,
+   "efficiency": 0.94,
+   "thrustRating_GW": "0.847",
+   "req power": "0.901",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Solid_Core_Fission",
-   "thrustCap": 20,
+   "thrustCap": 15,
    "cooling": "Calc",
-   "requiredProjectName": "Project_HeavyDumbo",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -4563,22 +4948,24 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_HeavyDumbo"
+   "iconResource": "shipbuildericons/ICO_PebbleDrive"
 },
  {
-   "dataName": "HeavyDumbox2",
-   "friendlyName": "Heavy Dumbo x2",
+   "dataName": "PebbleDrivex2",
+   "friendlyName": "Pebble Drive x2",
    "thrusters": 2,
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 7000000,
-   "EV_kps": 8.09,
+   "requiredProjectName": "Project_PebbleDrive",
+   "thrust_N": 345400,
+   "EV_kps": 9.81,
    "specificPower_kgMW": 0,
-   "efficiency": 0.725,
+   "efficiency": 0.94,
+   "thrustRating_GW": "1.694",
+   "req power": "1.802",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Solid_Core_Fission",
-   "thrustCap": 20,
+   "thrustCap": 15,
    "cooling": "Calc",
-   "requiredProjectName": "Project_HeavyDumbo",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -4586,22 +4973,24 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_HeavyDumbo"
+   "iconResource": "shipbuildericons/ICO_PebbleDrive"
 },
  {
-   "dataName": "HeavyDumbox3",
-   "friendlyName": "Heavy Dumbo x3",
+   "dataName": "PebbleDrivex3",
+   "friendlyName": "Pebble Drive x3",
    "thrusters": 3,
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 10500000,
-   "EV_kps": 8.09,
+   "requiredProjectName": "Project_PebbleDrive",
+   "thrust_N": 518100,
+   "EV_kps": 9.81,
    "specificPower_kgMW": 0,
-   "efficiency": 0.725,
+   "efficiency": 0.94,
+   "thrustRating_GW": "2.541",
+   "req power": "2.703",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Solid_Core_Fission",
-   "thrustCap": 20,
+   "thrustCap": 15,
    "cooling": "Calc",
-   "requiredProjectName": "Project_HeavyDumbo",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -4609,22 +4998,24 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_HeavyDumbo"
+   "iconResource": "shipbuildericons/ICO_PebbleDrive"
 },
  {
-   "dataName": "HeavyDumbox4",
-   "friendlyName": "Heavy Dumbo x4",
+   "dataName": "PebbleDrivex4",
+   "friendlyName": "Pebble Drive x4",
    "thrusters": 4,
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 14000000,
-   "EV_kps": 8.09,
+   "requiredProjectName": "Project_PebbleDrive",
+   "thrust_N": 690800,
+   "EV_kps": 9.81,
    "specificPower_kgMW": 0,
-   "efficiency": 0.725,
+   "efficiency": 0.94,
+   "thrustRating_GW": "3.388",
+   "req power": "3.605",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Solid_Core_Fission",
-   "thrustCap": 20,
+   "thrustCap": 15,
    "cooling": "Calc",
-   "requiredProjectName": "Project_HeavyDumbo",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -4632,22 +5023,24 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_HeavyDumbo"
+   "iconResource": "shipbuildericons/ICO_PebbleDrive"
 },
  {
-   "dataName": "HeavyDumbox5",
-   "friendlyName": "Heavy Dumbo x5",
+   "dataName": "PebbleDrivex5",
+   "friendlyName": "Pebble Drive x5",
    "thrusters": 5,
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 17500000,
-   "EV_kps": 8.09,
+   "requiredProjectName": "Project_PebbleDrive",
+   "thrust_N": 863500,
+   "EV_kps": 9.81,
    "specificPower_kgMW": 0,
-   "efficiency": 0.725,
+   "efficiency": 0.94,
+   "thrustRating_GW": "4.235",
+   "req power": "4.506",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Solid_Core_Fission",
-   "thrustCap": 20,
+   "thrustCap": 15,
    "cooling": "Calc",
-   "requiredProjectName": "Project_HeavyDumbo",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -4655,22 +5048,24 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_HeavyDumbo"
+   "iconResource": "shipbuildericons/ICO_PebbleDrive"
 },
  {
-   "dataName": "HeavyDumbox6",
-   "friendlyName": "Heavy Dumbo x6",
+   "dataName": "PebbleDrivex6",
+   "friendlyName": "Pebble Drive x6",
    "thrusters": 6,
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 21000000,
-   "EV_kps": 8.09,
+   "requiredProjectName": "Project_PebbleDrive",
+   "thrust_N": 1036200,
+   "EV_kps": 9.81,
    "specificPower_kgMW": 0,
-   "efficiency": 0.725,
+   "efficiency": 0.94,
+   "thrustRating_GW": "5.083",
+   "req power": "5.407",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Solid_Core_Fission",
-   "thrustCap": 20,
+   "thrustCap": 15,
    "cooling": "Calc",
-   "requiredProjectName": "Project_HeavyDumbo",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -4678,23 +5073,24 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_HeavyDumbo"
+   "iconResource": "shipbuildericons/ICO_PebbleDrive"
 },
  {
-   "dataName": "PulsarDrivex1",
-   "friendlyName": "Pulsar Drive x1",
+   "dataName": "AdvancedPebbleDrivex1",
+   "friendlyName": "Advanced Pebble Drive x1",
    "thrusters": 1,
-   "notes": "Fission Pulse Drive",
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 100000,
-   "EV_kps": 16,
+   "requiredProjectName": "Project_AdvancedPebbleDrive",
+   "thrust_N": 333617,
+   "EV_kps": 9.53,
    "specificPower_kgMW": 0,
    "efficiency": 0.85,
+   "thrustRating_GW": "1.590",
+   "req power": "1.870",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Solid_Core_Fission",
-   "thrustCap": 30,
-   "cooling": "Closed",
-   "requiredProjectName": "Project_PulsarDrive",
+   "thrustCap": 16,
+   "cooling": "Calc",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -4702,22 +5098,24 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_PulsarDrive"
+   "iconResource": "shipbuildericons/ICO_AdvancedPebbleDrive"
 },
  {
-   "dataName": "PulsarDrivex2",
-   "friendlyName": "Pulsar Drive x2",
+   "dataName": "AdvancedPebbleDrivex2",
+   "friendlyName": "Advanced Pebble Drive x2",
    "thrusters": 2,
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 200000,
-   "EV_kps": 16,
+   "requiredProjectName": "Project_AdvancedPebbleDrive",
+   "thrust_N": 667234,
+   "EV_kps": 9.53,
    "specificPower_kgMW": 0,
    "efficiency": 0.85,
+   "thrustRating_GW": "3.179",
+   "req power": "3.740",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Solid_Core_Fission",
-   "thrustCap": 30,
-   "cooling": "Closed",
-   "requiredProjectName": "Project_PulsarDrive",
+   "thrustCap": 16,
+   "cooling": "Calc",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -4725,22 +5123,24 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_PulsarDrive"
+   "iconResource": "shipbuildericons/ICO_AdvancedPebbleDrive"
 },
  {
-   "dataName": "PulsarDrivex3",
-   "friendlyName": "Pulsar Drive x3",
+   "dataName": "AdvancedPebbleDrivex3",
+   "friendlyName": "Advanced Pebble Drive x3",
    "thrusters": 3,
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 300000,
-   "EV_kps": 16,
+   "requiredProjectName": "Project_AdvancedPebbleDrive",
+   "thrust_N": 1000851,
+   "EV_kps": 9.53,
    "specificPower_kgMW": 0,
    "efficiency": 0.85,
+   "thrustRating_GW": "4.769",
+   "req power": "5.611",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Solid_Core_Fission",
-   "thrustCap": 30,
-   "cooling": "Closed",
-   "requiredProjectName": "Project_PulsarDrive",
+   "thrustCap": 16,
+   "cooling": "Calc",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -4748,22 +5148,24 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_PulsarDrive"
+   "iconResource": "shipbuildericons/ICO_AdvancedPebbleDrive"
 },
  {
-   "dataName": "PulsarDrivex4",
-   "friendlyName": "Pulsar Drive x4",
+   "dataName": "AdvancedPebbleDrivex4",
+   "friendlyName": "Advanced Pebble Drive x4",
    "thrusters": 4,
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 400000,
-   "EV_kps": 16,
+   "requiredProjectName": "Project_AdvancedPebbleDrive",
+   "thrust_N": 1334468,
+   "EV_kps": 9.53,
    "specificPower_kgMW": 0,
    "efficiency": 0.85,
+   "thrustRating_GW": "6.359",
+   "req power": "7.481",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Solid_Core_Fission",
-   "thrustCap": 30,
-   "cooling": "Closed",
-   "requiredProjectName": "Project_PulsarDrive",
+   "thrustCap": 16,
+   "cooling": "Calc",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -4771,22 +5173,24 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_PulsarDrive"
+   "iconResource": "shipbuildericons/ICO_AdvancedPebbleDrive"
 },
  {
-   "dataName": "PulsarDrivex5",
-   "friendlyName": "Pulsar Drive x5",
+   "dataName": "AdvancedPebbleDrivex5",
+   "friendlyName": "Advanced Pebble Drive x5",
    "thrusters": 5,
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 500000,
-   "EV_kps": 16,
+   "requiredProjectName": "Project_AdvancedPebbleDrive",
+   "thrust_N": 1668085,
+   "EV_kps": 9.53,
    "specificPower_kgMW": 0,
    "efficiency": 0.85,
+   "thrustRating_GW": "7.948",
+   "req power": "9.351",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Solid_Core_Fission",
-   "thrustCap": 30,
-   "cooling": "Closed",
-   "requiredProjectName": "Project_PulsarDrive",
+   "thrustCap": 16,
+   "cooling": "Calc",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -4794,22 +5198,24 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_PulsarDrive"
+   "iconResource": "shipbuildericons/ICO_AdvancedPebbleDrive"
 },
  {
-   "dataName": "PulsarDrivex6",
-   "friendlyName": "Pulsar Drive x6",
+   "dataName": "AdvancedPebbleDrivex6",
+   "friendlyName": "Advanced Pebble Drive x6",
    "thrusters": 6,
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 600000,
-   "EV_kps": 16,
+   "requiredProjectName": "Project_AdvancedPebbleDrive",
+   "thrust_N": 2001702,
+   "EV_kps": 9.53,
    "specificPower_kgMW": 0,
    "efficiency": 0.85,
+   "thrustRating_GW": "9.538",
+   "req power": "11.221",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Solid_Core_Fission",
-   "thrustCap": 30,
-   "cooling": "Closed",
-   "requiredProjectName": "Project_PulsarDrive",
+   "thrustCap": 16,
+   "cooling": "Calc",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -4817,22 +5223,25 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_PulsarDrive"
+   "iconResource": "shipbuildericons/ICO_AdvancedPebbleDrive"
 },
  {
-   "dataName": "AdvancedPulsarDrivex1",
-   "friendlyName": "Advanced Pulsar Drive x1",
+   "dataName": "LarsDrivex1",
+   "friendlyName": "Lars Drive x1",
    "thrusters": 1,
+   "notes": "Liquid Core 1 (LARS)",
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 180000,
-   "EV_kps": 32,
+   "requiredProjectName": "Project_LarsDrive",
+   "thrust_N": 98000,
+   "EV_kps": 19.62,
    "specificPower_kgMW": 0,
-   "efficiency": 0.9,
+   "efficiency": 0.85,
+   "thrustRating_GW": "0.961",
+   "req power": "1.131",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Solid_Core_Fission",
-   "thrustCap": 40,
+   "requiredPowerPlant": "Liquid_Core_Fission",
+   "thrustCap": 15,
    "cooling": "Closed",
-   "requiredProjectName": "Project_AdvancedPulsarDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -4840,22 +5249,25 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_AdvancedPulsarDrive"
+   "iconResource": "shipbuildericons/ICO_LarsDrive"
 },
  {
-   "dataName": "AdvancedPulsarDrivex2",
-   "friendlyName": "Advanced Pulsar Drive x2",
+   "dataName": "LarsDrivex2",
+   "friendlyName": "Lars Drive x2",
    "thrusters": 2,
+   "notes": "Liquid Core 1 (LARS)",
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 360000,
-   "EV_kps": 32,
+   "requiredProjectName": "Project_LarsDrive",
+   "thrust_N": 196000,
+   "EV_kps": 19.62,
    "specificPower_kgMW": 0,
-   "efficiency": 0.9,
+   "efficiency": 0.85,
+   "thrustRating_GW": "1.923",
+   "req power": "2.262",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Solid_Core_Fission",
-   "thrustCap": 40,
+   "requiredPowerPlant": "Liquid_Core_Fission",
+   "thrustCap": 15,
    "cooling": "Closed",
-   "requiredProjectName": "Project_AdvancedPulsarDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -4863,22 +5275,25 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_AdvancedPulsarDrive"
+   "iconResource": "shipbuildericons/ICO_LarsDrive"
 },
  {
-   "dataName": "AdvancedPulsarDrivex3",
-   "friendlyName": "Advanced Pulsar Drive x3",
+   "dataName": "LarsDrivex3",
+   "friendlyName": "Lars Drive x3",
    "thrusters": 3,
+   "notes": "Liquid Core 1 (LARS)",
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 540000,
-   "EV_kps": 32,
+   "requiredProjectName": "Project_LarsDrive",
+   "thrust_N": 294000,
+   "EV_kps": 19.62,
    "specificPower_kgMW": 0,
-   "efficiency": 0.9,
+   "efficiency": 0.85,
+   "thrustRating_GW": "2.884",
+   "req power": "3.393",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Solid_Core_Fission",
-   "thrustCap": 40,
+   "requiredPowerPlant": "Liquid_Core_Fission",
+   "thrustCap": 15,
    "cooling": "Closed",
-   "requiredProjectName": "Project_AdvancedPulsarDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -4886,22 +5301,25 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_AdvancedPulsarDrive"
+   "iconResource": "shipbuildericons/ICO_LarsDrive"
 },
  {
-   "dataName": "AdvancedPulsarDrivex4",
-   "friendlyName": "Advanced Pulsar Drive x4",
+   "dataName": "LarsDrivex4",
+   "friendlyName": "Lars Drive x4",
    "thrusters": 4,
+   "notes": "Liquid Core 1 (LARS)",
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 720000,
-   "EV_kps": 32,
+   "requiredProjectName": "Project_LarsDrive",
+   "thrust_N": 392000,
+   "EV_kps": 19.62,
    "specificPower_kgMW": 0,
-   "efficiency": 0.9,
+   "efficiency": 0.85,
+   "thrustRating_GW": "3.846",
+   "req power": "4.524",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Solid_Core_Fission",
-   "thrustCap": 40,
+   "requiredPowerPlant": "Liquid_Core_Fission",
+   "thrustCap": 15,
    "cooling": "Closed",
-   "requiredProjectName": "Project_AdvancedPulsarDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -4909,22 +5327,25 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_AdvancedPulsarDrive"
+   "iconResource": "shipbuildericons/ICO_LarsDrive"
 },
  {
-   "dataName": "AdvancedPulsarDrivex5",
-   "friendlyName": "Advanced Pulsar Drive x5",
+   "dataName": "LarsDrivex5",
+   "friendlyName": "Lars Drive x5",
    "thrusters": 5,
+   "notes": "Liquid Core 1 (LARS)",
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 900000,
-   "EV_kps": 32,
+   "requiredProjectName": "Project_LarsDrive",
+   "thrust_N": 490000,
+   "EV_kps": 19.62,
    "specificPower_kgMW": 0,
-   "efficiency": 0.9,
+   "efficiency": 0.85,
+   "thrustRating_GW": "4.807",
+   "req power": "5.655",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Solid_Core_Fission",
-   "thrustCap": 40,
+   "requiredPowerPlant": "Liquid_Core_Fission",
+   "thrustCap": 15,
    "cooling": "Closed",
-   "requiredProjectName": "Project_AdvancedPulsarDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -4932,22 +5353,25 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_AdvancedPulsarDrive"
+   "iconResource": "shipbuildericons/ICO_LarsDrive"
 },
  {
-   "dataName": "AdvancedPulsarDrivex6",
-   "friendlyName": "Advanced Pulsar Drive x6",
+   "dataName": "LarsDrivex6",
+   "friendlyName": "Lars Drive x6",
    "thrusters": 6,
+   "notes": "Liquid Core 1 (LARS)",
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 1080000,
-   "EV_kps": 32,
+   "requiredProjectName": "Project_LarsDrive",
+   "thrust_N": 588000,
+   "EV_kps": 19.62,
    "specificPower_kgMW": 0,
-   "efficiency": 0.9,
+   "efficiency": 0.85,
+   "thrustRating_GW": "5.768",
+   "req power": "6.786",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Solid_Core_Fission",
-   "thrustCap": 40,
+   "requiredPowerPlant": "Liquid_Core_Fission",
+   "thrustCap": 15,
    "cooling": "Closed",
-   "requiredProjectName": "Project_AdvancedPulsarDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -4955,442 +5379,496 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_AdvancedPulsarDrive"
+   "iconResource": "shipbuildericons/ICO_LarsDrive"
 },
  {
-   "dataName": "PebbleDrivex1",
-   "friendlyName": "Pebble Drive x1",
+   "dataName": "TeardropDrivex1",
+   "friendlyName": "Teardrop Drive x1",
    "thrusters": 1,
+   "notes": "Droplet Core Nuclear Rocket",
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 172700,
-   "EV_kps": 9.81,
+   "requiredProjectName": "Project_TeardropDrive",
+   "thrust_N": 333000,
+   "EV_kps": 19.62,
    "specificPower_kgMW": 0,
-   "efficiency": 0.94,
+   "efficiency": 0.75,
+   "thrustRating_GW": "3.267",
+   "req power": "4.356",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Solid_Core_Fission",
-   "thrustCap": 20,
+   "requiredPowerPlant": "Liquid_Core_Fission",
+   "thrustCap": 15,
    "cooling": "Calc",
-   "requiredProjectName": "Project_PebbleDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
    "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.995,
+      "fissiles": 0.005
    },
-   "iconResource": "shipbuildericons/ICO_PebbleDrive"
+   "iconResource": "shipbuildericons/ICO_TeardropDrive"
 },
  {
-   "dataName": "PebbleDrivex2",
-   "friendlyName": "Pebble Drive x2",
+   "dataName": "TeardropDrivex2",
+   "friendlyName": "Teardrop Drive x2",
    "thrusters": 2,
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 345400,
-   "EV_kps": 9.81,
+   "requiredProjectName": "Project_TeardropDrive",
+   "thrust_N": 666000,
+   "EV_kps": 19.62,
    "specificPower_kgMW": 0,
-   "efficiency": 0.94,
+   "efficiency": 0.75,
+   "thrustRating_GW": "6.533",
+   "req power": "8.711",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Solid_Core_Fission",
-   "thrustCap": 20,
+   "requiredPowerPlant": "Liquid_Core_Fission",
+   "thrustCap": 15,
    "cooling": "Calc",
-   "requiredProjectName": "Project_PebbleDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
    "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.995,
+      "fissiles": 0.005
    },
-   "iconResource": "shipbuildericons/ICO_PebbleDrive"
+   "iconResource": "shipbuildericons/ICO_TeardropDrive"
 },
  {
-   "dataName": "PebbleDrivex3",
-   "friendlyName": "Pebble Drive x3",
+   "dataName": "TeardropDrivex3",
+   "friendlyName": "Teardrop Drive x3",
    "thrusters": 3,
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 518100,
-   "EV_kps": 9.81,
+   "requiredProjectName": "Project_TeardropDrive",
+   "thrust_N": 999000,
+   "EV_kps": 19.62,
    "specificPower_kgMW": 0,
-   "efficiency": 0.94,
+   "efficiency": 0.75,
+   "thrustRating_GW": "9.800",
+   "req power": "13.067",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Solid_Core_Fission",
-   "thrustCap": 20,
+   "requiredPowerPlant": "Liquid_Core_Fission",
+   "thrustCap": 15,
    "cooling": "Calc",
-   "requiredProjectName": "Project_PebbleDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
    "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.995,
+      "fissiles": 0.005
    },
-   "iconResource": "shipbuildericons/ICO_PebbleDrive"
+   "iconResource": "shipbuildericons/ICO_TeardropDrive"
 },
  {
-   "dataName": "PebbleDrivex4",
-   "friendlyName": "Pebble Drive x4",
+   "dataName": "TeardropDrivex4",
+   "friendlyName": "Teardrop Drive x4",
    "thrusters": 4,
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 690800,
-   "EV_kps": 9.81,
+   "requiredProjectName": "Project_TeardropDrive",
+   "thrust_N": 1332000,
+   "EV_kps": 19.62,
    "specificPower_kgMW": 0,
-   "efficiency": 0.94,
+   "efficiency": 0.75,
+   "thrustRating_GW": "13.067",
+   "req power": "17.423",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Solid_Core_Fission",
-   "thrustCap": 20,
+   "requiredPowerPlant": "Liquid_Core_Fission",
+   "thrustCap": 15,
    "cooling": "Calc",
-   "requiredProjectName": "Project_PebbleDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
    "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.995,
+      "fissiles": 0.005
    },
-   "iconResource": "shipbuildericons/ICO_PebbleDrive"
+   "iconResource": "shipbuildericons/ICO_TeardropDrive"
 },
  {
-   "dataName": "PebbleDrivex5",
-   "friendlyName": "Pebble Drive x5",
+   "dataName": "TeardropDrivex5",
+   "friendlyName": "Teardrop Drive x5",
    "thrusters": 5,
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 863500,
-   "EV_kps": 9.81,
+   "requiredProjectName": "Project_TeardropDrive",
+   "thrust_N": 1665000,
+   "EV_kps": 19.62,
    "specificPower_kgMW": 0,
-   "efficiency": 0.94,
+   "efficiency": 0.75,
+   "thrustRating_GW": "16.334",
+   "req power": "21.778",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Solid_Core_Fission",
-   "thrustCap": 20,
+   "requiredPowerPlant": "Liquid_Core_Fission",
+   "thrustCap": 15,
    "cooling": "Calc",
-   "requiredProjectName": "Project_PebbleDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
    "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.995,
+      "fissiles": 0.005
    },
-   "iconResource": "shipbuildericons/ICO_PebbleDrive"
+   "iconResource": "shipbuildericons/ICO_TeardropDrive"
 },
  {
-   "dataName": "PebbleDrivex6",
-   "friendlyName": "Pebble Drive x6",
+   "dataName": "TeardropDrivex6",
+   "friendlyName": "Teardrop Drive x6",
    "thrusters": 6,
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 1036200,
-   "EV_kps": 9.81,
+   "requiredProjectName": "Project_TeardropDrive",
+   "thrust_N": 1998000,
+   "EV_kps": 19.62,
    "specificPower_kgMW": 0,
-   "efficiency": 0.94,
+   "efficiency": 0.75,
+   "thrustRating_GW": "19.600",
+   "req power": "26.134",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Solid_Core_Fission",
-   "thrustCap": 20,
+   "requiredPowerPlant": "Liquid_Core_Fission",
+   "thrustCap": 15,
    "cooling": "Calc",
-   "requiredProjectName": "Project_PebbleDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
    "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.995,
+      "fissiles": 0.005
    },
-   "iconResource": "shipbuildericons/ICO_PebbleDrive"
+   "iconResource": "shipbuildericons/ICO_TeardropDrive"
 },
  {
-   "dataName": "AdvancedPebbleDrivex1",
-   "friendlyName": "Advanced Pebble Drive x1",
+   "dataName": "FissionSpinnerDrivex1",
+   "friendlyName": "Fission Spinner Drive x1",
    "thrusters": 1,
+   "notes": "Centfigual NTR, Max ISP",
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 333617,
-   "EV_kps": 9.53,
+   "requiredProjectName": "Project_FissionSpinnerDrive",
+   "thrust_N": 540000,
+   "EV_kps": 17.7,
    "specificPower_kgMW": 0,
    "efficiency": 0.85,
+   "thrustRating_GW": "4.779",
+   "req power": "5.622",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Solid_Core_Fission",
-   "thrustCap": 20,
+   "requiredPowerPlant": "Liquid_Core_Fission",
+   "thrustCap": 14,
    "cooling": "Calc",
-   "requiredProjectName": "Project_AdvancedPebbleDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
    "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.995,
+      "fissiles": 0.005
    },
-   "iconResource": "shipbuildericons/ICO_AdvancedPebbleDrive"
+   "iconResource": "shipbuildericons/ICO_FissionSpinnerDrive"
 },
  {
-   "dataName": "AdvancedPebbleDrivex2",
-   "friendlyName": "Advanced Pebble Drive x2",
+   "dataName": "FissionSpinnerDrivex2",
+   "friendlyName": "Fission Spinner Drive x2",
    "thrusters": 2,
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 667234,
-   "EV_kps": 9.53,
+   "requiredProjectName": "Project_FissionSpinnerDrive",
+   "thrust_N": 1080000,
+   "EV_kps": 17.7,
    "specificPower_kgMW": 0,
    "efficiency": 0.85,
+   "thrustRating_GW": "9.558",
+   "req power": "11.245",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Solid_Core_Fission",
-   "thrustCap": 20,
+   "requiredPowerPlant": "Liquid_Core_Fission",
+   "thrustCap": 14,
    "cooling": "Calc",
-   "requiredProjectName": "Project_AdvancedPebbleDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
    "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.995,
+      "fissiles": 0.005
    },
-   "iconResource": "shipbuildericons/ICO_AdvancedPebbleDrive"
+   "iconResource": "shipbuildericons/ICO_FissionSpinnerDrive"
 },
  {
-   "dataName": "AdvancedPebbleDrivex3",
-   "friendlyName": "Advanced Pebble Drive x3",
+   "dataName": "FissionSpinnerDrivex3",
+   "friendlyName": "Fission Spinner Drive x3",
    "thrusters": 3,
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 1000851,
-   "EV_kps": 9.53,
+   "requiredProjectName": "Project_FissionSpinnerDrive",
+   "thrust_N": 1620000,
+   "EV_kps": 17.7,
    "specificPower_kgMW": 0,
    "efficiency": 0.85,
+   "thrustRating_GW": "14.337",
+   "req power": "16.867",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Solid_Core_Fission",
-   "thrustCap": 20,
+   "requiredPowerPlant": "Liquid_Core_Fission",
+   "thrustCap": 14,
    "cooling": "Calc",
-   "requiredProjectName": "Project_AdvancedPebbleDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
    "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.995,
+      "fissiles": 0.005
    },
-   "iconResource": "shipbuildericons/ICO_AdvancedPebbleDrive"
+   "iconResource": "shipbuildericons/ICO_FissionSpinnerDrive"
 },
  {
-   "dataName": "AdvancedPebbleDrivex4",
-   "friendlyName": "Advanced Pebble Drive x4",
+   "dataName": "FissionSpinnerDrivex4",
+   "friendlyName": "Fission Spinner Drive x4",
    "thrusters": 4,
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 1334468,
-   "EV_kps": 9.53,
+   "requiredProjectName": "Project_FissionSpinnerDrive",
+   "thrust_N": 2160000,
+   "EV_kps": 17.7,
    "specificPower_kgMW": 0,
    "efficiency": 0.85,
+   "thrustRating_GW": "19.116",
+   "req power": "22.489",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Solid_Core_Fission",
-   "thrustCap": 20,
+   "requiredPowerPlant": "Liquid_Core_Fission",
+   "thrustCap": 14,
    "cooling": "Calc",
-   "requiredProjectName": "Project_AdvancedPebbleDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
    "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.995,
+      "fissiles": 0.005
    },
-   "iconResource": "shipbuildericons/ICO_AdvancedPebbleDrive"
+   "iconResource": "shipbuildericons/ICO_FissionSpinnerDrive"
 },
  {
-   "dataName": "AdvancedPebbleDrivex5",
-   "friendlyName": "Advanced Pebble Drive x5",
+   "dataName": "FissionSpinnerDrivex5",
+   "friendlyName": "Fission Spinner Drive x5",
    "thrusters": 5,
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 1668085,
-   "EV_kps": 9.53,
+   "requiredProjectName": "Project_FissionSpinnerDrive",
+   "thrust_N": 2700000,
+   "EV_kps": 17.7,
    "specificPower_kgMW": 0,
    "efficiency": 0.85,
+   "thrustRating_GW": "23.895",
+   "req power": "28.112",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Solid_Core_Fission",
-   "thrustCap": 20,
+   "requiredPowerPlant": "Liquid_Core_Fission",
+   "thrustCap": 14,
    "cooling": "Calc",
-   "requiredProjectName": "Project_AdvancedPebbleDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
    "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.995,
+      "fissiles": 0.005
    },
-   "iconResource": "shipbuildericons/ICO_AdvancedPebbleDrive"
+   "iconResource": "shipbuildericons/ICO_FissionSpinnerDrive"
 },
  {
-   "dataName": "AdvancedPebbleDrivex6",
-   "friendlyName": "Advanced Pebble Drive x6",
+   "dataName": "FissionSpinnerDrivex6",
+   "friendlyName": "Fission Spinner Drive x6",
    "thrusters": 6,
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 2001702,
-   "EV_kps": 9.53,
+   "requiredProjectName": "Project_FissionSpinnerDrive",
+   "thrust_N": 3240000,
+   "EV_kps": 17.7,
    "specificPower_kgMW": 0,
    "efficiency": 0.85,
+   "thrustRating_GW": "28.674",
+   "req power": "33.734",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Solid_Core_Fission",
-   "thrustCap": 20,
+   "requiredPowerPlant": "Liquid_Core_Fission",
+   "thrustCap": 14,
    "cooling": "Calc",
-   "requiredProjectName": "Project_AdvancedPebbleDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
    "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.995,
+      "fissiles": 0.005
    },
-   "iconResource": "shipbuildericons/ICO_AdvancedPebbleDrive"
+   "iconResource": "shipbuildericons/ICO_FissionSpinnerDrive"
 },
  {
-   "dataName": "LarsDrivex1",
-   "friendlyName": "Lars Drive x1",
+   "dataName": "PegasusDrivex1",
+   "friendlyName": "Pegasus Drive x1",
    "thrusters": 1,
-   "notes": "Liquid Core 1 (LARS)",
+   "notes": "Liquid Core 1",
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 98000,
-   "EV_kps": 19.62,
+   "requiredProjectName": "Project_PegasusDrive",
+   "thrust_N": 7000000,
+   "EV_kps": 16,
    "specificPower_kgMW": 0,
    "efficiency": 0.85,
+   "thrustRating_GW": "56.000",
+   "req power": "65.882",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Liquid_Core_Fission",
-   "thrustCap": 20,
+   "thrustCap": 14,
    "cooling": "Calc",
-   "requiredProjectName": "Project_LarsDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
    "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.995,
+      "fissiles": 0.005
    },
-   "iconResource": "shipbuildericons/ICO_LarsDrive"
+   "iconResource": "shipbuildericons/ICO_PegasusDrive"
 },
  {
-   "dataName": "LarsDrivex2",
-   "friendlyName": "Lars Drive x2",
+   "dataName": "PegasusDrivex2",
+   "friendlyName": "Pegasus Drive x2",
    "thrusters": 2,
-   "notes": "Liquid Core 1 (LARS)",
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 196000,
-   "EV_kps": 19.62,
+   "requiredProjectName": "Project_PegasusDrive",
+   "thrust_N": 14000000,
+   "EV_kps": 16,
    "specificPower_kgMW": 0,
    "efficiency": 0.85,
+   "thrustRating_GW": "112.000",
+   "req power": "131.765",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Liquid_Core_Fission",
-   "thrustCap": 20,
+   "thrustCap": 14,
    "cooling": "Calc",
-   "requiredProjectName": "Project_LarsDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
    "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.995,
+      "fissiles": 0.005
    },
-   "iconResource": "shipbuildericons/ICO_LarsDrive"
+   "iconResource": "shipbuildericons/ICO_PegasusDrive"
 },
  {
-   "dataName": "LarsDrivex3",
-   "friendlyName": "Lars Drive x3",
+   "dataName": "PegasusDrivex3",
+   "friendlyName": "Pegasus Drive x3",
    "thrusters": 3,
-   "notes": "Liquid Core 1 (LARS)",
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 294000,
-   "EV_kps": 19.62,
+   "requiredProjectName": "Project_PegasusDrive",
+   "thrust_N": 21000000,
+   "EV_kps": 16,
    "specificPower_kgMW": 0,
    "efficiency": 0.85,
+   "thrustRating_GW": "168.000",
+   "req power": "197.647",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Liquid_Core_Fission",
-   "thrustCap": 20,
+   "thrustCap": 14,
    "cooling": "Calc",
-   "requiredProjectName": "Project_LarsDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
    "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.995,
+      "fissiles": 0.005
    },
-   "iconResource": "shipbuildericons/ICO_LarsDrive"
+   "iconResource": "shipbuildericons/ICO_PegasusDrive"
 },
  {
-   "dataName": "LarsDrivex4",
-   "friendlyName": "Lars Drive x4",
+   "dataName": "PegasusDrivex4",
+   "friendlyName": "Pegasus Drive x4",
    "thrusters": 4,
-   "notes": "Liquid Core 1 (LARS)",
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 392000,
-   "EV_kps": 19.62,
+   "requiredProjectName": "Project_PegasusDrive",
+   "thrust_N": 28000000,
+   "EV_kps": 16,
    "specificPower_kgMW": 0,
    "efficiency": 0.85,
+   "thrustRating_GW": "224.000",
+   "req power": "263.529",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Liquid_Core_Fission",
-   "thrustCap": 20,
+   "thrustCap": 14,
    "cooling": "Calc",
-   "requiredProjectName": "Project_LarsDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
    "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.995,
+      "fissiles": 0.005
    },
-   "iconResource": "shipbuildericons/ICO_LarsDrive"
+   "iconResource": "shipbuildericons/ICO_PegasusDrive"
 },
  {
-   "dataName": "LarsDrivex5",
-   "friendlyName": "Lars Drive x5",
+   "dataName": "PegasusDrivex5",
+   "friendlyName": "Pegasus Drive x5",
    "thrusters": 5,
-   "notes": "Liquid Core 1 (LARS)",
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 490000,
-   "EV_kps": 19.62,
+   "requiredProjectName": "Project_PegasusDrive",
+   "thrust_N": 35000000,
+   "EV_kps": 16,
    "specificPower_kgMW": 0,
    "efficiency": 0.85,
+   "thrustRating_GW": "280.000",
+   "req power": "329.412",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Liquid_Core_Fission",
-   "thrustCap": 20,
+   "thrustCap": 14,
    "cooling": "Calc",
-   "requiredProjectName": "Project_LarsDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
    "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.995,
+      "fissiles": 0.005
    },
-   "iconResource": "shipbuildericons/ICO_LarsDrive"
+   "iconResource": "shipbuildericons/ICO_PegasusDrive"
 },
  {
-   "dataName": "LarsDrivex6",
-   "friendlyName": "Lars Drive x6",
+   "dataName": "PegasusDrivex6",
+   "friendlyName": "Pegasus Drive x6",
    "thrusters": 6,
-   "notes": "Liquid Core 1 (LARS)",
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 588000,
-   "EV_kps": 19.62,
+   "requiredProjectName": "Project_PegasusDrive",
+   "thrust_N": 42000000,
+   "EV_kps": 16,
    "specificPower_kgMW": 0,
    "efficiency": 0.85,
+   "thrustRating_GW": "336.000",
+   "req power": "395.294",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Liquid_Core_Fission",
-   "thrustCap": 20,
+   "thrustCap": 14,
    "cooling": "Calc",
-   "requiredProjectName": "Project_LarsDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
    "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.995,
+      "fissiles": 0.005
    },
-   "iconResource": "shipbuildericons/ICO_LarsDrive"
+   "iconResource": "shipbuildericons/ICO_PegasusDrive"
 },
  {
-   "dataName": "FissionSpinnerDrivex1",
-   "friendlyName": "Fission Spinner Drive x1",
+   "dataName": "VortexDrivex1",
+   "friendlyName": "Vortex Drive x1",
    "thrusters": 1,
+   "notes": "Vortex Confined 1",
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 540000,
-   "EV_kps": 29.4,
+   "requiredProjectName": "Project_VortexDrive",
+   "thrust_N": 330000,
+   "EV_kps": 19.62,
    "specificPower_kgMW": 0,
-   "efficiency": 0.85,
+   "efficiency": 0.7,
+   "thrustRating_GW": "3.237",
+   "req power": "4.625",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Liquid_Core_Fission",
-   "thrustCap": 20,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_FissionSpinnerDrive",
+   "requiredPowerPlant": "Gas_Core_Fission",
+   "thrustCap": 15,
+   "cooling": "Open",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -5398,22 +5876,25 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_FissionSpinnerDrive"
+   "iconResource": "shipbuildericons/ICO_VortexDrive"
 },
  {
-   "dataName": "FissionSpinnerDrivex2",
-   "friendlyName": "Fission Spinner Drive x2",
+   "dataName": "VortexDrivex2",
+   "friendlyName": "Vortex Drive x2",
    "thrusters": 2,
+   "notes": "Vortex Confined 1",
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 1080000,
-   "EV_kps": 29.4,
+   "requiredProjectName": "Project_VortexDrive",
+   "thrust_N": 660000,
+   "EV_kps": 19.62,
    "specificPower_kgMW": 0,
-   "efficiency": 0.85,
+   "efficiency": 0.7,
+   "thrustRating_GW": "6.475",
+   "req power": "9.249",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Liquid_Core_Fission",
-   "thrustCap": 20,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_FissionSpinnerDrive",
+   "requiredPowerPlant": "Gas_Core_Fission",
+   "thrustCap": 15,
+   "cooling": "Open",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -5421,22 +5902,25 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_FissionSpinnerDrive"
+   "iconResource": "shipbuildericons/ICO_VortexDrive"
 },
  {
-   "dataName": "FissionSpinnerDrivex3",
-   "friendlyName": "Fission Spinner Drive x3",
+   "dataName": "VortexDrivex3",
+   "friendlyName": "Vortex Drive x3",
    "thrusters": 3,
+   "notes": "Vortex Confined 1",
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 1620000,
-   "EV_kps": 29.4,
+   "requiredProjectName": "Project_VortexDrive",
+   "thrust_N": 990000,
+   "EV_kps": 19.62,
    "specificPower_kgMW": 0,
-   "efficiency": 0.85,
+   "efficiency": 0.7,
+   "thrustRating_GW": "9.712",
+   "req power": "13.874",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Liquid_Core_Fission",
-   "thrustCap": 20,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_FissionSpinnerDrive",
+   "requiredPowerPlant": "Gas_Core_Fission",
+   "thrustCap": 15,
+   "cooling": "Open",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -5444,22 +5928,25 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_FissionSpinnerDrive"
+   "iconResource": "shipbuildericons/ICO_VortexDrive"
 },
  {
-   "dataName": "FissionSpinnerDrivex4",
-   "friendlyName": "Fission Spinner Drive x4",
+   "dataName": "VortexDrivex4",
+   "friendlyName": "Vortex Drive x4",
    "thrusters": 4,
+   "notes": "Vortex Confined 1",
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 2160000,
-   "EV_kps": 29.4,
+   "requiredProjectName": "Project_VortexDrive",
+   "thrust_N": 1320000,
+   "EV_kps": 19.62,
    "specificPower_kgMW": 0,
-   "efficiency": 0.85,
+   "efficiency": 0.7,
+   "thrustRating_GW": "12.949",
+   "req power": "18.499",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Liquid_Core_Fission",
-   "thrustCap": 20,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_FissionSpinnerDrive",
+   "requiredPowerPlant": "Gas_Core_Fission",
+   "thrustCap": 15,
+   "cooling": "Open",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -5467,22 +5954,25 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_FissionSpinnerDrive"
+   "iconResource": "shipbuildericons/ICO_VortexDrive"
 },
  {
-   "dataName": "FissionSpinnerDrivex5",
-   "friendlyName": "Fission Spinner Drive x5",
+   "dataName": "VortexDrivex5",
+   "friendlyName": "Vortex Drive x5",
    "thrusters": 5,
+   "notes": "Vortex Confined 1",
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 2700000,
-   "EV_kps": 29.4,
+   "requiredProjectName": "Project_VortexDrive",
+   "thrust_N": 1650000,
+   "EV_kps": 19.62,
    "specificPower_kgMW": 0,
-   "efficiency": 0.85,
+   "efficiency": 0.7,
+   "thrustRating_GW": "16.187",
+   "req power": "23.124",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Liquid_Core_Fission",
-   "thrustCap": 20,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_FissionSpinnerDrive",
+   "requiredPowerPlant": "Gas_Core_Fission",
+   "thrustCap": 15,
+   "cooling": "Open",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -5490,22 +5980,25 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_FissionSpinnerDrive"
+   "iconResource": "shipbuildericons/ICO_VortexDrive"
 },
  {
-   "dataName": "FissionSpinnerDrivex6",
-   "friendlyName": "Fission Spinner Drive x6",
+   "dataName": "VortexDrivex6",
+   "friendlyName": "Vortex Drive x6",
    "thrusters": 6,
+   "notes": "Vortex Confined 1",
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 3240000,
-   "EV_kps": 29.4,
+   "requiredProjectName": "Project_VortexDrive",
+   "thrust_N": 1980000,
+   "EV_kps": 19.62,
    "specificPower_kgMW": 0,
-   "efficiency": 0.85,
+   "efficiency": 0.7,
+   "thrustRating_GW": "19.424",
+   "req power": "27.748",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Liquid_Core_Fission",
-   "thrustCap": 20,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_FissionSpinnerDrive",
+   "requiredPowerPlant": "Gas_Core_Fission",
+   "thrustCap": 15,
+   "cooling": "Open",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -5513,22 +6006,25 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_FissionSpinnerDrive"
+   "iconResource": "shipbuildericons/ICO_VortexDrive"
 },
  {
-   "dataName": "PegasusDrivex1",
-   "friendlyName": "Pegasus Drive x1",
+   "dataName": "AdvancedVortexDrivex1",
+   "friendlyName": "Advanced Vortex Drive x1",
    "thrusters": 1,
+   "notes": "Vortex Confined 2",
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 770000,
-   "EV_kps": 38.18,
+   "requiredProjectName": "Project_AdvancedVortexDrive",
+   "thrust_N": 504000,
+   "EV_kps": 19.62,
    "specificPower_kgMW": 0,
-   "efficiency": 0.875,
+   "efficiency": 0.7,
+   "thrustRating_GW": "4.944",
+   "req power": "7.063",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Liquid_Core_Fission",
-   "thrustCap": 20,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_PegasusDrive",
+   "requiredPowerPlant": "Gas_Core_Fission",
+   "thrustCap": 15,
+   "cooling": "Open",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -5536,22 +6032,25 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_PegasusDrive"
+   "iconResource": "shipbuildericons/ICO_AdvancedVortexDrive"
 },
  {
-   "dataName": "PegasusDrivex2",
-   "friendlyName": "Pegasus Drive x2",
+   "dataName": "AdvancedVortexDrivex2",
+   "friendlyName": "Advanced Vortex Drive x2",
    "thrusters": 2,
+   "notes": "Vortex Confined 2",
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 1540000,
-   "EV_kps": 38.18,
+   "requiredProjectName": "Project_AdvancedVortexDrive",
+   "thrust_N": 1008000,
+   "EV_kps": 19.62,
    "specificPower_kgMW": 0,
-   "efficiency": 0.875,
+   "efficiency": 0.7,
+   "thrustRating_GW": "9.888",
+   "req power": "14.126",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Liquid_Core_Fission",
-   "thrustCap": 20,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_PegasusDrive",
+   "requiredPowerPlant": "Gas_Core_Fission",
+   "thrustCap": 15,
+   "cooling": "Open",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -5559,22 +6058,25 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_PegasusDrive"
+   "iconResource": "shipbuildericons/ICO_AdvancedVortexDrive"
 },
  {
-   "dataName": "PegasusDrivex3",
-   "friendlyName": "Pegasus Drive x3",
+   "dataName": "AdvancedVortexDrivex3",
+   "friendlyName": "Advanced Vortex Drive x3",
    "thrusters": 3,
+   "notes": "Vortex Confined 2",
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 2310000,
-   "EV_kps": 38.18,
+   "requiredProjectName": "Project_AdvancedVortexDrive",
+   "thrust_N": 1512000,
+   "EV_kps": 19.62,
    "specificPower_kgMW": 0,
-   "efficiency": 0.875,
+   "efficiency": 0.7,
+   "thrustRating_GW": "14.833",
+   "req power": "21.190",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Liquid_Core_Fission",
-   "thrustCap": 20,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_PegasusDrive",
+   "requiredPowerPlant": "Gas_Core_Fission",
+   "thrustCap": 15,
+   "cooling": "Open",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -5582,22 +6084,25 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_PegasusDrive"
+   "iconResource": "shipbuildericons/ICO_AdvancedVortexDrive"
 },
  {
-   "dataName": "PegasusDrivex4",
-   "friendlyName": "Pegasus Drive x4",
+   "dataName": "AdvancedVortexDrivex4",
+   "friendlyName": "Advanced Vortex Drive x4",
    "thrusters": 4,
+   "notes": "Vortex Confined 2",
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 3080000,
-   "EV_kps": 38.18,
+   "requiredProjectName": "Project_AdvancedVortexDrive",
+   "thrust_N": 2016000,
+   "EV_kps": 19.62,
    "specificPower_kgMW": 0,
-   "efficiency": 0.875,
+   "efficiency": 0.7,
+   "thrustRating_GW": "19.777",
+   "req power": "28.253",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Liquid_Core_Fission",
-   "thrustCap": 20,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_PegasusDrive",
+   "requiredPowerPlant": "Gas_Core_Fission",
+   "thrustCap": 15,
+   "cooling": "Open",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -5605,22 +6110,25 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_PegasusDrive"
+   "iconResource": "shipbuildericons/ICO_AdvancedVortexDrive"
 },
  {
-   "dataName": "PegasusDrivex5",
-   "friendlyName": "Pegasus Drive x5",
+   "dataName": "AdvancedVortexDrivex5",
+   "friendlyName": "Advanced Vortex Drive x5",
    "thrusters": 5,
+   "notes": "Vortex Confined 2",
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 3850000,
-   "EV_kps": 38.18,
+   "requiredProjectName": "Project_AdvancedVortexDrive",
+   "thrust_N": 2520000,
+   "EV_kps": 19.62,
    "specificPower_kgMW": 0,
-   "efficiency": 0.875,
+   "efficiency": 0.7,
+   "thrustRating_GW": "24.721",
+   "req power": "35.316",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Liquid_Core_Fission",
-   "thrustCap": 20,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_PegasusDrive",
+   "requiredPowerPlant": "Gas_Core_Fission",
+   "thrustCap": 15,
+   "cooling": "Open",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -5628,22 +6136,25 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_PegasusDrive"
+   "iconResource": "shipbuildericons/ICO_AdvancedVortexDrive"
 },
  {
-   "dataName": "PegasusDrivex6",
-   "friendlyName": "Pegasus Drive x6",
+   "dataName": "AdvancedVortexDrivex6",
+   "friendlyName": "Advanced Vortex Drive x6",
    "thrusters": 6,
+   "notes": "Vortex Confined 2",
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 4620000,
-   "EV_kps": 38.18,
+   "requiredProjectName": "Project_AdvancedVortexDrive",
+   "thrust_N": 3024000,
+   "EV_kps": 19.62,
    "specificPower_kgMW": 0,
-   "efficiency": 0.875,
+   "efficiency": 0.7,
+   "thrustRating_GW": "29.665",
+   "req power": "42.379",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Liquid_Core_Fission",
-   "thrustCap": 20,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_PegasusDrive",
+   "requiredPowerPlant": "Gas_Core_Fission",
+   "thrustCap": 15,
+   "cooling": "Open",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -5651,23 +6162,25 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_PegasusDrive"
+   "iconResource": "shipbuildericons/ICO_AdvancedVortexDrive"
 },
  {
-   "dataName": "VortexDrivex1",
-   "friendlyName": "Vortex Drive x1",
+   "dataName": "CavityDrivex1",
+   "friendlyName": "Cavity Drive x1",
    "thrusters": 1,
-   "notes": "Vortex Confined 1",
+   "notes": "Vapor Core Lightbulb",
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 330000,
+   "requiredProjectName": "Project_CavityDrive",
+   "thrust_N": 56400,
    "EV_kps": 19.62,
    "specificPower_kgMW": 0,
-   "efficiency": 0.52,
+   "efficiency": 0.85,
+   "thrustRating_GW": "0.553",
+   "req power": "0.651",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Gas_Core_Fission",
-   "thrustCap": 20,
+   "thrustCap": 15,
    "cooling": "Closed",
-   "requiredProjectName": "Project_VortexDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -5675,23 +6188,25 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_VortexDrive"
+   "iconResource": "shipbuildericons/ICO_CavityDrive"
 },
  {
-   "dataName": "VortexDrivex2",
-   "friendlyName": "Vortex Drive x2",
+   "dataName": "CavityDrivex2",
+   "friendlyName": "Cavity Drive x2",
    "thrusters": 2,
-   "notes": "Vortex Confined 1",
+   "notes": "Vapor Core Lightbulb",
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 660000,
+   "requiredProjectName": "Project_CavityDrive",
+   "thrust_N": 112800,
    "EV_kps": 19.62,
    "specificPower_kgMW": 0,
-   "efficiency": 0.52,
+   "efficiency": 0.85,
+   "thrustRating_GW": "1.107",
+   "req power": "1.302",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Gas_Core_Fission",
-   "thrustCap": 20,
+   "thrustCap": 15,
    "cooling": "Closed",
-   "requiredProjectName": "Project_VortexDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -5699,23 +6214,25 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_VortexDrive"
+   "iconResource": "shipbuildericons/ICO_CavityDrive"
 },
  {
-   "dataName": "VortexDrivex3",
-   "friendlyName": "Vortex Drive x3",
+   "dataName": "CavityDrivex3",
+   "friendlyName": "Cavity Drive x3",
    "thrusters": 3,
-   "notes": "Vortex Confined 1",
+   "notes": "Vapor Core Lightbulb",
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 990000,
+   "requiredProjectName": "Project_CavityDrive",
+   "thrust_N": 169200,
    "EV_kps": 19.62,
    "specificPower_kgMW": 0,
-   "efficiency": 0.52,
+   "efficiency": 0.85,
+   "thrustRating_GW": "1.660",
+   "req power": "1.953",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Gas_Core_Fission",
-   "thrustCap": 20,
+   "thrustCap": 15,
    "cooling": "Closed",
-   "requiredProjectName": "Project_VortexDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -5723,23 +6240,25 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_VortexDrive"
+   "iconResource": "shipbuildericons/ICO_CavityDrive"
 },
  {
-   "dataName": "VortexDrivex4",
-   "friendlyName": "Vortex Drive x4",
+   "dataName": "CavityDrivex4",
+   "friendlyName": "Cavity Drive x4",
    "thrusters": 4,
-   "notes": "Vortex Confined 1",
+   "notes": "Vapor Core Lightbulb",
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 1320000,
+   "requiredProjectName": "Project_CavityDrive",
+   "thrust_N": 225600,
    "EV_kps": 19.62,
    "specificPower_kgMW": 0,
-   "efficiency": 0.52,
+   "efficiency": 0.85,
+   "thrustRating_GW": "2.213",
+   "req power": "2.604",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Gas_Core_Fission",
-   "thrustCap": 20,
+   "thrustCap": 15,
    "cooling": "Closed",
-   "requiredProjectName": "Project_VortexDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -5747,23 +6266,25 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_VortexDrive"
+   "iconResource": "shipbuildericons/ICO_CavityDrive"
 },
  {
-   "dataName": "VortexDrivex5",
-   "friendlyName": "Vortex Drive x5",
+   "dataName": "CavityDrivex5",
+   "friendlyName": "Cavity Drive x5",
    "thrusters": 5,
-   "notes": "Vortex Confined 1",
+   "notes": "Vapor Core Lightbulb",
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 1650000,
+   "requiredProjectName": "Project_CavityDrive",
+   "thrust_N": 282000,
    "EV_kps": 19.62,
    "specificPower_kgMW": 0,
-   "efficiency": 0.52,
+   "efficiency": 0.85,
+   "thrustRating_GW": "2.766",
+   "req power": "3.255",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Gas_Core_Fission",
-   "thrustCap": 20,
+   "thrustCap": 15,
    "cooling": "Closed",
-   "requiredProjectName": "Project_VortexDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -5771,23 +6292,25 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_VortexDrive"
+   "iconResource": "shipbuildericons/ICO_CavityDrive"
 },
  {
-   "dataName": "VortexDrivex6",
-   "friendlyName": "Vortex Drive x6",
+   "dataName": "CavityDrivex6",
+   "friendlyName": "Cavity Drive x6",
    "thrusters": 6,
-   "notes": "Vortex Confined 1",
+   "notes": "Vapor Core Lightbulb",
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 1980000,
+   "requiredProjectName": "Project_CavityDrive",
+   "thrust_N": 338400,
    "EV_kps": 19.62,
    "specificPower_kgMW": 0,
-   "efficiency": 0.52,
+   "efficiency": 0.85,
+   "thrustRating_GW": "3.320",
+   "req power": "3.906",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Gas_Core_Fission",
-   "thrustCap": 20,
+   "thrustCap": 15,
    "cooling": "Closed",
-   "requiredProjectName": "Project_VortexDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -5795,23 +6318,25 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_VortexDrive"
+   "iconResource": "shipbuildericons/ICO_CavityDrive"
 },
  {
-   "dataName": "AdvancedVortexDrivex1",
-   "friendlyName": "Advanced Vortex Drive x1",
+   "dataName": "AdvancedCavityDrivex1",
+   "friendlyName": "Advanced Cavity Drive x1",
    "thrusters": 1,
-   "notes": "Vortex Confined 2",
+   "notes": "Advanced Vapor Core",
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 504000,
-   "EV_kps": 19.62,
+   "requiredProjectName": "Project_AdvancedCavityDrive",
+   "thrust_N": 330000,
+   "EV_kps": 24.48,
    "specificPower_kgMW": 0,
-   "efficiency": 0.53,
+   "efficiency": 0.85,
+   "thrustRating_GW": "4.039",
+   "req power": "4.752",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Gas_Core_Fission",
-   "thrustCap": 20,
+   "thrustCap": 16,
    "cooling": "Closed",
-   "requiredProjectName": "Project_AdvancedVortexDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -5819,23 +6344,25 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_AdvancedVortexDrive"
+   "iconResource": "shipbuildericons/ICO_AdvancedCavityDrive"
 },
  {
-   "dataName": "AdvancedVortexDrivex2",
-   "friendlyName": "Advanced Vortex Drive x2",
+   "dataName": "AdvancedCavityDrivex2",
+   "friendlyName": "Advanced Cavity Drive x2",
    "thrusters": 2,
-   "notes": "Vortex Confined 2",
+   "notes": "Advanced Vapor Core",
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 1008000,
-   "EV_kps": 19.62,
+   "requiredProjectName": "Project_AdvancedCavityDrive",
+   "thrust_N": 660000,
+   "EV_kps": 24.48,
    "specificPower_kgMW": 0,
-   "efficiency": 0.53,
+   "efficiency": 0.85,
+   "thrustRating_GW": "8.078",
+   "req power": "9.504",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Gas_Core_Fission",
-   "thrustCap": 20,
+   "thrustCap": 16,
    "cooling": "Closed",
-   "requiredProjectName": "Project_AdvancedVortexDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -5843,23 +6370,25 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_AdvancedVortexDrive"
+   "iconResource": "shipbuildericons/ICO_AdvancedCavityDrive"
 },
  {
-   "dataName": "AdvancedVortexDrivex3",
-   "friendlyName": "Advanced Vortex Drive x3",
+   "dataName": "AdvancedCavityDrivex3",
+   "friendlyName": "Advanced Cavity Drive x3",
    "thrusters": 3,
-   "notes": "Vortex Confined 2",
+   "notes": "Advanced Vapor Core",
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 1512000,
-   "EV_kps": 19.62,
+   "requiredProjectName": "Project_AdvancedCavityDrive",
+   "thrust_N": 990000,
+   "EV_kps": 24.48,
    "specificPower_kgMW": 0,
-   "efficiency": 0.53,
+   "efficiency": 0.85,
+   "thrustRating_GW": "12.118",
+   "req power": "14.256",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Gas_Core_Fission",
-   "thrustCap": 20,
+   "thrustCap": 16,
    "cooling": "Closed",
-   "requiredProjectName": "Project_AdvancedVortexDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -5867,23 +6396,25 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_AdvancedVortexDrive"
+   "iconResource": "shipbuildericons/ICO_AdvancedCavityDrive"
 },
  {
-   "dataName": "AdvancedVortexDrivex4",
-   "friendlyName": "Advanced Vortex Drive x4",
+   "dataName": "AdvancedCavityDrivex4",
+   "friendlyName": "Advanced Cavity Drive x4",
    "thrusters": 4,
-   "notes": "Vortex Confined 2",
+   "notes": "Advanced Vapor Core",
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 2016000,
-   "EV_kps": 19.62,
+   "requiredProjectName": "Project_AdvancedCavityDrive",
+   "thrust_N": 1320000,
+   "EV_kps": 24.48,
    "specificPower_kgMW": 0,
-   "efficiency": 0.53,
+   "efficiency": 0.85,
+   "thrustRating_GW": "16.157",
+   "req power": "19.008",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Gas_Core_Fission",
-   "thrustCap": 20,
+   "thrustCap": 16,
    "cooling": "Closed",
-   "requiredProjectName": "Project_AdvancedVortexDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -5891,23 +6422,25 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_AdvancedVortexDrive"
+   "iconResource": "shipbuildericons/ICO_AdvancedCavityDrive"
 },
  {
-   "dataName": "AdvancedVortexDrivex5",
-   "friendlyName": "Advanced Vortex Drive x5",
+   "dataName": "AdvancedCavityDrivex5",
+   "friendlyName": "Advanced Cavity Drive x5",
    "thrusters": 5,
-   "notes": "Vortex Confined 2",
+   "notes": "Advanced Vapor Core",
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 2520000,
-   "EV_kps": 19.62,
+   "requiredProjectName": "Project_AdvancedCavityDrive",
+   "thrust_N": 1650000,
+   "EV_kps": 24.48,
    "specificPower_kgMW": 0,
-   "efficiency": 0.53,
+   "efficiency": 0.85,
+   "thrustRating_GW": "20.196",
+   "req power": "23.760",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Gas_Core_Fission",
-   "thrustCap": 20,
+   "thrustCap": 16,
    "cooling": "Closed",
-   "requiredProjectName": "Project_AdvancedVortexDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -5915,23 +6448,25 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_AdvancedVortexDrive"
+   "iconResource": "shipbuildericons/ICO_AdvancedCavityDrive"
 },
  {
-   "dataName": "AdvancedVortexDrivex6",
-   "friendlyName": "Advanced Vortex Drive x6",
+   "dataName": "AdvancedCavityDrivex6",
+   "friendlyName": "Advanced Cavity Drive x6",
    "thrusters": 6,
-   "notes": "Vortex Confined 2",
+   "notes": "Advanced Vapor Core",
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 3024000,
-   "EV_kps": 19.62,
+   "requiredProjectName": "Project_AdvancedCavityDrive",
+   "thrust_N": 1980000,
+   "EV_kps": 24.48,
    "specificPower_kgMW": 0,
-   "efficiency": 0.53,
+   "efficiency": 0.85,
+   "thrustRating_GW": "24.235",
+   "req power": "28.512",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Gas_Core_Fission",
-   "thrustCap": 20,
+   "thrustCap": 16,
    "cooling": "Closed",
-   "requiredProjectName": "Project_AdvancedVortexDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -5939,23 +6474,24 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_AdvancedVortexDrive"
+   "iconResource": "shipbuildericons/ICO_AdvancedCavityDrive"
 },
  {
-   "dataName": "CavityDrivex1",
-   "friendlyName": "Cavity Drive x1",
+   "dataName": "QuartzDrivex1",
+   "friendlyName": "Quartz Drive x1",
    "thrusters": 1,
-   "notes": "Vapor Core Lightbulb",
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 56400,
-   "EV_kps": 19.62,
+   "requiredProjectName": "Project_QuartzDrive",
+   "thrust_N": 117700,
+   "EV_kps": 10.8,
    "specificPower_kgMW": 0,
    "efficiency": 0.85,
+   "thrustRating_GW": "0.636",
+   "req power": "0.748",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Gas_Core_Fission",
-   "thrustCap": 20,
+   "thrustCap": 12,
    "cooling": "Closed",
-   "requiredProjectName": "Project_CavityDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -5963,23 +6499,24 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_CavityDrive"
+   "iconResource": "shipbuildericons/ICO_QuartzDrive"
 },
  {
-   "dataName": "CavityDrivex2",
-   "friendlyName": "Cavity Drive x2",
+   "dataName": "QuartzDrivex2",
+   "friendlyName": "Quartz Drive x2",
    "thrusters": 2,
-   "notes": "Vapor Core Lightbulb",
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 112800,
-   "EV_kps": 19.62,
+   "requiredProjectName": "Project_QuartzDrive",
+   "thrust_N": 235400,
+   "EV_kps": 10.8,
    "specificPower_kgMW": 0,
    "efficiency": 0.85,
+   "thrustRating_GW": "1.271",
+   "req power": "1.495",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Gas_Core_Fission",
-   "thrustCap": 20,
+   "thrustCap": 12,
    "cooling": "Closed",
-   "requiredProjectName": "Project_CavityDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -5987,23 +6524,24 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_CavityDrive"
+   "iconResource": "shipbuildericons/ICO_QuartzDrive"
 },
  {
-   "dataName": "CavityDrivex3",
-   "friendlyName": "Cavity Drive x3",
+   "dataName": "QuartzDrivex3",
+   "friendlyName": "Quartz Drive x3",
    "thrusters": 3,
-   "notes": "Vapor Core Lightbulb",
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 169200,
-   "EV_kps": 19.62,
+   "requiredProjectName": "Project_QuartzDrive",
+   "thrust_N": 353100,
+   "EV_kps": 10.8,
    "specificPower_kgMW": 0,
    "efficiency": 0.85,
+   "thrustRating_GW": "1.907",
+   "req power": "2.243",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Gas_Core_Fission",
-   "thrustCap": 20,
+   "thrustCap": 12,
    "cooling": "Closed",
-   "requiredProjectName": "Project_CavityDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -6011,23 +6549,24 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_CavityDrive"
+   "iconResource": "shipbuildericons/ICO_QuartzDrive"
 },
  {
-   "dataName": "CavityDrivex4",
-   "friendlyName": "Cavity Drive x4",
+   "dataName": "QuartzDrivex4",
+   "friendlyName": "Quartz Drive x4",
    "thrusters": 4,
-   "notes": "Vapor Core Lightbulb",
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 225600,
-   "EV_kps": 19.62,
+   "requiredProjectName": "Project_QuartzDrive",
+   "thrust_N": 470800,
+   "EV_kps": 10.8,
    "specificPower_kgMW": 0,
    "efficiency": 0.85,
+   "thrustRating_GW": "2.542",
+   "req power": "2.991",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Gas_Core_Fission",
-   "thrustCap": 20,
+   "thrustCap": 12,
    "cooling": "Closed",
-   "requiredProjectName": "Project_CavityDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -6035,23 +6574,24 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_CavityDrive"
+   "iconResource": "shipbuildericons/ICO_QuartzDrive"
 },
  {
-   "dataName": "CavityDrivex5",
-   "friendlyName": "Cavity Drive x5",
+   "dataName": "QuartzDrivex5",
+   "friendlyName": "Quartz Drive x5",
    "thrusters": 5,
-   "notes": "Vapor Core Lightbulb",
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 282000,
-   "EV_kps": 19.62,
+   "requiredProjectName": "Project_QuartzDrive",
+   "thrust_N": 588500,
+   "EV_kps": 10.8,
    "specificPower_kgMW": 0,
    "efficiency": 0.85,
+   "thrustRating_GW": "3.178",
+   "req power": "3.739",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Gas_Core_Fission",
-   "thrustCap": 20,
+   "thrustCap": 12,
    "cooling": "Closed",
-   "requiredProjectName": "Project_CavityDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -6059,23 +6599,24 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_CavityDrive"
+   "iconResource": "shipbuildericons/ICO_QuartzDrive"
 },
  {
-   "dataName": "CavityDrivex6",
-   "friendlyName": "Cavity Drive x6",
+   "dataName": "QuartzDrivex6",
+   "friendlyName": "Quartz Drive x6",
    "thrusters": 6,
-   "notes": "Vapor Core Lightbulb",
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 338400,
-   "EV_kps": 19.62,
+   "requiredProjectName": "Project_QuartzDrive",
+   "thrust_N": 706200,
+   "EV_kps": 10.8,
    "specificPower_kgMW": 0,
    "efficiency": 0.85,
+   "thrustRating_GW": "3.813",
+   "req power": "4.486",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Gas_Core_Fission",
-   "thrustCap": 20,
+   "thrustCap": 12,
    "cooling": "Closed",
-   "requiredProjectName": "Project_CavityDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -6083,23 +6624,25 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_CavityDrive"
+   "iconResource": "shipbuildericons/ICO_QuartzDrive"
 },
  {
-   "dataName": "AdvancedCavityDrivex1",
-   "friendlyName": "Advanced Cavity Drive x1",
+   "dataName": "LightbulbDrivex1",
+   "friendlyName": "Lightbulb Drive x1",
    "thrusters": 1,
-   "notes": "Advanced Vapor Core",
+   "notes": "NASA Nuclear Lightbulb",
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 330000,
-   "EV_kps": 24.48,
+   "requiredProjectName": "Project_LightbulbDrive",
+   "thrust_N": 409000,
+   "EV_kps": 18.3,
    "specificPower_kgMW": 0,
    "efficiency": 0.85,
+   "thrustRating_GW": "3.742",
+   "req power": "4.403",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Gas_Core_Fission",
-   "thrustCap": 20,
+   "thrustCap": 15,
    "cooling": "Closed",
-   "requiredProjectName": "Project_AdvancedCavityDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -6107,23 +6650,24 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_AdvancedCavityDrive"
+   "iconResource": "shipbuildericons/ICO_LightbulbDrive"
 },
  {
-   "dataName": "AdvancedCavityDrivex2",
-   "friendlyName": "Advanced Cavity Drive x2",
+   "dataName": "LightbulbDrivex2",
+   "friendlyName": "Lightbulb Drive x2",
    "thrusters": 2,
-   "notes": "Advanced Vapor Core",
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 660000,
-   "EV_kps": 24.48,
+   "requiredProjectName": "Project_LightbulbDrive",
+   "thrust_N": 818000,
+   "EV_kps": 18.3,
    "specificPower_kgMW": 0,
    "efficiency": 0.85,
+   "thrustRating_GW": "7.485",
+   "req power": "8.806",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Gas_Core_Fission",
-   "thrustCap": 20,
+   "thrustCap": 15,
    "cooling": "Closed",
-   "requiredProjectName": "Project_AdvancedCavityDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -6131,23 +6675,24 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_AdvancedCavityDrive"
+   "iconResource": "shipbuildericons/ICO_LightbulbDrive"
 },
  {
-   "dataName": "AdvancedCavityDrivex3",
-   "friendlyName": "Advanced Cavity Drive x3",
+   "dataName": "LightbulbDrivex3",
+   "friendlyName": "Lightbulb Drive x3",
    "thrusters": 3,
-   "notes": "Advanced Vapor Core",
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 990000,
-   "EV_kps": 24.48,
+   "requiredProjectName": "Project_LightbulbDrive",
+   "thrust_N": 1227000,
+   "EV_kps": 18.3,
    "specificPower_kgMW": 0,
    "efficiency": 0.85,
+   "thrustRating_GW": "11.227",
+   "req power": "13.208",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Gas_Core_Fission",
-   "thrustCap": 20,
+   "thrustCap": 15,
    "cooling": "Closed",
-   "requiredProjectName": "Project_AdvancedCavityDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -6155,23 +6700,24 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_AdvancedCavityDrive"
+   "iconResource": "shipbuildericons/ICO_LightbulbDrive"
 },
  {
-   "dataName": "AdvancedCavityDrivex4",
-   "friendlyName": "Advanced Cavity Drive x4",
+   "dataName": "LightbulbDrivex4",
+   "friendlyName": "Lightbulb Drive x4",
    "thrusters": 4,
-   "notes": "Advanced Vapor Core",
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 1320000,
-   "EV_kps": 24.48,
+   "requiredProjectName": "Project_LightbulbDrive",
+   "thrust_N": 1636000,
+   "EV_kps": 18.3,
    "specificPower_kgMW": 0,
    "efficiency": 0.85,
+   "thrustRating_GW": "14.969",
+   "req power": "17.611",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Gas_Core_Fission",
-   "thrustCap": 20,
+   "thrustCap": 15,
    "cooling": "Closed",
-   "requiredProjectName": "Project_AdvancedCavityDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -6179,23 +6725,24 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_AdvancedCavityDrive"
+   "iconResource": "shipbuildericons/ICO_LightbulbDrive"
 },
  {
-   "dataName": "AdvancedCavityDrivex5",
-   "friendlyName": "Advanced Cavity Drive x5",
+   "dataName": "LightbulbDrivex5",
+   "friendlyName": "Lightbulb Drive x5",
    "thrusters": 5,
-   "notes": "Advanced Vapor Core",
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 1650000,
-   "EV_kps": 24.48,
+   "requiredProjectName": "Project_LightbulbDrive",
+   "thrust_N": 2045000,
+   "EV_kps": 18.3,
    "specificPower_kgMW": 0,
    "efficiency": 0.85,
+   "thrustRating_GW": "18.712",
+   "req power": "22.014",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Gas_Core_Fission",
-   "thrustCap": 20,
+   "thrustCap": 15,
    "cooling": "Closed",
-   "requiredProjectName": "Project_AdvancedCavityDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -6203,23 +6750,24 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_AdvancedCavityDrive"
+   "iconResource": "shipbuildericons/ICO_LightbulbDrive"
 },
  {
-   "dataName": "AdvancedCavityDrivex6",
-   "friendlyName": "Advanced Cavity Drive x6",
+   "dataName": "LightbulbDrivex6",
+   "friendlyName": "Lightbulb Drive x6",
    "thrusters": 6,
-   "notes": "Advanced Vapor Core",
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 1980000,
-   "EV_kps": 24.48,
+   "requiredProjectName": "Project_LightbulbDrive",
+   "thrust_N": 2454000,
+   "EV_kps": 18.3,
    "specificPower_kgMW": 0,
    "efficiency": 0.85,
+   "thrustRating_GW": "22.454",
+   "req power": "26.417",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Gas_Core_Fission",
-   "thrustCap": 20,
+   "thrustCap": 15,
    "cooling": "Closed",
-   "requiredProjectName": "Project_AdvancedCavityDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -6227,22 +6775,25 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_AdvancedCavityDrive"
+   "iconResource": "shipbuildericons/ICO_LightbulbDrive"
 },
  {
-   "dataName": "QuartzDrivex1",
-   "friendlyName": "Quartz Drive x1",
+   "dataName": "PharosDrivex1",
+   "friendlyName": "Pharos Drive x1",
    "thrusters": 1,
+   "notes": "Gaseous Core NTR closed 1",
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 117700,
-   "EV_kps": 10.8,
+   "requiredProjectName": "Project_PharosDrive",
+   "thrust_N": 445000,
+   "EV_kps": 20.4,
    "specificPower_kgMW": 0,
    "efficiency": 0.85,
+   "thrustRating_GW": "4.539",
+   "req power": "5.340",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Gas_Core_Fission",
-   "thrustCap": 20,
+   "thrustCap": 16,
    "cooling": "Closed",
-   "requiredProjectName": "Project_QuartzDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -6250,22 +6801,24 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_QuartzDrive"
+   "iconResource": "shipbuildericons/ICO_PharosDrive"
 },
  {
-   "dataName": "QuartzDrivex2",
-   "friendlyName": "Quartz Drive x2",
+   "dataName": "PharosDrivex2",
+   "friendlyName": "Pharos Drive x2",
    "thrusters": 2,
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 235400,
-   "EV_kps": 10.8,
+   "requiredProjectName": "Project_PharosDrive",
+   "thrust_N": 890000,
+   "EV_kps": 20.4,
    "specificPower_kgMW": 0,
    "efficiency": 0.85,
+   "thrustRating_GW": "9.078",
+   "req power": "10.680",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Gas_Core_Fission",
-   "thrustCap": 20,
+   "thrustCap": 16,
    "cooling": "Closed",
-   "requiredProjectName": "Project_QuartzDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -6273,22 +6826,24 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_QuartzDrive"
+   "iconResource": "shipbuildericons/ICO_PharosDrive"
 },
  {
-   "dataName": "QuartzDrivex3",
-   "friendlyName": "Quartz Drive x3",
+   "dataName": "PharosDrivex3",
+   "friendlyName": "Pharos Drive x3",
    "thrusters": 3,
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 353100,
-   "EV_kps": 10.8,
+   "requiredProjectName": "Project_PharosDrive",
+   "thrust_N": 1335000,
+   "EV_kps": 20.4,
    "specificPower_kgMW": 0,
    "efficiency": 0.85,
+   "thrustRating_GW": "13.617",
+   "req power": "16.020",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Gas_Core_Fission",
-   "thrustCap": 20,
+   "thrustCap": 16,
    "cooling": "Closed",
-   "requiredProjectName": "Project_QuartzDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -6296,22 +6851,24 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_QuartzDrive"
+   "iconResource": "shipbuildericons/ICO_PharosDrive"
 },
  {
-   "dataName": "QuartzDrivex4",
-   "friendlyName": "Quartz Drive x4",
+   "dataName": "PharosDrivex4",
+   "friendlyName": "Pharos Drive x4",
    "thrusters": 4,
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 470800,
-   "EV_kps": 10.8,
+   "requiredProjectName": "Project_PharosDrive",
+   "thrust_N": 1780000,
+   "EV_kps": 20.4,
    "specificPower_kgMW": 0,
    "efficiency": 0.85,
+   "thrustRating_GW": "18.156",
+   "req power": "21.360",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Gas_Core_Fission",
-   "thrustCap": 20,
+   "thrustCap": 16,
    "cooling": "Closed",
-   "requiredProjectName": "Project_QuartzDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -6319,22 +6876,24 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_QuartzDrive"
+   "iconResource": "shipbuildericons/ICO_PharosDrive"
 },
  {
-   "dataName": "QuartzDrivex5",
-   "friendlyName": "Quartz Drive x5",
+   "dataName": "PharosDrivex5",
+   "friendlyName": "Pharos Drive x5",
    "thrusters": 5,
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 588500,
-   "EV_kps": 10.8,
+   "requiredProjectName": "Project_PharosDrive",
+   "thrust_N": 2225000,
+   "EV_kps": 20.4,
    "specificPower_kgMW": 0,
    "efficiency": 0.85,
+   "thrustRating_GW": "22.695",
+   "req power": "26.700",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Gas_Core_Fission",
-   "thrustCap": 20,
+   "thrustCap": 16,
    "cooling": "Closed",
-   "requiredProjectName": "Project_QuartzDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -6342,22 +6901,24 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_QuartzDrive"
+   "iconResource": "shipbuildericons/ICO_PharosDrive"
 },
  {
-   "dataName": "QuartzDrivex6",
-   "friendlyName": "Quartz Drive x6",
+   "dataName": "PharosDrivex6",
+   "friendlyName": "Pharos Drive x6",
    "thrusters": 6,
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 706200,
-   "EV_kps": 10.8,
+   "requiredProjectName": "Project_PharosDrive",
+   "thrust_N": 2670000,
+   "EV_kps": 20.4,
    "specificPower_kgMW": 0,
    "efficiency": 0.85,
+   "thrustRating_GW": "27.234",
+   "req power": "32.040",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Gas_Core_Fission",
-   "thrustCap": 20,
+   "thrustCap": 16,
    "cooling": "Closed",
-   "requiredProjectName": "Project_QuartzDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -6365,22 +6926,25 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_QuartzDrive"
+   "iconResource": "shipbuildericons/ICO_PharosDrive"
 },
  {
-   "dataName": "LightbulbDrivex1",
-   "friendlyName": "Lightbulb Drive x1",
+   "dataName": "LodestarFissionLanternx1",
+   "friendlyName": "Lodestar Fission Lantern x1",
    "thrusters": 1,
+   "notes": "Gas Core NTR closed 2 Max EV",
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 409000,
-   "EV_kps": 18.3,
+   "requiredProjectName": "Project_LodestarFissionLantern",
+   "thrust_N": 11000000,
+   "EV_kps": 31.4,
    "specificPower_kgMW": 0,
-   "efficiency": 0.85,
+   "efficiency": 0.925,
+   "thrustRating_GW": "172.700",
+   "req power": "186.703",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Gas_Core_Fission",
    "thrustCap": 20,
    "cooling": "Closed",
-   "requiredProjectName": "Project_LightbulbDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -6388,22 +6952,24 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_LightbulbDrive"
+   "iconResource": "shipbuildericons/ICO_LodestarFissionLantern"
 },
  {
-   "dataName": "LightbulbDrivex2",
-   "friendlyName": "Lightbulb Drive x2",
+   "dataName": "LodestarFissionLanternx2",
+   "friendlyName": "Lodestar Fission Lantern x2",
    "thrusters": 2,
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 818000,
-   "EV_kps": 18.3,
+   "requiredProjectName": "Project_LodestarFissionLantern",
+   "thrust_N": 22000000,
+   "EV_kps": 31.4,
    "specificPower_kgMW": 0,
-   "efficiency": 0.85,
+   "efficiency": 0.925,
+   "thrustRating_GW": "345.400",
+   "req power": "373.405",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Gas_Core_Fission",
    "thrustCap": 20,
    "cooling": "Closed",
-   "requiredProjectName": "Project_LightbulbDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -6411,22 +6977,24 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_LightbulbDrive"
+   "iconResource": "shipbuildericons/ICO_LodestarFissionLantern"
 },
  {
-   "dataName": "LightbulbDrivex3",
-   "friendlyName": "Lightbulb Drive x3",
+   "dataName": "LodestarFissionLanternx3",
+   "friendlyName": "Lodestar Fission Lantern x3",
    "thrusters": 3,
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 1227000,
-   "EV_kps": 18.3,
+   "requiredProjectName": "Project_LodestarFissionLantern",
+   "thrust_N": 33000000,
+   "EV_kps": 31.4,
    "specificPower_kgMW": 0,
-   "efficiency": 0.85,
+   "efficiency": 0.925,
+   "thrustRating_GW": "518.100",
+   "req power": "560.108",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Gas_Core_Fission",
    "thrustCap": 20,
    "cooling": "Closed",
-   "requiredProjectName": "Project_LightbulbDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -6434,22 +7002,24 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_LightbulbDrive"
+   "iconResource": "shipbuildericons/ICO_LodestarFissionLantern"
 },
  {
-   "dataName": "LightbulbDrivex4",
-   "friendlyName": "Lightbulb Drive x4",
+   "dataName": "LodestarFissionLanternx4",
+   "friendlyName": "Lodestar Fission Lantern x4",
    "thrusters": 4,
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 1636000,
-   "EV_kps": 18.3,
+   "requiredProjectName": "Project_LodestarFissionLantern",
+   "thrust_N": 44000000,
+   "EV_kps": 31.4,
    "specificPower_kgMW": 0,
-   "efficiency": 0.85,
+   "efficiency": 0.925,
+   "thrustRating_GW": "690.800",
+   "req power": "746.811",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Gas_Core_Fission",
    "thrustCap": 20,
    "cooling": "Closed",
-   "requiredProjectName": "Project_LightbulbDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -6457,22 +7027,24 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_LightbulbDrive"
+   "iconResource": "shipbuildericons/ICO_LodestarFissionLantern"
 },
  {
-   "dataName": "LightbulbDrivex5",
-   "friendlyName": "Lightbulb Drive x5",
+   "dataName": "LodestarFissionLanternx5",
+   "friendlyName": "Lodestar Fission Lantern x5",
    "thrusters": 5,
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 2045000,
-   "EV_kps": 18.3,
+   "requiredProjectName": "Project_LodestarFissionLantern",
+   "thrust_N": 55000000,
+   "EV_kps": 31.4,
    "specificPower_kgMW": 0,
-   "efficiency": 0.85,
+   "efficiency": 0.925,
+   "thrustRating_GW": "863.500",
+   "req power": "933.514",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Gas_Core_Fission",
    "thrustCap": 20,
    "cooling": "Closed",
-   "requiredProjectName": "Project_LightbulbDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -6480,22 +7052,24 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_LightbulbDrive"
+   "iconResource": "shipbuildericons/ICO_LodestarFissionLantern"
 },
  {
-   "dataName": "LightbulbDrivex6",
-   "friendlyName": "Lightbulb Drive x6",
+   "dataName": "LodestarFissionLanternx6",
+   "friendlyName": "Lodestar Fission Lantern x6",
    "thrusters": 6,
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 2454000,
-   "EV_kps": 18.3,
+   "requiredProjectName": "Project_LodestarFissionLantern",
+   "thrust_N": 66000000,
+   "EV_kps": 31.4,
    "specificPower_kgMW": 0,
-   "efficiency": 0.85,
+   "efficiency": 0.925,
+   "thrustRating_GW": "1,036.200",
+   "req power": "1,120.216",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Gas_Core_Fission",
    "thrustCap": 20,
    "cooling": "Closed",
-   "requiredProjectName": "Project_LightbulbDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -6503,587 +7077,660 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_LightbulbDrive"
+   "iconResource": "shipbuildericons/ICO_LodestarFissionLantern"
 },
  {
-   "dataName": "PharosDrivex1",
-   "friendlyName": "Pharos Drive x1",
+   "dataName": "FissionFragDrivex1",
+   "friendlyName": "Fission Frag Drive x1",
    "thrusters": 1,
-   "notes": "Gaseous Core NTR closed 1",
+   "notes": "Fission Fragment 1",
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 445000,
-   "EV_kps": 20.4,
+   "requiredProjectName": "Project_FissionFragDrive",
+   "thrust_N": 4651,
+   "EV_kps": 313.9,
    "specificPower_kgMW": 0,
-   "efficiency": 0.85,
+   "efficiency": 0.46,
+   "thrustRating_GW": "0.730",
+   "req power": "1.587",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Gas_Core_Fission",
-   "thrustCap": 20,
-   "cooling": "Closed",
-   "requiredProjectName": "Project_PharosDrive",
+   "requiredPowerPlant": "Solid_Core_Fission",
+   "thrustCap": 2,
+   "cooling": "Open",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Hydrogen",
+   "propellant": "ReactionProducts",
    "perTankPropellantMaterials": {
-      "water": 1
+      "fissiles": 1
    },
-   "iconResource": "shipbuildericons/ICO_PharosDrive"
+   "iconResource": "shipbuildericons/ICO_FissionFragDrive"
 },
  {
-   "dataName": "PharosDrivex2",
-   "friendlyName": "Pharos Drive x2",
+   "dataName": "FissionFragDrivex2",
+   "friendlyName": "Fission Frag Drive x2",
    "thrusters": 2,
+   "notes": "Fission Fragment 1",
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 890000,
-   "EV_kps": 20.4,
+   "requiredProjectName": "Project_FissionFragDrive",
+   "thrust_N": 9302,
+   "EV_kps": 313.9,
    "specificPower_kgMW": 0,
-   "efficiency": 0.85,
+   "efficiency": 0.46,
+   "thrustRating_GW": "1.460",
+   "req power": "3.174",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Gas_Core_Fission",
-   "thrustCap": 20,
-   "cooling": "Closed",
-   "requiredProjectName": "Project_PharosDrive",
+   "requiredPowerPlant": "Solid_Core_Fission",
+   "thrustCap": 2,
+   "cooling": "Open",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Hydrogen",
+   "propellant": "ReactionProducts",
    "perTankPropellantMaterials": {
-      "water": 1
+      "fissiles": 1
    },
-   "iconResource": "shipbuildericons/ICO_PharosDrive"
+   "iconResource": "shipbuildericons/ICO_FissionFragDrive"
 },
  {
-   "dataName": "PharosDrivex3",
-   "friendlyName": "Pharos Drive x3",
+   "dataName": "FissionFragDrivex3",
+   "friendlyName": "Fission Frag Drive x3",
    "thrusters": 3,
+   "notes": "Fission Fragment 1",
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 1335000,
-   "EV_kps": 20.4,
+   "requiredProjectName": "Project_FissionFragDrive",
+   "thrust_N": 13953,
+   "EV_kps": 313.9,
    "specificPower_kgMW": 0,
-   "efficiency": 0.85,
+   "efficiency": 0.46,
+   "thrustRating_GW": "2.190",
+   "req power": "4.761",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Gas_Core_Fission",
-   "thrustCap": 20,
-   "cooling": "Closed",
-   "requiredProjectName": "Project_PharosDrive",
+   "requiredPowerPlant": "Solid_Core_Fission",
+   "thrustCap": 2,
+   "cooling": "Open",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Hydrogen",
+   "propellant": "ReactionProducts",
    "perTankPropellantMaterials": {
-      "water": 1
+      "fissiles": 1
    },
-   "iconResource": "shipbuildericons/ICO_PharosDrive"
+   "iconResource": "shipbuildericons/ICO_FissionFragDrive"
 },
  {
-   "dataName": "PharosDrivex4",
-   "friendlyName": "Pharos Drive x4",
+   "dataName": "FissionFragDrivex4",
+   "friendlyName": "Fission Frag Drive x4",
    "thrusters": 4,
+   "notes": "Fission Fragment 1",
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 1780000,
-   "EV_kps": 20.4,
+   "requiredProjectName": "Project_FissionFragDrive",
+   "thrust_N": 18604,
+   "EV_kps": 313.9,
    "specificPower_kgMW": 0,
-   "efficiency": 0.85,
+   "efficiency": 0.46,
+   "thrustRating_GW": "2.920",
+   "req power": "6.348",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Gas_Core_Fission",
-   "thrustCap": 20,
-   "cooling": "Closed",
-   "requiredProjectName": "Project_PharosDrive",
+   "requiredPowerPlant": "Solid_Core_Fission",
+   "thrustCap": 2,
+   "cooling": "Open",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Hydrogen",
+   "propellant": "ReactionProducts",
    "perTankPropellantMaterials": {
-      "water": 1
+      "fissiles": 1
    },
-   "iconResource": "shipbuildericons/ICO_PharosDrive"
+   "iconResource": "shipbuildericons/ICO_FissionFragDrive"
 },
  {
-   "dataName": "PharosDrivex5",
-   "friendlyName": "Pharos Drive x5",
+   "dataName": "FissionFragDrivex5",
+   "friendlyName": "Fission Frag Drive x5",
    "thrusters": 5,
+   "notes": "Fission Fragment 1",
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 2225000,
-   "EV_kps": 20.4,
+   "requiredProjectName": "Project_FissionFragDrive",
+   "thrust_N": 23255,
+   "EV_kps": 313.9,
    "specificPower_kgMW": 0,
-   "efficiency": 0.85,
+   "efficiency": 0.46,
+   "thrustRating_GW": "3.650",
+   "req power": "7.935",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Gas_Core_Fission",
-   "thrustCap": 20,
-   "cooling": "Closed",
-   "requiredProjectName": "Project_PharosDrive",
+   "requiredPowerPlant": "Solid_Core_Fission",
+   "thrustCap": 2,
+   "cooling": "Open",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Hydrogen",
+   "propellant": "ReactionProducts",
    "perTankPropellantMaterials": {
-      "water": 1
+      "fissiles": 1
    },
-   "iconResource": "shipbuildericons/ICO_PharosDrive"
+   "iconResource": "shipbuildericons/ICO_FissionFragDrive"
 },
  {
-   "dataName": "PharosDrivex6",
-   "friendlyName": "Pharos Drive x6",
+   "dataName": "FissionFragDrivex6",
+   "friendlyName": "Fission Frag Drive x6",
    "thrusters": 6,
+   "notes": "Fission Fragment 1",
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 2670000,
-   "EV_kps": 20.4,
+   "requiredProjectName": "Project_FissionFragDrive",
+   "thrust_N": 27906,
+   "EV_kps": 313.9,
    "specificPower_kgMW": 0,
-   "efficiency": 0.85,
+   "efficiency": 0.46,
+   "thrustRating_GW": "4.380",
+   "req power": "9.521",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Gas_Core_Fission",
-   "thrustCap": 20,
-   "cooling": "Closed",
-   "requiredProjectName": "Project_PharosDrive",
+   "requiredPowerPlant": "Solid_Core_Fission",
+   "thrustCap": 2,
+   "cooling": "Open",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Hydrogen",
+   "propellant": "ReactionProducts",
    "perTankPropellantMaterials": {
-      "water": 1
+      "fissiles": 1
    },
-   "iconResource": "shipbuildericons/ICO_PharosDrive"
+   "iconResource": "shipbuildericons/ICO_FissionFragDrive"
 },
  {
-   "dataName": "FissionLanternx1",
-   "friendlyName": "Fission Lantern x1",
+   "dataName": "DustyPlasmaDrivex1",
+   "friendlyName": "Dusty Plasma Drive x1",
    "thrusters": 1,
+   "notes": "Dusty Plasma (Fission Fragment 2)",
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 11000000,
-   "EV_kps": 31.4,
+   "requiredProjectName": "Project_DustyPlasmaDrive",
+   "thrust_N": 5504,
+   "EV_kps": 3750,
    "specificPower_kgMW": 0,
-   "efficiency": 0.925,
+   "efficiency": 0.46,
+   "thrustRating_GW": "10.320",
+   "req power": "22.435",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Gas_Core_Fission",
-   "thrustCap": 20,
-   "cooling": "Closed",
-   "requiredProjectName": "Project_FissionLantern",
+   "thrustCap": 160,
+   "cooling": "Open",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Hydrogen",
+   "propellant": "ReactionProducts",
    "perTankPropellantMaterials": {
-      "water": 1
+      "fissiles": 1
    },
-   "iconResource": "shipbuildericons/ICO_FissionLantern"
+   "iconResource": "shipbuildericons/ICO_DustyPlasmaDrive"
 },
  {
-   "dataName": "FissionLanternx2",
-   "friendlyName": "Fission Lantern x2",
+   "dataName": "DustyPlasmaDrivex2",
+   "friendlyName": "Dusty Plasma Drive x2",
    "thrusters": 2,
+   "notes": "Dusty Plasma (Fission Fragment 2)",
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 22000000,
-   "EV_kps": 31.4,
+   "requiredProjectName": "Project_DustyPlasmaDrive",
+   "thrust_N": 11008,
+   "EV_kps": 3750,
    "specificPower_kgMW": 0,
-   "efficiency": 0.925,
+   "efficiency": 0.46,
+   "thrustRating_GW": "20.640",
+   "req power": "44.870",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Gas_Core_Fission",
-   "thrustCap": 20,
-   "cooling": "Closed",
-   "requiredProjectName": "Project_FissionLantern",
+   "thrustCap": 160,
+   "cooling": "Open",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Hydrogen",
+   "propellant": "ReactionProducts",
    "perTankPropellantMaterials": {
-      "water": 1
+      "fissiles": 1
    },
-   "iconResource": "shipbuildericons/ICO_FissionLantern"
+   "iconResource": "shipbuildericons/ICO_DustyPlasmaDrive"
 },
  {
-   "dataName": "FissionLanternx3",
-   "friendlyName": "Fission Lantern x3",
+   "dataName": "DustyPlasmaDrivex3",
+   "friendlyName": "Dusty Plasma Drive x3",
    "thrusters": 3,
+   "notes": "Dusty Plasma (Fission Fragment 2)",
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 33000000,
-   "EV_kps": 31.4,
+   "requiredProjectName": "Project_DustyPlasmaDrive",
+   "thrust_N": 16512,
+   "EV_kps": 3750,
    "specificPower_kgMW": 0,
-   "efficiency": 0.925,
+   "efficiency": 0.46,
+   "thrustRating_GW": "30.960",
+   "req power": "67.304",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Gas_Core_Fission",
-   "thrustCap": 20,
-   "cooling": "Closed",
-   "requiredProjectName": "Project_FissionLantern",
+   "thrustCap": 160,
+   "cooling": "Open",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Hydrogen",
+   "propellant": "ReactionProducts",
    "perTankPropellantMaterials": {
-      "water": 1
+      "fissiles": 1
    },
-   "iconResource": "shipbuildericons/ICO_FissionLantern"
+   "iconResource": "shipbuildericons/ICO_DustyPlasmaDrive"
 },
  {
-   "dataName": "FissionLanternx4",
-   "friendlyName": "Fission Lantern x4",
+   "dataName": "DustyPlasmaDrivex4",
+   "friendlyName": "Dusty Plasma Drive x4",
    "thrusters": 4,
+   "notes": "Dusty Plasma (Fission Fragment 2)",
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 44000000,
-   "EV_kps": 31.4,
+   "requiredProjectName": "Project_DustyPlasmaDrive",
+   "thrust_N": 22016,
+   "EV_kps": 3750,
    "specificPower_kgMW": 0,
-   "efficiency": 0.925,
+   "efficiency": 0.46,
+   "thrustRating_GW": "41.280",
+   "req power": "89.739",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Gas_Core_Fission",
-   "thrustCap": 20,
-   "cooling": "Closed",
-   "requiredProjectName": "Project_FissionLantern",
+   "thrustCap": 160,
+   "cooling": "Open",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Hydrogen",
+   "propellant": "ReactionProducts",
    "perTankPropellantMaterials": {
-      "water": 1
+      "fissiles": 1
    },
-   "iconResource": "shipbuildericons/ICO_FissionLantern"
+   "iconResource": "shipbuildericons/ICO_DustyPlasmaDrive"
 },
  {
-   "dataName": "FissionLanternx5",
-   "friendlyName": "Fission Lantern x5",
+   "dataName": "DustyPlasmaDrivex5",
+   "friendlyName": "Dusty Plasma Drive x5",
    "thrusters": 5,
+   "notes": "Dusty Plasma (Fission Fragment 2)",
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 55000000,
-   "EV_kps": 31.4,
+   "requiredProjectName": "Project_DustyPlasmaDrive",
+   "thrust_N": 27520,
+   "EV_kps": 3750,
    "specificPower_kgMW": 0,
-   "efficiency": 0.925,
+   "efficiency": 0.46,
+   "thrustRating_GW": "51.600",
+   "req power": "112.174",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Gas_Core_Fission",
-   "thrustCap": 20,
-   "cooling": "Closed",
-   "requiredProjectName": "Project_FissionLantern",
+   "thrustCap": 160,
+   "cooling": "Open",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Hydrogen",
+   "propellant": "ReactionProducts",
    "perTankPropellantMaterials": {
-      "water": 1
+      "fissiles": 1
    },
-   "iconResource": "shipbuildericons/ICO_FissionLantern"
+   "iconResource": "shipbuildericons/ICO_DustyPlasmaDrive"
 },
  {
-   "dataName": "FissionLanternx6",
-   "friendlyName": "Fission Lantern x6",
+   "dataName": "DustyPlasmaDrivex6",
+   "friendlyName": "Dusty Plasma Drive x6",
    "thrusters": 6,
+   "notes": "Dusty Plasma (Fission Fragment 2)",
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 66000000,
-   "EV_kps": 31.4,
+   "requiredProjectName": "Project_DustyPlasmaDrive",
+   "thrust_N": 33024,
+   "EV_kps": 3750,
    "specificPower_kgMW": 0,
-   "efficiency": 0.925,
+   "efficiency": 0.46,
+   "thrustRating_GW": "61.920",
+   "req power": "134.609",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Gas_Core_Fission",
-   "thrustCap": 20,
-   "cooling": "Closed",
-   "requiredProjectName": "Project_FissionLantern",
+   "thrustCap": 160,
+   "cooling": "Open",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Hydrogen",
+   "propellant": "ReactionProducts",
    "perTankPropellantMaterials": {
-      "water": 1
+      "fissiles": 1
    },
-   "iconResource": "shipbuildericons/ICO_FissionLantern"
+   "iconResource": "shipbuildericons/ICO_DustyPlasmaDrive"
 },
  {
-   "dataName": "FissionFragDrivex1",
-   "friendlyName": "Fission Frag Drive x1",
+   "dataName": "BurnerDrivex1",
+   "friendlyName": "Burner Drive x1",
    "thrusters": 1,
-   "notes": "Fission Fragment 1",
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 4651,
-   "EV_kps": 313,
+   "requiredProjectName": "Project_BurnerDrive",
+   "thrust_N": 108000,
+   "EV_kps": 69,
    "specificPower_kgMW": 0,
-   "efficiency": 0.46,
+   "efficiency": 0.85,
+   "thrustRating_GW": "3.726",
+   "req power": "4.384",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Gas_Core_Fission",
-   "thrustCap": 20,
+   "thrustCap": 24,
    "cooling": "Open",
-   "requiredProjectName": "Project_FissionFragDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "ReactionProducts",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "fissiles": 1
+      "water": 0.98,
+      "nobleMetals": 0.01,
+      "fissiles": 0.01
    },
-   "iconResource": "shipbuildericons/ICO_FissionFragDrive"
+   "iconResource": "shipbuildericons/ICO_BurnerDrive"
 },
  {
-   "dataName": "FissionFragDrivex2",
-   "friendlyName": "Fission Frag Drive x2",
+   "dataName": "BurnerDrivex2",
+   "friendlyName": "Burner Drive x2",
    "thrusters": 2,
-   "notes": "Fission Fragment 1",
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 9302,
-   "EV_kps": 313,
+   "requiredProjectName": "Project_BurnerDrive",
+   "thrust_N": 216000,
+   "EV_kps": 69,
    "specificPower_kgMW": 0,
-   "efficiency": 0.46,
+   "efficiency": 0.85,
+   "thrustRating_GW": "7.452",
+   "req power": "8.767",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Gas_Core_Fission",
-   "thrustCap": 20,
+   "thrustCap": 24,
    "cooling": "Open",
-   "requiredProjectName": "Project_FissionFragDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "ReactionProducts",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "fissiles": 1
+      "water": 0.98,
+      "nobleMetals": 0.01,
+      "fissiles": 0.01
    },
-   "iconResource": "shipbuildericons/ICO_FissionFragDrive"
+   "iconResource": "shipbuildericons/ICO_BurnerDrive"
 },
  {
-   "dataName": "FissionFragDrivex3",
-   "friendlyName": "Fission Frag Drive x3",
+   "dataName": "BurnerDrivex3",
+   "friendlyName": "Burner Drive x3",
    "thrusters": 3,
-   "notes": "Fission Fragment 1",
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 13953,
-   "EV_kps": 313,
+   "requiredProjectName": "Project_BurnerDrive",
+   "thrust_N": 324000,
+   "EV_kps": 69,
    "specificPower_kgMW": 0,
-   "efficiency": 0.46,
+   "efficiency": 0.85,
+   "thrustRating_GW": "11.178",
+   "req power": "13.151",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Gas_Core_Fission",
-   "thrustCap": 20,
+   "thrustCap": 24,
    "cooling": "Open",
-   "requiredProjectName": "Project_FissionFragDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "ReactionProducts",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "fissiles": 1
+      "water": 0.98,
+      "nobleMetals": 0.01,
+      "fissiles": 0.01
    },
-   "iconResource": "shipbuildericons/ICO_FissionFragDrive"
+   "iconResource": "shipbuildericons/ICO_BurnerDrive"
 },
  {
-   "dataName": "FissionFragDrivex4",
-   "friendlyName": "Fission Frag Drive x4",
+   "dataName": "BurnerDrivex4",
+   "friendlyName": "Burner Drive x4",
    "thrusters": 4,
-   "notes": "Fission Fragment 1",
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 18604,
-   "EV_kps": 313,
+   "requiredProjectName": "Project_BurnerDrive",
+   "thrust_N": 432000,
+   "EV_kps": 69,
    "specificPower_kgMW": 0,
-   "efficiency": 0.46,
+   "efficiency": 0.85,
+   "thrustRating_GW": "14.904",
+   "req power": "17.534",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Gas_Core_Fission",
-   "thrustCap": 20,
+   "thrustCap": 24,
    "cooling": "Open",
-   "requiredProjectName": "Project_FissionFragDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "ReactionProducts",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "fissiles": 1
+      "water": 0.98,
+      "nobleMetals": 0.01,
+      "fissiles": 0.01
    },
-   "iconResource": "shipbuildericons/ICO_FissionFragDrive"
+   "iconResource": "shipbuildericons/ICO_BurnerDrive"
 },
  {
-   "dataName": "FissionFragDrivex5",
-   "friendlyName": "Fission Frag Drive x5",
+   "dataName": "BurnerDrivex5",
+   "friendlyName": "Burner Drive x5",
    "thrusters": 5,
-   "notes": "Fission Fragment 1",
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 23255,
-   "EV_kps": 313,
+   "requiredProjectName": "Project_BurnerDrive",
+   "thrust_N": 540000,
+   "EV_kps": 69,
    "specificPower_kgMW": 0,
-   "efficiency": 0.46,
+   "efficiency": 0.85,
+   "thrustRating_GW": "18.630",
+   "req power": "21.918",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Gas_Core_Fission",
-   "thrustCap": 20,
+   "thrustCap": 24,
    "cooling": "Open",
-   "requiredProjectName": "Project_FissionFragDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "ReactionProducts",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "fissiles": 1
+      "water": 0.98,
+      "nobleMetals": 0.01,
+      "fissiles": 0.01
    },
-   "iconResource": "shipbuildericons/ICO_FissionFragDrive"
+   "iconResource": "shipbuildericons/ICO_BurnerDrive"
 },
  {
-   "dataName": "FissionFragDrivex6",
-   "friendlyName": "Fission Frag Drive x6",
+   "dataName": "BurnerDrivex6",
+   "friendlyName": "Burner Drive x6",
    "thrusters": 6,
-   "notes": "Fission Fragment 1",
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 27906,
-   "EV_kps": 313,
+   "requiredProjectName": "Project_BurnerDrive",
+   "thrust_N": 648000,
+   "EV_kps": 69,
    "specificPower_kgMW": 0,
-   "efficiency": 0.46,
+   "efficiency": 0.85,
+   "thrustRating_GW": "22.356",
+   "req power": "26.301",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Gas_Core_Fission",
-   "thrustCap": 20,
+   "thrustCap": 24,
    "cooling": "Open",
-   "requiredProjectName": "Project_FissionFragDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "ReactionProducts",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "fissiles": 1
+      "water": 0.98,
+      "nobleMetals": 0.01,
+      "fissiles": 0.01
    },
-   "iconResource": "shipbuildericons/ICO_FissionFragDrive"
+   "iconResource": "shipbuildericons/ICO_BurnerDrive"
 },
  {
-   "dataName": "DustyPlasmaDrivex1",
-   "friendlyName": "Dusty Plasma Drive x1",
+   "dataName": "FlareDrivex1",
+   "friendlyName": "Flare Drive x1",
    "thrusters": 1,
-   "notes": "Dusty Plasma (Fission Fragment 2)",
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 1376,
-   "EV_kps": 3750,
+   "requiredProjectName": "Project_FlareDrive",
+   "thrust_N": 3500000,
+   "EV_kps": 35,
    "specificPower_kgMW": 0,
-   "efficiency": 0.46,
+   "efficiency": 0.85,
+   "thrustRating_GW": "61.250",
+   "req power": "72.059",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Gas_Core_Fission",
    "thrustCap": 20,
    "cooling": "Open",
-   "requiredProjectName": "Project_DustyPlasmaDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "ReactionProducts",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "fissiles": 1
+      "water": 0.98,
+      "nobleMetals": 0.01,
+      "fissiles": 0.01
    },
-   "iconResource": "shipbuildericons/ICO_DustyPlasmaDrive"
+   "iconResource": "shipbuildericons/ICO_FlareDrive"
 },
  {
-   "dataName": "DustyPlasmaDrivex2",
-   "friendlyName": "Dusty Plasma Drive x2",
+   "dataName": "FlareDrivex2",
+   "friendlyName": "Flare Drive x2",
    "thrusters": 2,
-   "notes": "Dusty Plasma (Fission Fragment 2)",
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 2752,
-   "EV_kps": 3750,
+   "requiredProjectName": "Project_FlareDrive",
+   "thrust_N": 7000000,
+   "EV_kps": 35,
    "specificPower_kgMW": 0,
-   "efficiency": 0.46,
+   "efficiency": 0.85,
+   "thrustRating_GW": "122.500",
+   "req power": "144.118",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Gas_Core_Fission",
    "thrustCap": 20,
    "cooling": "Open",
-   "requiredProjectName": "Project_DustyPlasmaDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "ReactionProducts",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "fissiles": 1
+      "water": 0.98,
+      "nobleMetals": 0.01,
+      "fissiles": 0.01
    },
-   "iconResource": "shipbuildericons/ICO_DustyPlasmaDrive"
+   "iconResource": "shipbuildericons/ICO_FlareDrive"
 },
  {
-   "dataName": "DustyPlasmaDrivex3",
-   "friendlyName": "Dusty Plasma Drive x3",
+   "dataName": "FlareDrivex3",
+   "friendlyName": "Flare Drive x3",
    "thrusters": 3,
-   "notes": "Dusty Plasma (Fission Fragment 2)",
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 4128,
-   "EV_kps": 3750,
+   "requiredProjectName": "Project_FlareDrive",
+   "thrust_N": 10500000,
+   "EV_kps": 35,
    "specificPower_kgMW": 0,
-   "efficiency": 0.46,
+   "efficiency": 0.85,
+   "thrustRating_GW": "183.750",
+   "req power": "216.176",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Gas_Core_Fission",
    "thrustCap": 20,
    "cooling": "Open",
-   "requiredProjectName": "Project_DustyPlasmaDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "ReactionProducts",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "fissiles": 1
+      "water": 0.98,
+      "nobleMetals": 0.01,
+      "fissiles": 0.01
    },
-   "iconResource": "shipbuildericons/ICO_DustyPlasmaDrive"
+   "iconResource": "shipbuildericons/ICO_FlareDrive"
 },
  {
-   "dataName": "DustyPlasmaDrivex4",
-   "friendlyName": "Dusty Plasma Drive x4",
+   "dataName": "FlareDrivex4",
+   "friendlyName": "Flare Drive x4",
    "thrusters": 4,
-   "notes": "Dusty Plasma (Fission Fragment 2)",
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 5504,
-   "EV_kps": 3750,
+   "requiredProjectName": "Project_FlareDrive",
+   "thrust_N": 14000000,
+   "EV_kps": 35,
    "specificPower_kgMW": 0,
-   "efficiency": 0.46,
+   "efficiency": 0.85,
+   "thrustRating_GW": "245.000",
+   "req power": "288.235",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Gas_Core_Fission",
    "thrustCap": 20,
    "cooling": "Open",
-   "requiredProjectName": "Project_DustyPlasmaDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "ReactionProducts",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "fissiles": 1
+      "water": 0.98,
+      "nobleMetals": 0.01,
+      "fissiles": 0.01
    },
-   "iconResource": "shipbuildericons/ICO_DustyPlasmaDrive"
+   "iconResource": "shipbuildericons/ICO_FlareDrive"
 },
  {
-   "dataName": "DustyPlasmaDrivex5",
-   "friendlyName": "Dusty Plasma Drive x5",
+   "dataName": "FlareDrivex5",
+   "friendlyName": "Flare Drive x5",
    "thrusters": 5,
-   "notes": "Dusty Plasma (Fission Fragment 2)",
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 6880,
-   "EV_kps": 3750,
+   "requiredProjectName": "Project_FlareDrive",
+   "thrust_N": 17500000,
+   "EV_kps": 35,
    "specificPower_kgMW": 0,
-   "efficiency": 0.46,
+   "efficiency": 0.85,
+   "thrustRating_GW": "306.250",
+   "req power": "360.294",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Gas_Core_Fission",
    "thrustCap": 20,
    "cooling": "Open",
-   "requiredProjectName": "Project_DustyPlasmaDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "ReactionProducts",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "fissiles": 1
+      "water": 0.98,
+      "nobleMetals": 0.01,
+      "fissiles": 0.01
    },
-   "iconResource": "shipbuildericons/ICO_DustyPlasmaDrive"
+   "iconResource": "shipbuildericons/ICO_FlareDrive"
 },
  {
-   "dataName": "DustyPlasmaDrivex6",
-   "friendlyName": "Dusty Plasma Drive x6",
+   "dataName": "FlareDrivex6",
+   "friendlyName": "Flare Drive x6",
    "thrusters": 6,
-   "notes": "Dusty Plasma (Fission Fragment 2)",
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 8256,
-   "EV_kps": 3750,
+   "requiredProjectName": "Project_FlareDrive",
+   "thrust_N": 21000000,
+   "EV_kps": 35,
    "specificPower_kgMW": 0,
-   "efficiency": 0.46,
+   "efficiency": 0.85,
+   "thrustRating_GW": "367.500",
+   "req power": "432.353",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Gas_Core_Fission",
    "thrustCap": 20,
    "cooling": "Open",
-   "requiredProjectName": "Project_DustyPlasmaDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "ReactionProducts",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "fissiles": 1
+      "water": 0.98,
+      "nobleMetals": 0.01,
+      "fissiles": 0.01
    },
-   "iconResource": "shipbuildericons/ICO_DustyPlasmaDrive"
+   "iconResource": "shipbuildericons/ICO_FlareDrive"
 },
  {
-   "dataName": "BurnerDrivex1",
-   "friendlyName": "Burner Drive x1",
+   "dataName": "FirestarFissionLanternx1",
+   "friendlyName": "Firestar Fission Lantern x1",
    "thrusters": 1,
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 108000,
-   "EV_kps": 69,
+   "requiredProjectName": "Project_FirestarFissionLantern",
+   "thrust_N": 5000000,
+   "EV_kps": 50,
    "specificPower_kgMW": 0,
    "efficiency": 0.85,
+   "thrustRating_GW": "125.000",
+   "req power": "147.059",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Gas_Core_Fission",
-   "thrustCap": 20,
+   "thrustCap": 22,
    "cooling": "Open",
-   "requiredProjectName": "Project_BurnerDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -7093,22 +7740,24 @@
       "nobleMetals": 0.01,
       "fissiles": 0.01
    },
-   "iconResource": "shipbuildericons/ICO_BurnerDrive"
+   "iconResource": "shipbuildericons/ICO_FirestarFissionLantern"
 },
  {
-   "dataName": "BurnerDrivex2",
-   "friendlyName": "Burner Drive x2",
+   "dataName": "FirestarFissionLanternx2",
+   "friendlyName": "Firestar Fission Lantern x2",
    "thrusters": 2,
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 216000,
-   "EV_kps": 69,
+   "requiredProjectName": "Project_FirestarFissionLantern",
+   "thrust_N": 10000000,
+   "EV_kps": 50,
    "specificPower_kgMW": 0,
    "efficiency": 0.85,
+   "thrustRating_GW": "250.000",
+   "req power": "294.118",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Gas_Core_Fission",
-   "thrustCap": 20,
+   "thrustCap": 22,
    "cooling": "Open",
-   "requiredProjectName": "Project_BurnerDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -7118,22 +7767,24 @@
       "nobleMetals": 0.01,
       "fissiles": 0.01
    },
-   "iconResource": "shipbuildericons/ICO_BurnerDrive"
+   "iconResource": "shipbuildericons/ICO_FirestarFissionLantern"
 },
  {
-   "dataName": "BurnerDrivex3",
-   "friendlyName": "Burner Drive x3",
+   "dataName": "FirestarFissionLanternx3",
+   "friendlyName": "Firestar Fission Lantern x3",
    "thrusters": 3,
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 324000,
-   "EV_kps": 69,
+   "requiredProjectName": "Project_FirestarFissionLantern",
+   "thrust_N": 15000000,
+   "EV_kps": 50,
    "specificPower_kgMW": 0,
    "efficiency": 0.85,
+   "thrustRating_GW": "375.000",
+   "req power": "441.176",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Gas_Core_Fission",
-   "thrustCap": 20,
+   "thrustCap": 22,
    "cooling": "Open",
-   "requiredProjectName": "Project_BurnerDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -7143,22 +7794,24 @@
       "nobleMetals": 0.01,
       "fissiles": 0.01
    },
-   "iconResource": "shipbuildericons/ICO_BurnerDrive"
+   "iconResource": "shipbuildericons/ICO_FirestarFissionLantern"
 },
  {
-   "dataName": "BurnerDrivex4",
-   "friendlyName": "Burner Drive x4",
+   "dataName": "FirestarFissionLanternx4",
+   "friendlyName": "Firestar Fission Lantern x4",
    "thrusters": 4,
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 432000,
-   "EV_kps": 69,
+   "requiredProjectName": "Project_FirestarFissionLantern",
+   "thrust_N": 20000000,
+   "EV_kps": 50,
    "specificPower_kgMW": 0,
    "efficiency": 0.85,
+   "thrustRating_GW": "500.000",
+   "req power": "588.235",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Gas_Core_Fission",
-   "thrustCap": 20,
+   "thrustCap": 22,
    "cooling": "Open",
-   "requiredProjectName": "Project_BurnerDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -7168,22 +7821,24 @@
       "nobleMetals": 0.01,
       "fissiles": 0.01
    },
-   "iconResource": "shipbuildericons/ICO_BurnerDrive"
+   "iconResource": "shipbuildericons/ICO_FirestarFissionLantern"
 },
  {
-   "dataName": "BurnerDrivex5",
-   "friendlyName": "Burner Drive x5",
+   "dataName": "FirestarFissionLanternx5",
+   "friendlyName": "Firestar Fission Lantern x5",
    "thrusters": 5,
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 540000,
-   "EV_kps": 69,
+   "requiredProjectName": "Project_FirestarFissionLantern",
+   "thrust_N": 25000000,
+   "EV_kps": 50,
    "specificPower_kgMW": 0,
    "efficiency": 0.85,
+   "thrustRating_GW": "625.000",
+   "req power": "735.294",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Gas_Core_Fission",
-   "thrustCap": 20,
+   "thrustCap": 22,
    "cooling": "Open",
-   "requiredProjectName": "Project_BurnerDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -7193,22 +7848,24 @@
       "nobleMetals": 0.01,
       "fissiles": 0.01
    },
-   "iconResource": "shipbuildericons/ICO_BurnerDrive"
+   "iconResource": "shipbuildericons/ICO_FirestarFissionLantern"
 },
  {
-   "dataName": "BurnerDrivex6",
-   "friendlyName": "Burner Drive x6",
+   "dataName": "FirestarFissionLanternx6",
+   "friendlyName": "Firestar Fission Lantern x6",
    "thrusters": 6,
    "driveClassification": "Fission_Thermal",
-   "thrust_N": 648000,
-   "EV_kps": 69,
+   "requiredProjectName": "Project_FirestarFissionLantern",
+   "thrust_N": 30000000,
+   "EV_kps": 50,
    "specificPower_kgMW": 0,
    "efficiency": 0.85,
+   "thrustRating_GW": "750.000",
+   "req power": "882.353",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Gas_Core_Fission",
-   "thrustCap": 20,
+   "thrustCap": 22,
    "cooling": "Open",
-   "requiredProjectName": "Project_BurnerDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -7218,1260 +7875,2173 @@
       "nobleMetals": 0.01,
       "fissiles": 0.01
    },
-   "iconResource": "shipbuildericons/ICO_BurnerDrive"
+   "iconResource": "shipbuildericons/ICO_FirestarFissionLantern"
 },
  {
-   "dataName": "FlareDrivex1",
-   "friendlyName": "Flare Drive x1",
+   "dataName": "NeutronFluxLanternx1",
+   "friendlyName": "Neutron Flux Lantern x1",
    "thrusters": 1,
-   "driveClassification": "Fission_Thermal",
-   "thrust_N": 3500000,
-   "EV_kps": 35,
-   "specificPower_kgMW": 0,
-   "efficiency": 0.85,
+   "notes": "Nuclear Salt Water",
+   "driveClassification": "NuclearSaltWater",
+   "requiredProjectName": "Project_NeutronFluxLantern",
+   "thrust_N": 12900000,
+   "EV_kps": 66,
+   "specificPower_kgMW": 0.77,
+   "efficiency": 0.8,
+   "thrustRating_GW": "425.700",
+   "req power": "0.000",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Gas_Core_Fission",
-   "thrustCap": 20,
+   "requiredPowerPlant": "Any_General",
+   "thrustCap": 2,
    "cooling": "Open",
-   "requiredProjectName": "Project_FlareDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Hydrogen",
+   "propellant": "Water",
    "perTankPropellantMaterials": {
-      "water": 0.98,
-      "nobleMetals": 0.01,
-      "fissiles": 0.01
+      "water": 0.65,
+      "volatiles": 0.05,
+      "fissiles": 0.3
    },
-   "iconResource": "shipbuildericons/ICO_FlareDrive"
+   "iconResource": "shipbuildericons/ICO_NeutronFluxLantern"
 },
  {
-   "dataName": "FlareDrivex2",
-   "friendlyName": "Flare Drive x2",
+   "dataName": "NeutronFluxLanternx2",
+   "friendlyName": "Neutron Flux Lantern x2",
    "thrusters": 2,
-   "driveClassification": "Fission_Thermal",
-   "thrust_N": 7000000,
-   "EV_kps": 35,
-   "specificPower_kgMW": 0,
-   "efficiency": 0.85,
+   "notes": "Nuclear Salt Water",
+   "driveClassification": "NuclearSaltWater",
+   "requiredProjectName": "Project_NeutronFluxLantern",
+   "thrust_N": 25800000,
+   "EV_kps": 66,
+   "specificPower_kgMW": 0.77,
+   "efficiency": 0.8,
+   "thrustRating_GW": "851.400",
+   "req power": "0.000",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Gas_Core_Fission",
-   "thrustCap": 20,
+   "requiredPowerPlant": "Any_General",
+   "thrustCap": 2,
    "cooling": "Open",
-   "requiredProjectName": "Project_FlareDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Hydrogen",
+   "propellant": "Water",
    "perTankPropellantMaterials": {
-      "water": 0.98,
-      "nobleMetals": 0.01,
-      "fissiles": 0.01
+      "water": 0.65,
+      "volatiles": 0.05,
+      "fissiles": 0.3
    },
-   "iconResource": "shipbuildericons/ICO_FlareDrive"
+   "iconResource": "shipbuildericons/ICO_NeutronFluxLantern"
 },
  {
-   "dataName": "FlareDrivex3",
-   "friendlyName": "Flare Drive x3",
+   "dataName": "NeutronFluxLanternx3",
+   "friendlyName": "Neutron Flux Lantern x3",
    "thrusters": 3,
-   "driveClassification": "Fission_Thermal",
-   "thrust_N": 10500000,
-   "EV_kps": 35,
-   "specificPower_kgMW": 0,
-   "efficiency": 0.85,
+   "notes": "Nuclear Salt Water",
+   "driveClassification": "NuclearSaltWater",
+   "requiredProjectName": "Project_NeutronFluxLantern",
+   "thrust_N": 38700000,
+   "EV_kps": 66,
+   "specificPower_kgMW": 0.77,
+   "efficiency": 0.8,
+   "thrustRating_GW": "1,277.100",
+   "req power": "0.000",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Gas_Core_Fission",
-   "thrustCap": 20,
+   "requiredPowerPlant": "Any_General",
+   "thrustCap": 2,
    "cooling": "Open",
-   "requiredProjectName": "Project_FlareDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Hydrogen",
+   "propellant": "Water",
    "perTankPropellantMaterials": {
-      "water": 0.98,
-      "nobleMetals": 0.01,
-      "fissiles": 0.01
+      "water": 0.65,
+      "volatiles": 0.05,
+      "fissiles": 0.3
    },
-   "iconResource": "shipbuildericons/ICO_FlareDrive"
+   "iconResource": "shipbuildericons/ICO_NeutronFluxLantern"
 },
  {
-   "dataName": "FlareDrivex4",
-   "friendlyName": "Flare Drive x4",
+   "dataName": "NeutronFluxLanternx4",
+   "friendlyName": "Neutron Flux Lantern x4",
+   "thrusters": 4,
+   "notes": "Nuclear Salt Water",
+   "driveClassification": "NuclearSaltWater",
+   "requiredProjectName": "Project_NeutronFluxLantern",
+   "thrust_N": 51600000,
+   "EV_kps": 66,
+   "specificPower_kgMW": 0.77,
+   "efficiency": 0.8,
+   "thrustRating_GW": "1,702.800",
+   "req power": "0.000",
+   "flatMass_tons": 0,
+   "requiredPowerPlant": "Any_General",
+   "thrustCap": 2,
+   "cooling": "Open",
+   "weightedBuildMaterials": {
+      "metals": 1
+   },
+   "propellant": "Water",
+   "perTankPropellantMaterials": {
+      "water": 0.65,
+      "volatiles": 0.05,
+      "fissiles": 0.3
+   },
+   "iconResource": "shipbuildericons/ICO_NeutronFluxLantern"
+},
+ {
+   "dataName": "NeutronFluxLanternx5",
+   "friendlyName": "Neutron Flux Lantern x5",
+   "thrusters": 5,
+   "notes": "Nuclear Salt Water",
+   "driveClassification": "NuclearSaltWater",
+   "requiredProjectName": "Project_NeutronFluxLantern",
+   "thrust_N": 64500000,
+   "EV_kps": 66,
+   "specificPower_kgMW": 0.77,
+   "efficiency": 0.8,
+   "thrustRating_GW": "2,128.500",
+   "req power": "0.000",
+   "flatMass_tons": 0,
+   "requiredPowerPlant": "Any_General",
+   "thrustCap": 2,
+   "cooling": "Open",
+   "weightedBuildMaterials": {
+      "metals": 1
+   },
+   "propellant": "Water",
+   "perTankPropellantMaterials": {
+      "water": 0.65,
+      "volatiles": 0.05,
+      "fissiles": 0.3
+   },
+   "iconResource": "shipbuildericons/ICO_NeutronFluxLantern"
+},
+ {
+   "dataName": "NeutronFluxLanternx6",
+   "friendlyName": "Neutron Flux Lantern x6",
+   "thrusters": 6,
+   "notes": "Nuclear Salt Water",
+   "driveClassification": "NuclearSaltWater",
+   "requiredProjectName": "Project_NeutronFluxLantern",
+   "thrust_N": 77400000,
+   "EV_kps": 66,
+   "specificPower_kgMW": 0.77,
+   "efficiency": 0.8,
+   "thrustRating_GW": "2,554.200",
+   "req power": "0.000",
+   "flatMass_tons": 0,
+   "requiredPowerPlant": "Any_General",
+   "thrustCap": 2,
+   "cooling": "Open",
+   "weightedBuildMaterials": {
+      "metals": 1
+   },
+   "propellant": "Water",
+   "perTankPropellantMaterials": {
+      "water": 0.65,
+      "volatiles": 0.05,
+      "fissiles": 0.3
+   },
+   "iconResource": "shipbuildericons/ICO_NeutronFluxLantern"
+},
+ {
+   "dataName": "NeutronFluxTorchx1",
+   "friendlyName": "Neutron Flux Torch x1",
+   "thrusters": 1,
+   "notes": "90% enriched",
+   "driveClassification": "NuclearSaltWater",
+   "requiredProjectName": "Project_NeutronFluxTorch",
+   "thrust_N": 13000000,
+   "EV_kps": 1700,
+   "specificPower_kgMW": 0.145,
+   "efficiency": 0.8,
+   "thrustRating_GW": "11,050.000",
+   "req power": "0.000",
+   "flatMass_tons": 0,
+   "requiredPowerPlant": "Any_General",
+   "thrustCap": 2,
+   "cooling": "Open",
+   "weightedBuildMaterials": {
+      "metals": 1
+   },
+   "propellant": "Water",
+   "perTankPropellantMaterials": {
+      "water": 0.25,
+      "volatiles": 0.05,
+      "fissiles": 0.7
+   },
+   "iconResource": "shipbuildericons/ICO_NeutronFluxTorch"
+},
+ {
+   "dataName": "NeutronFluxTorchx2",
+   "friendlyName": "Neutron Flux Torch x2",
+   "thrusters": 2,
+   "notes": "90% enriched",
+   "driveClassification": "NuclearSaltWater",
+   "requiredProjectName": "Project_NeutronFluxTorch",
+   "thrust_N": 26000000,
+   "EV_kps": 1700,
+   "specificPower_kgMW": 0.145,
+   "efficiency": 0.8,
+   "thrustRating_GW": "22,100.000",
+   "req power": "0.000",
+   "flatMass_tons": 0,
+   "requiredPowerPlant": "Any_General",
+   "thrustCap": 2,
+   "cooling": "Open",
+   "weightedBuildMaterials": {
+      "metals": 1
+   },
+   "propellant": "Water",
+   "perTankPropellantMaterials": {
+      "water": 0.25,
+      "volatiles": 0.05,
+      "fissiles": 0.7
+   },
+   "iconResource": "shipbuildericons/ICO_NeutronFluxTorch"
+},
+ {
+   "dataName": "NeutronFluxTorchx3",
+   "friendlyName": "Neutron Flux Torch x3",
+   "thrusters": 3,
+   "notes": "90% enriched",
+   "driveClassification": "NuclearSaltWater",
+   "requiredProjectName": "Project_NeutronFluxTorch",
+   "thrust_N": 39000000,
+   "EV_kps": 1700,
+   "specificPower_kgMW": 0.145,
+   "efficiency": 0.8,
+   "thrustRating_GW": "33,150.000",
+   "req power": "0.000",
+   "flatMass_tons": 0,
+   "requiredPowerPlant": "Any_General",
+   "thrustCap": 2,
+   "cooling": "Open",
+   "weightedBuildMaterials": {
+      "metals": 1
+   },
+   "propellant": "Water",
+   "perTankPropellantMaterials": {
+      "water": 0.25,
+      "volatiles": 0.05,
+      "fissiles": 0.7
+   },
+   "iconResource": "shipbuildericons/ICO_NeutronFluxTorch"
+},
+ {
+   "dataName": "NeutronFluxTorchx4",
+   "friendlyName": "Neutron Flux Torch x4",
+   "thrusters": 4,
+   "notes": "90% enriched",
+   "driveClassification": "NuclearSaltWater",
+   "requiredProjectName": "Project_NeutronFluxTorch",
+   "thrust_N": 52000000,
+   "EV_kps": 1700,
+   "specificPower_kgMW": 0.145,
+   "efficiency": 0.8,
+   "thrustRating_GW": "44,200.000",
+   "req power": "0.000",
+   "flatMass_tons": 0,
+   "requiredPowerPlant": "Any_General",
+   "thrustCap": 2,
+   "cooling": "Open",
+   "weightedBuildMaterials": {
+      "metals": 1
+   },
+   "propellant": "Water",
+   "perTankPropellantMaterials": {
+      "water": 0.25,
+      "volatiles": 0.05,
+      "fissiles": 0.7
+   },
+   "iconResource": "shipbuildericons/ICO_NeutronFluxTorch"
+},
+ {
+   "dataName": "NeutronFluxTorchx5",
+   "friendlyName": "Neutron Flux Torch x5",
+   "thrusters": 5,
+   "notes": "90% enriched",
+   "driveClassification": "NuclearSaltWater",
+   "requiredProjectName": "Project_NeutronFluxTorch",
+   "thrust_N": 65000000,
+   "EV_kps": 1700,
+   "specificPower_kgMW": 0.145,
+   "efficiency": 0.8,
+   "thrustRating_GW": "55,250.000",
+   "req power": "0.000",
+   "flatMass_tons": 0,
+   "requiredPowerPlant": "Any_General",
+   "thrustCap": 2,
+   "cooling": "Open",
+   "weightedBuildMaterials": {
+      "metals": 1
+   },
+   "propellant": "Water",
+   "perTankPropellantMaterials": {
+      "water": 0.25,
+      "volatiles": 0.05,
+      "fissiles": 0.7
+   },
+   "iconResource": "shipbuildericons/ICO_NeutronFluxTorch"
+},
+ {
+   "dataName": "NeutronFluxTorchx6",
+   "friendlyName": "Neutron Flux Torch x6",
+   "thrusters": 6,
+   "notes": "90% enriched",
+   "driveClassification": "NuclearSaltWater",
+   "requiredProjectName": "Project_NeutronFluxTorch",
+   "thrust_N": 78000000,
+   "EV_kps": 1700,
+   "specificPower_kgMW": 0.145,
+   "efficiency": 0.8,
+   "thrustRating_GW": "66,300.000",
+   "req power": "0.000",
+   "flatMass_tons": 0,
+   "requiredPowerPlant": "Any_General",
+   "thrustCap": 2,
+   "cooling": "Open",
+   "weightedBuildMaterials": {
+      "metals": 1
+   },
+   "propellant": "Water",
+   "perTankPropellantMaterials": {
+      "water": 0.25,
+      "volatiles": 0.05,
+      "fissiles": 0.7
+   },
+   "iconResource": "shipbuildericons/ICO_NeutronFluxTorch"
+},
+ {
+   "dataName": "Z-pinchMicrofissionDrivex1",
+   "friendlyName": "Z-pinch Microfission Drive x1",
+   "thrusters": 1,
+   "driveClassification": "Fission_Pulse",
+   "requiredProjectName": "Project_Z-pinchMicrofissionDrive",
+   "thrust_N": 24000,
+   "EV_kps": 156.96,
+   "specificPower_kgMW": 68,
+   "efficiency": 0.98,
+   "thrustRating_GW": "1.884",
+   "req power": "1.922",
+   "flatMass_tons": 0,
+   "requiredPowerPlant": "Any_General",
+   "thrustCap": 40,
+   "cooling": "Open",
+   "weightedBuildMaterials": {
+      "metals": 1
+   },
+   "propellant": "ReactionProducts",
+   "perTankPropellantMaterials": {
+      "water": 0.9,
+      "fissiles": 0.1
+   },
+   "iconResource": "shipbuildericons/ICO_Z-pinchMicrofissionDrive"
+},
+ {
+   "dataName": "NeutroniumMicrofissionDrivex1",
+   "friendlyName": "Neutronium Microfission Drive x1",
+   "thrusters": 1,
+   "notes": "Neutronium Microfission",
+   "driveClassification": "Fission_Pulse",
+   "requiredProjectName": "Project_NeutroniumMicrofissionDrive",
+   "thrust_N": 180000,
+   "EV_kps": 156.96,
+   "specificPower_kgMW": 12,
+   "efficiency": 0.99,
+   "thrustRating_GW": "14.126",
+   "req power": "14.269",
+   "flatMass_tons": 0,
+   "requiredPowerPlant": "Any_General",
+   "thrustCap": 80,
+   "cooling": "Open",
+   "weightedBuildMaterials": {
+      "metals": 1
+   },
+   "propellant": "ReactionProducts",
+   "perTankPropellantMaterials": {
+      "water": 0.99,
+      "fissiles": 0.01
+   },
+   "iconResource": "shipbuildericons/ICO_NeutroniumMicrofissionDrive"
+},
+ {
+   "dataName": "AntimatterMicrofissionDrivex1",
+   "friendlyName": "Antimatter Microfission Drive x1",
+   "thrusters": 1,
+   "notes": "ACMF",
+   "driveClassification": "Fission_Pulse",
+   "requiredProjectName": "Project_AntimatterMicrofissionDrive",
+   "thrust_N": 275000,
+   "EV_kps": 132.44,
+   "specificPower_kgMW": 2,
+   "efficiency": 0.98,
+   "thrustRating_GW": "18.210",
+   "req power": "18.581",
+   "flatMass_tons": 0,
+   "requiredPowerPlant": "Any_General",
+   "thrustCap": 60,
+   "cooling": "Open",
+   "weightedBuildMaterials": {
+      "metals": 1
+   },
+   "propellant": "ReactionProducts",
+   "perTankPropellantMaterials": {
+      "water": 0.99,
+      "fissiles": 0.01,
+      "antimatter": 3e-16
+   },
+   "iconResource": "shipbuildericons/ICO_AntimatterMicrofissionDrive"
+},
+ {
+   "dataName": "MinimagOrionx1",
+   "friendlyName": "Minimag Orion x1",
+   "thrusters": 1,
+   "notes": "Minimag Orion 1 (DRM-1)",
+   "driveClassification": "Fission_Pulse",
+   "requiredProjectName": "Project_MinimagOrion",
+   "thrust_N": 642000,
+   "EV_kps": 93.16,
+   "specificPower_kgMW": 0.05,
+   "efficiency": 1,
+   "thrustRating_GW": "29.906",
+   "req power": "29.906",
+   "flatMass_tons": 0,
+   "requiredPowerPlant": "Any_General",
+   "thrustCap": 40,
+   "cooling": "Open",
+   "weightedBuildMaterials": {
+      "metals": 1
+   },
+   "propellant": "ReactionProducts",
+   "perTankPropellantMaterials": {
+      "metals": 0.6,
+      "nobleMetals": 0.35,
+      "fissiles": 0.05
+   },
+   "iconResource": "shipbuildericons/ICO_MinimagOrion"
+},
+ {
+   "dataName": "AdvancedMinimagOrionx1",
+   "friendlyName": "Advanced Minimag Orion x1",
+   "thrusters": 1,
+   "driveClassification": "Fission_Pulse",
+   "requiredProjectName": "Project_AdvancedMinimagOrion",
+   "thrust_N": 1870000,
+   "EV_kps": 157,
+   "specificPower_kgMW": 0.005,
+   "efficiency": 1,
+   "thrustRating_GW": "146.795",
+   "req power": "146.795",
+   "flatMass_tons": 0,
+   "requiredPowerPlant": "Any_General",
+   "thrustCap": 40,
+   "cooling": "Open",
+   "weightedBuildMaterials": {
+      "metals": 1
+   },
+   "propellant": "ReactionProducts",
+   "perTankPropellantMaterials": {
+      "metals": 0.65,
+      "nobleMetals": 0.3,
+      "fissiles": 0.05
+   },
+   "iconResource": "shipbuildericons/ICO_AdvancedMinimagOrion"
+},
+ {
+   "dataName": "OrionDrivex1",
+   "friendlyName": "Orion Drive x1",
+   "thrusters": 1,
+   "notes": "20m Orion",
+   "driveClassification": "Fission_Pulse",
+   "requiredProjectName": "Project_OrionDrive",
+   "thrust_N": 16000000,
+   "EV_kps": 42.1,
+   "specificPower_kgMW": 1.09,
+   "efficiency": 1,
+   "thrustRating_GW": "336.800",
+   "req power": "336.800",
+   "flatMass_tons": 0,
+   "requiredPowerPlant": "Any_General",
+   "thrustCap": 5,
+   "cooling": "Open",
+   "weightedBuildMaterials": {
+      "metals": 1
+   },
+   "propellant": "ReactionProducts",
+   "perTankPropellantMaterials": {
+      "metals": 0.6,
+      "nobleMetals": 0.3,
+      "fissiles": 0.1
+   },
+   "iconResource": "shipbuildericons/ICO_OrionDrive"
+},
+ {
+   "dataName": "AdvancedOrionDrivex1",
+   "friendlyName": "Advanced Orion Drive x1",
+   "thrusters": 1,
+   "notes": "Advanced Orion",
+   "driveClassification": "Fission_Pulse",
+   "requiredProjectName": "Project_AdvancedOrionDrive",
+   "thrust_N": 24000000,
+   "EV_kps": 120,
+   "specificPower_kgMW": 0.14,
+   "efficiency": 1,
+   "thrustRating_GW": "1,440.000",
+   "req power": "1,440.000",
+   "flatMass_tons": 0,
+   "requiredPowerPlant": "Any_General",
+   "thrustCap": 5,
+   "cooling": "Open",
+   "weightedBuildMaterials": {
+      "metals": 1
+   },
+   "propellant": "ReactionProducts",
+   "perTankPropellantMaterials": {
+      "metals": 0.6,
+      "nobleMetals": 0.3,
+      "fissiles": 0.1
+   },
+   "iconResource": "shipbuildericons/ICO_AdvancedOrionDrive"
+},
+ {
+   "dataName": "TritonFusorDrivex1",
+   "friendlyName": "Triton Fusor Drive x1",
+   "thrusters": 1,
+   "notes": "Electrostatic D-T Drive",
+   "driveClassification": "Fusion_Thermal",
+   "requiredProjectName": "Project_TritonFusorDrive",
+   "thrust_N": 38500,
+   "EV_kps": 364,
+   "specificPower_kgMW": 0,
+   "efficiency": 0.93,
+   "thrustRating_GW": "7.007",
+   "req power": "7.534",
+   "flatMass_tons": 0,
+   "requiredPowerPlant": "Electrostatic_Confinement_Fusion",
+   "thrustCap": 30,
+   "cooling": "Closed",
+   "weightedBuildMaterials": {
+      "metals": 1
+   },
+   "propellant": "ReactionProducts",
+   "perTankPropellantMaterials": {
+      "water": 0.75,
+      "metals": 0.24,
+      "fissiles": 0.01
+   },
+   "iconResource": "shipbuildericons/ICO_TritonFusorDrive"
+},
+ {
+   "dataName": "TritonFusorDrivex2",
+   "friendlyName": "Triton Fusor Drive x2",
+   "thrusters": 2,
+   "notes": "Electrostatic D-T Drive",
+   "driveClassification": "Fusion_Thermal",
+   "requiredProjectName": "Project_TritonFusorDrive",
+   "thrust_N": 77000,
+   "EV_kps": 364,
+   "specificPower_kgMW": 0,
+   "efficiency": 0.93,
+   "thrustRating_GW": "14.014",
+   "req power": "15.069",
+   "flatMass_tons": 0,
+   "requiredPowerPlant": "Electrostatic_Confinement_Fusion",
+   "thrustCap": 30,
+   "cooling": "Closed",
+   "weightedBuildMaterials": {
+      "metals": 1
+   },
+   "propellant": "ReactionProducts",
+   "perTankPropellantMaterials": {
+      "water": 0.75,
+      "metals": 0.24,
+      "fissiles": 0.01
+   },
+   "iconResource": "shipbuildericons/ICO_TritonFusorDrive"
+},
+ {
+   "dataName": "TritonFusorDrivex3",
+   "friendlyName": "Triton Fusor Drive x3",
+   "thrusters": 3,
+   "notes": "Electrostatic D-T Drive",
+   "driveClassification": "Fusion_Thermal",
+   "requiredProjectName": "Project_TritonFusorDrive",
+   "thrust_N": 115500,
+   "EV_kps": 364,
+   "specificPower_kgMW": 0,
+   "efficiency": 0.93,
+   "thrustRating_GW": "21.021",
+   "req power": "22.603",
+   "flatMass_tons": 0,
+   "requiredPowerPlant": "Electrostatic_Confinement_Fusion",
+   "thrustCap": 30,
+   "cooling": "Closed",
+   "weightedBuildMaterials": {
+      "metals": 1
+   },
+   "propellant": "ReactionProducts",
+   "perTankPropellantMaterials": {
+      "water": 0.75,
+      "metals": 0.24,
+      "fissiles": 0.01
+   },
+   "iconResource": "shipbuildericons/ICO_TritonFusorDrive"
+},
+ {
+   "dataName": "TritonFusorDrivex4",
+   "friendlyName": "Triton Fusor Drive x4",
+   "thrusters": 4,
+   "notes": "Electrostatic D-T Drive",
+   "driveClassification": "Fusion_Thermal",
+   "requiredProjectName": "Project_TritonFusorDrive",
+   "thrust_N": 154000,
+   "EV_kps": 364,
+   "specificPower_kgMW": 0,
+   "efficiency": 0.93,
+   "thrustRating_GW": "28.028",
+   "req power": "30.138",
+   "flatMass_tons": 0,
+   "requiredPowerPlant": "Electrostatic_Confinement_Fusion",
+   "thrustCap": 30,
+   "cooling": "Closed",
+   "weightedBuildMaterials": {
+      "metals": 1
+   },
+   "propellant": "ReactionProducts",
+   "perTankPropellantMaterials": {
+      "water": 0.75,
+      "metals": 0.24,
+      "fissiles": 0.01
+   },
+   "iconResource": "shipbuildericons/ICO_TritonFusorDrive"
+},
+ {
+   "dataName": "TritonFusorDrivex5",
+   "friendlyName": "Triton Fusor Drive x5",
+   "thrusters": 5,
+   "notes": "Electrostatic D-T Drive",
+   "driveClassification": "Fusion_Thermal",
+   "requiredProjectName": "Project_TritonFusorDrive",
+   "thrust_N": 192500,
+   "EV_kps": 364,
+   "specificPower_kgMW": 0,
+   "efficiency": 0.93,
+   "thrustRating_GW": "35.035",
+   "req power": "37.672",
+   "flatMass_tons": 0,
+   "requiredPowerPlant": "Electrostatic_Confinement_Fusion",
+   "thrustCap": 30,
+   "cooling": "Closed",
+   "weightedBuildMaterials": {
+      "metals": 1
+   },
+   "propellant": "ReactionProducts",
+   "perTankPropellantMaterials": {
+      "water": 0.75,
+      "metals": 0.24,
+      "fissiles": 0.01
+   },
+   "iconResource": "shipbuildericons/ICO_TritonFusorDrive"
+},
+ {
+   "dataName": "TritonFusorDrivex6",
+   "friendlyName": "Triton Fusor Drive x6",
+   "thrusters": 6,
+   "notes": "Electrostatic D-T Drive",
+   "driveClassification": "Fusion_Thermal",
+   "requiredProjectName": "Project_TritonFusorDrive",
+   "thrust_N": 231000,
+   "EV_kps": 364,
+   "specificPower_kgMW": 0,
+   "efficiency": 0.93,
+   "thrustRating_GW": "42.042",
+   "req power": "45.206",
+   "flatMass_tons": 0,
+   "requiredPowerPlant": "Electrostatic_Confinement_Fusion",
+   "thrustCap": 30,
+   "cooling": "Closed",
+   "weightedBuildMaterials": {
+      "metals": 1
+   },
+   "propellant": "ReactionProducts",
+   "perTankPropellantMaterials": {
+      "water": 0.75,
+      "metals": 0.24,
+      "fissiles": 0.01
+   },
+   "iconResource": "shipbuildericons/ICO_TritonFusorDrive"
+},
+ {
+   "dataName": "DeuteronFusorDrivex1",
+   "friendlyName": "Deuteron Fusor Drive x1",
+   "thrusters": 1,
+   "notes": "Electrostatic D-D Drive",
+   "driveClassification": "Fusion_Thermal",
+   "requiredProjectName": "Project_DeuteronFusorDrive",
+   "thrust_N": 19200,
+   "EV_kps": 1250,
+   "specificPower_kgMW": 0,
+   "efficiency": 0.98,
+   "thrustRating_GW": "12.000",
+   "req power": "12.245",
+   "flatMass_tons": 0,
+   "requiredPowerPlant": "Electrostatic_Confinement_Fusion",
+   "thrustCap": 40,
+   "cooling": "Closed",
+   "weightedBuildMaterials": {
+      "metals": 1
+   },
+   "propellant": "ReactionProducts",
+   "perTankPropellantMaterials": {
+      "water": 0.76,
+      "metals": 0.24
+   },
+   "iconResource": "shipbuildericons/ICO_DeuteronFusorDrive"
+},
+ {
+   "dataName": "DeuteronFusorDrivex2",
+   "friendlyName": "Deuteron Fusor Drive x2",
+   "thrusters": 2,
+   "notes": "Electrostatic D-D Drive",
+   "driveClassification": "Fusion_Thermal",
+   "requiredProjectName": "Project_DeuteronFusorDrive",
+   "thrust_N": 38400,
+   "EV_kps": 1250,
+   "specificPower_kgMW": 0,
+   "efficiency": 0.98,
+   "thrustRating_GW": "24.000",
+   "req power": "24.490",
+   "flatMass_tons": 0,
+   "requiredPowerPlant": "Electrostatic_Confinement_Fusion",
+   "thrustCap": 40,
+   "cooling": "Closed",
+   "weightedBuildMaterials": {
+      "metals": 1
+   },
+   "propellant": "ReactionProducts",
+   "perTankPropellantMaterials": {
+      "water": 0.76,
+      "metals": 0.24
+   },
+   "iconResource": "shipbuildericons/ICO_DeuteronFusorDrive"
+},
+ {
+   "dataName": "DeuteronFusorDrivex3",
+   "friendlyName": "Deuteron Fusor Drive x3",
+   "thrusters": 3,
+   "notes": "Electrostatic D-D Drive",
+   "driveClassification": "Fusion_Thermal",
+   "requiredProjectName": "Project_DeuteronFusorDrive",
+   "thrust_N": 57600,
+   "EV_kps": 1250,
+   "specificPower_kgMW": 0,
+   "efficiency": 0.98,
+   "thrustRating_GW": "36.000",
+   "req power": "36.735",
+   "flatMass_tons": 0,
+   "requiredPowerPlant": "Electrostatic_Confinement_Fusion",
+   "thrustCap": 40,
+   "cooling": "Closed",
+   "weightedBuildMaterials": {
+      "metals": 1
+   },
+   "propellant": "ReactionProducts",
+   "perTankPropellantMaterials": {
+      "water": 0.76,
+      "metals": 0.24
+   },
+   "iconResource": "shipbuildericons/ICO_DeuteronFusorDrive"
+},
+ {
+   "dataName": "DeuteronFusorDrivex4",
+   "friendlyName": "Deuteron Fusor Drive x4",
+   "thrusters": 4,
+   "notes": "Electrostatic D-D Drive",
+   "driveClassification": "Fusion_Thermal",
+   "requiredProjectName": "Project_DeuteronFusorDrive",
+   "thrust_N": 76800,
+   "EV_kps": 1250,
+   "specificPower_kgMW": 0,
+   "efficiency": 0.98,
+   "thrustRating_GW": "48.000",
+   "req power": "48.980",
+   "flatMass_tons": 0,
+   "requiredPowerPlant": "Electrostatic_Confinement_Fusion",
+   "thrustCap": 40,
+   "cooling": "Closed",
+   "weightedBuildMaterials": {
+      "metals": 1
+   },
+   "propellant": "ReactionProducts",
+   "perTankPropellantMaterials": {
+      "water": 0.76,
+      "metals": 0.24
+   },
+   "iconResource": "shipbuildericons/ICO_DeuteronFusorDrive"
+},
+ {
+   "dataName": "DeuteronFusorDrivex5",
+   "friendlyName": "Deuteron Fusor Drive x5",
+   "thrusters": 5,
+   "notes": "Electrostatic D-D Drive",
+   "driveClassification": "Fusion_Thermal",
+   "requiredProjectName": "Project_DeuteronFusorDrive",
+   "thrust_N": 96000,
+   "EV_kps": 1250,
+   "specificPower_kgMW": 0,
+   "efficiency": 0.98,
+   "thrustRating_GW": "60.000",
+   "req power": "61.224",
+   "flatMass_tons": 0,
+   "requiredPowerPlant": "Electrostatic_Confinement_Fusion",
+   "thrustCap": 40,
+   "cooling": "Closed",
+   "weightedBuildMaterials": {
+      "metals": 1
+   },
+   "propellant": "ReactionProducts",
+   "perTankPropellantMaterials": {
+      "water": 0.76,
+      "metals": 0.24
+   },
+   "iconResource": "shipbuildericons/ICO_DeuteronFusorDrive"
+},
+ {
+   "dataName": "DeuteronFusorDrivex6",
+   "friendlyName": "Deuteron Fusor Drive x6",
+   "thrusters": 6,
+   "notes": "Electrostatic D-D Drive",
+   "driveClassification": "Fusion_Thermal",
+   "requiredProjectName": "Project_DeuteronFusorDrive",
+   "thrust_N": 115200,
+   "EV_kps": 1250,
+   "specificPower_kgMW": 0,
+   "efficiency": 0.98,
+   "thrustRating_GW": "72.000",
+   "req power": "73.469",
+   "flatMass_tons": 0,
+   "requiredPowerPlant": "Electrostatic_Confinement_Fusion",
+   "thrustCap": 40,
+   "cooling": "Closed",
+   "weightedBuildMaterials": {
+      "metals": 1
+   },
+   "propellant": "ReactionProducts",
+   "perTankPropellantMaterials": {
+      "water": 0.76,
+      "metals": 0.24
+   },
+   "iconResource": "shipbuildericons/ICO_DeuteronFusorDrive"
+},
+ {
+   "dataName": "ProtiumFusorDrivex1",
+   "friendlyName": "Protium Fusor Drive x1",
+   "thrusters": 1,
+   "notes": "Electrostatic p-p Drive",
+   "driveClassification": "Fusion_Thermal",
+   "requiredProjectName": "Project_ProtiumFusorDrive",
+   "thrust_N": 55173,
+   "EV_kps": 1818,
+   "specificPower_kgMW": 0,
+   "efficiency": 0.99,
+   "thrustRating_GW": "50.152",
+   "req power": "50.659",
+   "flatMass_tons": 0,
+   "requiredPowerPlant": "Electrostatic_Confinement_Fusion",
+   "thrustCap": 50,
+   "cooling": "Closed",
+   "weightedBuildMaterials": {
+      "metals": 1
+   },
+   "propellant": "ReactionProducts",
+   "perTankPropellantMaterials": {
+      "water": 0.76,
+      "metals": 0.24
+   },
+   "iconResource": "shipbuildericons/ICO_ProtiumFusorDrive"
+},
+ {
+   "dataName": "ProtiumFusorDrivex2",
+   "friendlyName": "Protium Fusor Drive x2",
+   "thrusters": 2,
+   "notes": "Electrostatic p-p Drive",
+   "driveClassification": "Fusion_Thermal",
+   "requiredProjectName": "Project_ProtiumFusorDrive",
+   "thrust_N": 110346,
+   "EV_kps": 1818,
+   "specificPower_kgMW": 0,
+   "efficiency": 0.99,
+   "thrustRating_GW": "100.305",
+   "req power": "101.318",
+   "flatMass_tons": 0,
+   "requiredPowerPlant": "Electrostatic_Confinement_Fusion",
+   "thrustCap": 50,
+   "cooling": "Closed",
+   "weightedBuildMaterials": {
+      "metals": 1
+   },
+   "propellant": "ReactionProducts",
+   "perTankPropellantMaterials": {
+      "water": 0.76,
+      "metals": 0.24
+   },
+   "iconResource": "shipbuildericons/ICO_ProtiumFusorDrive"
+},
+ {
+   "dataName": "ProtiumFusorDrivex3",
+   "friendlyName": "Protium Fusor Drive x3",
+   "thrusters": 3,
+   "notes": "Electrostatic p-p Drive",
+   "driveClassification": "Fusion_Thermal",
+   "requiredProjectName": "Project_ProtiumFusorDrive",
+   "thrust_N": 165519,
+   "EV_kps": 1818,
+   "specificPower_kgMW": 0,
+   "efficiency": 0.99,
+   "thrustRating_GW": "150.457",
+   "req power": "151.977",
+   "flatMass_tons": 0,
+   "requiredPowerPlant": "Electrostatic_Confinement_Fusion",
+   "thrustCap": 50,
+   "cooling": "Closed",
+   "weightedBuildMaterials": {
+      "metals": 1
+   },
+   "propellant": "ReactionProducts",
+   "perTankPropellantMaterials": {
+      "water": 0.76,
+      "metals": 0.24
+   },
+   "iconResource": "shipbuildericons/ICO_ProtiumFusorDrive"
+},
+ {
+   "dataName": "ProtiumFusorDrivex4",
+   "friendlyName": "Protium Fusor Drive x4",
    "thrusters": 4,
-   "driveClassification": "Fission_Thermal",
-   "thrust_N": 14000000,
-   "EV_kps": 35,
+   "notes": "Electrostatic p-p Drive",
+   "driveClassification": "Fusion_Thermal",
+   "requiredProjectName": "Project_ProtiumFusorDrive",
+   "thrust_N": 220692,
+   "EV_kps": 1818,
    "specificPower_kgMW": 0,
-   "efficiency": 0.85,
+   "efficiency": 0.99,
+   "thrustRating_GW": "200.609",
+   "req power": "202.635",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Gas_Core_Fission",
-   "thrustCap": 20,
-   "cooling": "Open",
-   "requiredProjectName": "Project_FlareDrive",
+   "requiredPowerPlant": "Electrostatic_Confinement_Fusion",
+   "thrustCap": 50,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Hydrogen",
+   "propellant": "ReactionProducts",
    "perTankPropellantMaterials": {
-      "water": 0.98,
-      "nobleMetals": 0.01,
-      "fissiles": 0.01
+      "water": 0.76,
+      "metals": 0.24
    },
-   "iconResource": "shipbuildericons/ICO_FlareDrive"
+   "iconResource": "shipbuildericons/ICO_ProtiumFusorDrive"
 },
  {
-   "dataName": "FlareDrivex5",
-   "friendlyName": "Flare Drive x5",
+   "dataName": "ProtiumFusorDrivex5",
+   "friendlyName": "Protium Fusor Drive x5",
    "thrusters": 5,
-   "driveClassification": "Fission_Thermal",
-   "thrust_N": 17500000,
-   "EV_kps": 35,
+   "notes": "Electrostatic p-p Drive",
+   "driveClassification": "Fusion_Thermal",
+   "requiredProjectName": "Project_ProtiumFusorDrive",
+   "thrust_N": 275865,
+   "EV_kps": 1818,
    "specificPower_kgMW": 0,
-   "efficiency": 0.85,
+   "efficiency": 0.99,
+   "thrustRating_GW": "250.761",
+   "req power": "253.294",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Gas_Core_Fission",
-   "thrustCap": 20,
-   "cooling": "Open",
-   "requiredProjectName": "Project_FlareDrive",
+   "requiredPowerPlant": "Electrostatic_Confinement_Fusion",
+   "thrustCap": 50,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Hydrogen",
+   "propellant": "ReactionProducts",
    "perTankPropellantMaterials": {
-      "water": 0.98,
-      "nobleMetals": 0.01,
-      "fissiles": 0.01
+      "water": 0.76,
+      "metals": 0.24
    },
-   "iconResource": "shipbuildericons/ICO_FlareDrive"
+   "iconResource": "shipbuildericons/ICO_ProtiumFusorDrive"
 },
  {
-   "dataName": "FlareDrivex6",
-   "friendlyName": "Flare Drive x6",
+   "dataName": "ProtiumFusorDrivex6",
+   "friendlyName": "Protium Fusor Drive x6",
    "thrusters": 6,
-   "driveClassification": "Fission_Thermal",
-   "thrust_N": 21000000,
-   "EV_kps": 35,
+   "notes": "Electrostatic p-p Drive",
+   "driveClassification": "Fusion_Thermal",
+   "requiredProjectName": "Project_ProtiumFusorDrive",
+   "thrust_N": 331038,
+   "EV_kps": 1818,
    "specificPower_kgMW": 0,
-   "efficiency": 0.85,
+   "efficiency": 0.99,
+   "thrustRating_GW": "300.914",
+   "req power": "303.953",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Gas_Core_Fission",
-   "thrustCap": 20,
-   "cooling": "Open",
-   "requiredProjectName": "Project_FlareDrive",
+   "requiredPowerPlant": "Electrostatic_Confinement_Fusion",
+   "thrustCap": 50,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Hydrogen",
+   "propellant": "ReactionProducts",
    "perTankPropellantMaterials": {
-      "water": 0.98,
-      "nobleMetals": 0.01,
-      "fissiles": 0.01
+      "water": 0.76,
+      "metals": 0.24
    },
-   "iconResource": "shipbuildericons/ICO_FlareDrive"
+   "iconResource": "shipbuildericons/ICO_ProtiumFusorDrive"
 },
  {
-   "dataName": "FirestarDrivex1",
-   "friendlyName": "Firestar Drive x1",
+   "dataName": "TritonReflexDrivex1",
+   "friendlyName": "Triton Reflex Drive x1",
    "thrusters": 1,
-   "driveClassification": "Fission_Thermal",
-   "thrust_N": 5000000,
-   "EV_kps": 50,
+   "notes": "DT Mirror-Mag Confinement Fusion",
+   "driveClassification": "Fusion_Thermal",
+   "requiredProjectName": "Project_TritonReflexDrive",
+   "thrust_N": 75600,
+   "EV_kps": 317,
    "specificPower_kgMW": 0,
-   "efficiency": 0.85,
+   "efficiency": 0.65,
+   "thrustRating_GW": "11.983",
+   "req power": "18.435",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Gas_Core_Fission",
-   "thrustCap": 20,
-   "cooling": "Open",
-   "requiredProjectName": "Project_FirestarDrive",
+   "requiredPowerPlant": "Mirrored_Magnetic_Confinement_Fusion",
+   "thrustCap": 40,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
    "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 0.98,
-      "nobleMetals": 0.01,
+      "water": 0.99,
       "fissiles": 0.01
    },
-   "iconResource": "shipbuildericons/ICO_FirestarDrive"
+   "iconResource": "shipbuildericons/ICO_TritonReflexDrive"
 },
  {
-   "dataName": "FirestarDrivex2",
-   "friendlyName": "Firestar Drive x2",
+   "dataName": "TritonReflexDrivex2",
+   "friendlyName": "Triton Reflex Drive x2",
    "thrusters": 2,
-   "driveClassification": "Fission_Thermal",
-   "thrust_N": 10000000,
-   "EV_kps": 50,
+   "notes": "DT Mirror-Mag Confinement Fusion",
+   "driveClassification": "Fusion_Thermal",
+   "requiredProjectName": "Project_TritonReflexDrive",
+   "thrust_N": 151200,
+   "EV_kps": 317,
    "specificPower_kgMW": 0,
-   "efficiency": 0.85,
+   "efficiency": 0.65,
+   "thrustRating_GW": "23.965",
+   "req power": "36.870",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Gas_Core_Fission",
-   "thrustCap": 20,
-   "cooling": "Open",
-   "requiredProjectName": "Project_FirestarDrive",
+   "requiredPowerPlant": "Mirrored_Magnetic_Confinement_Fusion",
+   "thrustCap": 40,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
    "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 0.98,
-      "nobleMetals": 0.01,
+      "water": 0.99,
       "fissiles": 0.01
    },
-   "iconResource": "shipbuildericons/ICO_FirestarDrive"
+   "iconResource": "shipbuildericons/ICO_TritonReflexDrive"
 },
  {
-   "dataName": "FirestarDrivex3",
-   "friendlyName": "Firestar Drive x3",
+   "dataName": "TritonReflexDrivex3",
+   "friendlyName": "Triton Reflex Drive x3",
    "thrusters": 3,
-   "driveClassification": "Fission_Thermal",
-   "thrust_N": 15000000,
-   "EV_kps": 50,
+   "notes": "DT Mirror-Mag Confinement Fusion",
+   "driveClassification": "Fusion_Thermal",
+   "requiredProjectName": "Project_TritonReflexDrive",
+   "thrust_N": 226800,
+   "EV_kps": 317,
    "specificPower_kgMW": 0,
-   "efficiency": 0.85,
+   "efficiency": 0.65,
+   "thrustRating_GW": "35.948",
+   "req power": "55.304",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Gas_Core_Fission",
-   "thrustCap": 20,
-   "cooling": "Open",
-   "requiredProjectName": "Project_FirestarDrive",
+   "requiredPowerPlant": "Mirrored_Magnetic_Confinement_Fusion",
+   "thrustCap": 40,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
    "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 0.98,
-      "nobleMetals": 0.01,
+      "water": 0.99,
       "fissiles": 0.01
    },
-   "iconResource": "shipbuildericons/ICO_FirestarDrive"
+   "iconResource": "shipbuildericons/ICO_TritonReflexDrive"
 },
  {
-   "dataName": "FirestarDrivex4",
-   "friendlyName": "Firestar Drive x4",
+   "dataName": "TritonReflexDrivex4",
+   "friendlyName": "Triton Reflex Drive x4",
    "thrusters": 4,
-   "driveClassification": "Fission_Thermal",
-   "thrust_N": 20000000,
-   "EV_kps": 50,
+   "notes": "DT Mirror-Mag Confinement Fusion",
+   "driveClassification": "Fusion_Thermal",
+   "requiredProjectName": "Project_TritonReflexDrive",
+   "thrust_N": 302400,
+   "EV_kps": 317,
    "specificPower_kgMW": 0,
-   "efficiency": 0.85,
+   "efficiency": 0.65,
+   "thrustRating_GW": "47.930",
+   "req power": "73.739",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Gas_Core_Fission",
-   "thrustCap": 20,
-   "cooling": "Open",
-   "requiredProjectName": "Project_FirestarDrive",
+   "requiredPowerPlant": "Mirrored_Magnetic_Confinement_Fusion",
+   "thrustCap": 40,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
    "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 0.98,
-      "nobleMetals": 0.01,
+      "water": 0.99,
       "fissiles": 0.01
    },
-   "iconResource": "shipbuildericons/ICO_FirestarDrive"
+   "iconResource": "shipbuildericons/ICO_TritonReflexDrive"
 },
  {
-   "dataName": "FirestarDrivex5",
-   "friendlyName": "Firestar Drive x5",
+   "dataName": "TritonReflexDrivex5",
+   "friendlyName": "Triton Reflex Drive x5",
    "thrusters": 5,
-   "driveClassification": "Fission_Thermal",
-   "thrust_N": 25000000,
-   "EV_kps": 50,
+   "notes": "DT Mirror-Mag Confinement Fusion",
+   "driveClassification": "Fusion_Thermal",
+   "requiredProjectName": "Project_TritonReflexDrive",
+   "thrust_N": 378000,
+   "EV_kps": 317,
    "specificPower_kgMW": 0,
-   "efficiency": 0.85,
+   "efficiency": 0.65,
+   "thrustRating_GW": "59.913",
+   "req power": "92.174",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Gas_Core_Fission",
-   "thrustCap": 20,
-   "cooling": "Open",
-   "requiredProjectName": "Project_FirestarDrive",
+   "requiredPowerPlant": "Mirrored_Magnetic_Confinement_Fusion",
+   "thrustCap": 40,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
    "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 0.98,
-      "nobleMetals": 0.01,
+      "water": 0.99,
       "fissiles": 0.01
    },
-   "iconResource": "shipbuildericons/ICO_FirestarDrive"
+   "iconResource": "shipbuildericons/ICO_TritonReflexDrive"
 },
  {
-   "dataName": "FirestarDrivex6",
-   "friendlyName": "Firestar Drive x6",
+   "dataName": "TritonReflexDrivex6",
+   "friendlyName": "Triton Reflex Drive x6",
    "thrusters": 6,
-   "driveClassification": "Fission_Thermal",
-   "thrust_N": 30000000,
-   "EV_kps": 50,
+   "notes": "DT Mirror-Mag Confinement Fusion",
+   "driveClassification": "Fusion_Thermal",
+   "requiredProjectName": "Project_TritonReflexDrive",
+   "thrust_N": 453600,
+   "EV_kps": 317,
    "specificPower_kgMW": 0,
-   "efficiency": 0.85,
+   "efficiency": 0.65,
+   "thrustRating_GW": "71.896",
+   "req power": "110.609",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Gas_Core_Fission",
-   "thrustCap": 20,
-   "cooling": "Open",
-   "requiredProjectName": "Project_FirestarDrive",
+   "requiredPowerPlant": "Mirrored_Magnetic_Confinement_Fusion",
+   "thrustCap": 40,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
    "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 0.98,
-      "nobleMetals": 0.01,
+      "water": 0.99,
       "fissiles": 0.01
    },
-   "iconResource": "shipbuildericons/ICO_FirestarDrive"
+   "iconResource": "shipbuildericons/ICO_TritonReflexDrive"
 },
  {
-   "dataName": "NeutronFluxDrivex1",
-   "friendlyName": "Neutron Flux Drive x1",
+   "dataName": "DeuteronReflexDrivex1",
+   "friendlyName": "Deuteron Reflex Drive x1",
    "thrusters": 1,
-   "notes": "Nuclear Salt Water",
-   "driveClassification": "Fission_Thermal",
-   "thrust_N": 12900000,
-   "EV_kps": 66,
+   "notes": "DD Mirror-Mag Confinement Fusion",
+   "driveClassification": "Fusion_Thermal",
+   "requiredProjectName": "Project_DeuteronReflexDrive",
+   "thrust_N": 60000,
+   "EV_kps": 833,
    "specificPower_kgMW": 0,
-   "efficiency": 0.8,
+   "efficiency": 0.7,
+   "thrustRating_GW": "24.990",
+   "req power": "35.700",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Salt_Water_Core",
-   "thrustCap": 10,
-   "cooling": "Open",
-   "requiredProjectName": "Project_NeutronFluxDrive",
+   "requiredPowerPlant": "Mirrored_Magnetic_Confinement_Fusion",
+   "thrustCap": 80,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Water",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 0.5,
-      "fissiles": 0.5
+      "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_NeutronFluxDrive"
+   "iconResource": "shipbuildericons/ICO_DeuteronReflexDrive"
 },
  {
-   "dataName": "NeutronFluxDrivex2",
-   "friendlyName": "Neutron Flux Drive x2",
+   "dataName": "DeuteronReflexDrivex2",
+   "friendlyName": "Deuteron Reflex Drive x2",
    "thrusters": 2,
-   "notes": "Nuclear Salt Water",
-   "driveClassification": "Fission_Thermal",
-   "thrust_N": 25800000,
-   "EV_kps": 66,
+   "notes": "DD Mirror-Mag Confinement Fusion",
+   "driveClassification": "Fusion_Thermal",
+   "requiredProjectName": "Project_DeuteronReflexDrive",
+   "thrust_N": 120000,
+   "EV_kps": 833,
    "specificPower_kgMW": 0,
-   "efficiency": 0.8,
+   "efficiency": 0.7,
+   "thrustRating_GW": "49.980",
+   "req power": "71.400",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Salt_Water_Core",
-   "thrustCap": 10,
-   "cooling": "Open",
-   "requiredProjectName": "Project_NeutronFluxDrive",
+   "requiredPowerPlant": "Mirrored_Magnetic_Confinement_Fusion",
+   "thrustCap": 80,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Water",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 0.5,
-      "fissiles": 0.5
+      "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_NeutronFluxDrive"
+   "iconResource": "shipbuildericons/ICO_DeuteronReflexDrive"
 },
  {
-   "dataName": "NeutronFluxDrivex3",
-   "friendlyName": "Neutron Flux Drive x3",
+   "dataName": "DeuteronReflexDrivex3",
+   "friendlyName": "Deuteron Reflex Drive x3",
    "thrusters": 3,
-   "notes": "Nuclear Salt Water",
-   "driveClassification": "Fission_Thermal",
-   "thrust_N": 38700000,
-   "EV_kps": 66,
+   "notes": "DD Mirror-Mag Confinement Fusion",
+   "driveClassification": "Fusion_Thermal",
+   "requiredProjectName": "Project_DeuteronReflexDrive",
+   "thrust_N": 180000,
+   "EV_kps": 833,
    "specificPower_kgMW": 0,
-   "efficiency": 0.8,
+   "efficiency": 0.7,
+   "thrustRating_GW": "74.970",
+   "req power": "107.100",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Salt_Water_Core",
-   "thrustCap": 10,
-   "cooling": "Open",
-   "requiredProjectName": "Project_NeutronFluxDrive",
+   "requiredPowerPlant": "Mirrored_Magnetic_Confinement_Fusion",
+   "thrustCap": 80,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Water",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 0.5,
-      "fissiles": 0.5
+      "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_NeutronFluxDrive"
+   "iconResource": "shipbuildericons/ICO_DeuteronReflexDrive"
 },
  {
-   "dataName": "NeutronFluxDrivex4",
-   "friendlyName": "Neutron Flux Drive x4",
+   "dataName": "DeuteronReflexDrivex4",
+   "friendlyName": "Deuteron Reflex Drive x4",
    "thrusters": 4,
-   "notes": "Nuclear Salt Water",
-   "driveClassification": "Fission_Thermal",
-   "thrust_N": 51600000,
-   "EV_kps": 66,
+   "notes": "DD Mirror-Mag Confinement Fusion",
+   "driveClassification": "Fusion_Thermal",
+   "requiredProjectName": "Project_DeuteronReflexDrive",
+   "thrust_N": 240000,
+   "EV_kps": 833,
    "specificPower_kgMW": 0,
-   "efficiency": 0.8,
+   "efficiency": 0.7,
+   "thrustRating_GW": "99.960",
+   "req power": "142.800",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Salt_Water_Core",
-   "thrustCap": 10,
-   "cooling": "Open",
-   "requiredProjectName": "Project_NeutronFluxDrive",
+   "requiredPowerPlant": "Mirrored_Magnetic_Confinement_Fusion",
+   "thrustCap": 80,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Water",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 0.5,
-      "fissiles": 0.5
+      "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_NeutronFluxDrive"
+   "iconResource": "shipbuildericons/ICO_DeuteronReflexDrive"
 },
  {
-   "dataName": "NeutronFluxDrivex5",
-   "friendlyName": "Neutron Flux Drive x5",
+   "dataName": "DeuteronReflexDrivex5",
+   "friendlyName": "Deuteron Reflex Drive x5",
    "thrusters": 5,
-   "notes": "Nuclear Salt Water",
-   "driveClassification": "Fission_Thermal",
-   "thrust_N": 64500000,
-   "EV_kps": 66,
+   "notes": "DD Mirror-Mag Confinement Fusion",
+   "driveClassification": "Fusion_Thermal",
+   "requiredProjectName": "Project_DeuteronReflexDrive",
+   "thrust_N": 300000,
+   "EV_kps": 833,
    "specificPower_kgMW": 0,
-   "efficiency": 0.8,
+   "efficiency": 0.7,
+   "thrustRating_GW": "124.950",
+   "req power": "178.500",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Salt_Water_Core",
-   "thrustCap": 10,
-   "cooling": "Open",
-   "requiredProjectName": "Project_NeutronFluxDrive",
+   "requiredPowerPlant": "Mirrored_Magnetic_Confinement_Fusion",
+   "thrustCap": 80,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Water",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 0.5,
-      "fissiles": 0.5
+      "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_NeutronFluxDrive"
+   "iconResource": "shipbuildericons/ICO_DeuteronReflexDrive"
 },
  {
-   "dataName": "NeutronFluxDrivex6",
-   "friendlyName": "Neutron Flux Drive x6",
+   "dataName": "DeuteronReflexDrivex6",
+   "friendlyName": "Deuteron Reflex Drive x6",
    "thrusters": 6,
-   "notes": "Nuclear Salt Water",
-   "driveClassification": "Fission_Thermal",
-   "thrust_N": 77400000,
-   "EV_kps": 66,
+   "notes": "DD Mirror-Mag Confinement Fusion",
+   "driveClassification": "Fusion_Thermal",
+   "requiredProjectName": "Project_DeuteronReflexDrive",
+   "thrust_N": 360000,
+   "EV_kps": 833,
    "specificPower_kgMW": 0,
-   "efficiency": 0.8,
+   "efficiency": 0.7,
+   "thrustRating_GW": "149.940",
+   "req power": "214.200",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Salt_Water_Core",
-   "thrustCap": 10,
-   "cooling": "Open",
-   "requiredProjectName": "Project_NeutronFluxDrive",
+   "requiredPowerPlant": "Mirrored_Magnetic_Confinement_Fusion",
+   "thrustCap": 80,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Water",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 0.5,
-      "fissiles": 0.5
+      "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_NeutronFluxDrive"
+   "iconResource": "shipbuildericons/ICO_DeuteronReflexDrive"
 },
  {
-   "dataName": "NeutronFluxTorchx1",
-   "friendlyName": "Neutron Flux Torch x1",
+   "dataName": "HelionReflexDrivex1",
+   "friendlyName": "Helion Reflex Drive x1",
    "thrusters": 1,
-   "notes": "90% enriched",
-   "driveClassification": "Fission_Thermal",
-   "thrust_N": 13000000,
-   "EV_kps": 4700,
+   "notes": "D-He3 Magnetic Confinement Fusion",
+   "driveClassification": "Fusion_Thermal",
+   "requiredProjectName": "Project_HelionReflexDrive",
+   "thrust_N": 97524,
+   "EV_kps": 741,
    "specificPower_kgMW": 0,
-   "efficiency": 0.8,
+   "efficiency": 0.85,
+   "thrustRating_GW": "36.133",
+   "req power": "42.509",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Salt_Water_Core",
-   "thrustCap": 10,
-   "cooling": "Open",
-   "requiredProjectName": "Project_NeutronFluxTorch",
+   "requiredPowerPlant": "Mirrored_Magnetic_Confinement_Fusion",
+   "thrustCap": 80,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Water",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 0.5,
-      "fissiles": 0.5
+      "water": 0.9,
+      "fissiles": 0.1
    },
-   "interstellar": true,
-   "iconResource": "shipbuildericons/ICO_NeutronFluxTorch"
+   "helium3Fuel": true,
+   "iconResource": "shipbuildericons/ICO_HelionReflexDrive"
 },
  {
-   "dataName": "NeutronFluxTorchx2",
-   "friendlyName": "Neutron Flux Torch x2",
+   "dataName": "HelionReflexDrivex2",
+   "friendlyName": "Helion Reflex Drive x2",
    "thrusters": 2,
-   "notes": "90% enriched",
-   "driveClassification": "Fission_Thermal",
-   "thrust_N": 26000000,
-   "EV_kps": 4700,
+   "notes": "D-He3 Magnetic Confinement Fusion",
+   "driveClassification": "Fusion_Thermal",
+   "requiredProjectName": "Project_HelionReflexDrive",
+   "thrust_N": 195048,
+   "EV_kps": 741,
    "specificPower_kgMW": 0,
-   "efficiency": 0.8,
+   "efficiency": 0.85,
+   "thrustRating_GW": "72.265",
+   "req power": "85.018",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Salt_Water_Core",
-   "thrustCap": 10,
-   "cooling": "Open",
-   "requiredProjectName": "Project_NeutronFluxTorch",
+   "requiredPowerPlant": "Mirrored_Magnetic_Confinement_Fusion",
+   "thrustCap": 80,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Water",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 0.5,
-      "fissiles": 0.5
+      "water": 0.9,
+      "fissiles": 0.1
    },
-   "interstellar": true,
-   "iconResource": "shipbuildericons/ICO_NeutronFluxTorch"
+   "helium3Fuel": true,
+   "iconResource": "shipbuildericons/ICO_HelionReflexDrive"
 },
  {
-   "dataName": "NeutronFluxTorchx3",
-   "friendlyName": "Neutron Flux Torch x3",
+   "dataName": "HelionReflexDrivex3",
+   "friendlyName": "Helion Reflex Drive x3",
    "thrusters": 3,
-   "notes": "90% enriched",
-   "driveClassification": "Fission_Thermal",
-   "thrust_N": 39000000,
-   "EV_kps": 4700,
+   "notes": "D-He3 Magnetic Confinement Fusion",
+   "driveClassification": "Fusion_Thermal",
+   "requiredProjectName": "Project_HelionReflexDrive",
+   "thrust_N": 292572,
+   "EV_kps": 741,
    "specificPower_kgMW": 0,
-   "efficiency": 0.8,
+   "efficiency": 0.85,
+   "thrustRating_GW": "108.398",
+   "req power": "127.527",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Salt_Water_Core",
-   "thrustCap": 10,
-   "cooling": "Open",
-   "requiredProjectName": "Project_NeutronFluxTorch",
+   "requiredPowerPlant": "Mirrored_Magnetic_Confinement_Fusion",
+   "thrustCap": 80,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Water",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 0.5,
-      "fissiles": 0.5
+      "water": 0.9,
+      "fissiles": 0.1
    },
-   "interstellar": true,
-   "iconResource": "shipbuildericons/ICO_NeutronFluxTorch"
+   "helium3Fuel": true,
+   "iconResource": "shipbuildericons/ICO_HelionReflexDrive"
 },
  {
-   "dataName": "NeutronFluxTorchx4",
-   "friendlyName": "Neutron Flux Torch x4",
+   "dataName": "HelionReflexDrivex4",
+   "friendlyName": "Helion Reflex Drive x4",
    "thrusters": 4,
-   "notes": "90% enriched",
-   "driveClassification": "Fission_Thermal",
-   "thrust_N": 52000000,
-   "EV_kps": 4700,
+   "notes": "D-He3 Magnetic Confinement Fusion",
+   "driveClassification": "Fusion_Thermal",
+   "requiredProjectName": "Project_HelionReflexDrive",
+   "thrust_N": 390096,
+   "EV_kps": 741,
    "specificPower_kgMW": 0,
-   "efficiency": 0.8,
+   "efficiency": 0.85,
+   "thrustRating_GW": "144.531",
+   "req power": "170.036",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Salt_Water_Core",
-   "thrustCap": 10,
-   "cooling": "Open",
-   "requiredProjectName": "Project_NeutronFluxTorch",
+   "requiredPowerPlant": "Mirrored_Magnetic_Confinement_Fusion",
+   "thrustCap": 80,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Water",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 0.5,
-      "fissiles": 0.5
+      "water": 0.9,
+      "fissiles": 0.1
    },
-   "interstellar": true,
-   "iconResource": "shipbuildericons/ICO_NeutronFluxTorch"
+   "helium3Fuel": true,
+   "iconResource": "shipbuildericons/ICO_HelionReflexDrive"
 },
  {
-   "dataName": "NeutronFluxTorchx5",
-   "friendlyName": "Neutron Flux Torch x5",
+   "dataName": "HelionReflexDrivex5",
+   "friendlyName": "Helion Reflex Drive x5",
    "thrusters": 5,
-   "notes": "90% enriched",
-   "driveClassification": "Fission_Thermal",
-   "thrust_N": 65000000,
-   "EV_kps": 4700,
+   "notes": "D-He3 Magnetic Confinement Fusion",
+   "driveClassification": "Fusion_Thermal",
+   "requiredProjectName": "Project_HelionReflexDrive",
+   "thrust_N": 487620,
+   "EV_kps": 741,
    "specificPower_kgMW": 0,
-   "efficiency": 0.8,
+   "efficiency": 0.85,
+   "thrustRating_GW": "180.663",
+   "req power": "212.545",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Salt_Water_Core",
-   "thrustCap": 10,
-   "cooling": "Open",
-   "requiredProjectName": "Project_NeutronFluxTorch",
+   "requiredPowerPlant": "Mirrored_Magnetic_Confinement_Fusion",
+   "thrustCap": 80,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Water",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 0.5,
-      "fissiles": 0.5
+      "water": 0.9,
+      "fissiles": 0.1
    },
-   "interstellar": true,
-   "iconResource": "shipbuildericons/ICO_NeutronFluxTorch"
+   "helium3Fuel": true,
+   "iconResource": "shipbuildericons/ICO_HelionReflexDrive"
 },
  {
-   "dataName": "NeutronFluxTorchx6",
-   "friendlyName": "Neutron Flux Torch x6",
+   "dataName": "HelionReflexDrivex6",
+   "friendlyName": "Helion Reflex Drive x6",
    "thrusters": 6,
-   "notes": "90% enriched",
-   "driveClassification": "Fission_Thermal",
-   "thrust_N": 78000000,
-   "EV_kps": 4700,
+   "notes": "D-He3 Magnetic Confinement Fusion",
+   "driveClassification": "Fusion_Thermal",
+   "requiredProjectName": "Project_HelionReflexDrive",
+   "thrust_N": 585144,
+   "EV_kps": 741,
    "specificPower_kgMW": 0,
-   "efficiency": 0.8,
+   "efficiency": 0.85,
+   "thrustRating_GW": "216.796",
+   "req power": "255.054",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Salt_Water_Core",
-   "thrustCap": 10,
-   "cooling": "Open",
-   "requiredProjectName": "Project_NeutronFluxTorch",
+   "requiredPowerPlant": "Mirrored_Magnetic_Confinement_Fusion",
+   "thrustCap": 80,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Water",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 0.5,
-      "fissiles": 0.5
+      "water": 0.9,
+      "fissiles": 0.1
    },
-   "interstellar": true,
-   "iconResource": "shipbuildericons/ICO_NeutronFluxTorch"
+   "helium3Fuel": true,
+   "iconResource": "shipbuildericons/ICO_HelionReflexDrive"
 },
  {
-   "dataName": "Z-pinchMicrofissionDrivex1",
-   "friendlyName": "Z-pinch Microfission Drive x1",
+   "dataName": "TritonTorusDrivex1",
+   "friendlyName": "Triton Torus Drive x1",
    "thrusters": 1,
-   "driveClassification": "Fission_Pulse",
-   "thrust_N": 12000,
-   "EV_kps": 156.96,
-   "specificPower_kgMW": 68,
-   "efficiency": 0.98,
+   "notes": "DT Magnetic Confinement Fusion",
+   "driveClassification": "Fusion_Thermal",
+   "requiredProjectName": "Project_TritonTorusDrive",
+   "thrust_N": 117000,
+   "EV_kps": 308,
+   "specificPower_kgMW": 0,
+   "efficiency": 0.85,
+   "thrustRating_GW": "18.018",
+   "req power": "21.198",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Any_General",
+   "requiredPowerPlant": "Toroid_Magnetic_Confinement_Fusion",
    "thrustCap": 40,
-   "cooling": "Open",
-   "requiredProjectName": "Project_Z-pinchMicrofissionDrive",
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "ReactionProducts",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 0.5,
-      "fissiles": 0.5
+      "water": 0.99,
+      "fissiles": 0.01
    },
-   "iconResource": "shipbuildericons/ICO_Z-pinchMicrofissionDrive"
+   "iconResource": "shipbuildericons/ICO_TritonTorusDrive"
 },
  {
-   "dataName": "NeutroniumMicrofissionDrivex1",
-   "friendlyName": "Neutronium Microfission Drive x1",
-   "thrusters": 1,
-   "notes": "Neutronium Microfission (n-Li6 Microfission)",
-   "driveClassification": "Fission_Pulse",
-   "thrust_N": 48000,
-   "EV_kps": 156.96,
-   "specificPower_kgMW": 44,
-   "efficiency": 0.99,
+   "dataName": "TritonTorusDrivex2",
+   "friendlyName": "Triton Torus Drive x2",
+   "thrusters": 2,
+   "notes": "DT Magnetic Confinement Fusion",
+   "driveClassification": "Fusion_Thermal",
+   "requiredProjectName": "Project_TritonTorusDrive",
+   "thrust_N": 234000,
+   "EV_kps": 308,
+   "specificPower_kgMW": 0,
+   "efficiency": 0.85,
+   "thrustRating_GW": "36.036",
+   "req power": "42.395",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Any_General",
+   "requiredPowerPlant": "Toroid_Magnetic_Confinement_Fusion",
    "thrustCap": 40,
-   "cooling": "Open",
-   "requiredProjectName": "Project_NeutroniumMicrofissionDrive",
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "ReactionProducts",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
       "water": 0.99,
       "fissiles": 0.01
    },
-   "moduleGranted": "NeutroniumCatalystBottle",
-   "iconResource": "shipbuildericons/ICO_NeutroniumMicrofissionDrive"
+   "iconResource": "shipbuildericons/ICO_TritonTorusDrive"
 },
  {
-   "dataName": "AntimatterMicrofissionDrivex1",
-   "friendlyName": "Antimatter Microfission Drive x1",
-   "thrusters": 1,
-   "notes": "ACMF",
-   "driveClassification": "Fission_Pulse",
-   "thrust_N": 180000,
-   "EV_kps": 132.44,
-   "specificPower_kgMW": 2,
-   "efficiency": 0.99,
+   "dataName": "TritonTorusDrivex3",
+   "friendlyName": "Triton Torus Drive x3",
+   "thrusters": 3,
+   "notes": "DT Magnetic Confinement Fusion",
+   "driveClassification": "Fusion_Thermal",
+   "requiredProjectName": "Project_TritonTorusDrive",
+   "thrust_N": 351000,
+   "EV_kps": 308,
+   "specificPower_kgMW": 0,
+   "efficiency": 0.85,
+   "thrustRating_GW": "54.054",
+   "req power": "63.593",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Any_General",
+   "requiredPowerPlant": "Toroid_Magnetic_Confinement_Fusion",
    "thrustCap": 40,
-   "cooling": "Open",
-   "requiredProjectName": "Project_AntimatterMicrofissionDrive",
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "ReactionProducts",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
       "water": 0.99,
-      "fissiles": 0.01,
-      "antimatter": 3e-16
-   },
-   "moduleGranted": "AntimatterCatalystBottle",
-   "iconResource": "shipbuildericons/ICO_AntimatterMicrofissionDrive"
-},
- {
-   "dataName": "MinimagOrionx1",
-   "friendlyName": "Minimag Orion x1",
-   "thrusters": 1,
-   "notes": "Minimag Orion 1 (DRM-1)",
-   "driveClassification": "Fission_Pulse",
-   "thrust_N": 642000,
-   "EV_kps": 93.16,
-   "specificPower_kgMW": 0.05,
-   "efficiency": 1,
-   "flatMass_tons": 0,
-   "requiredPowerPlant": "Any_General",
-   "thrustCap": 10,
-   "cooling": "Open",
-   "requiredProjectName": "Project_MinimagOrion",
-   "weightedBuildMaterials": {
-      "metals": 1
-   },
-   "propellant": "ReactionProducts",
-   "perTankPropellantMaterials": {
-      "metals": 0.4,
-      "nobleMetals": 0.4,
-      "fissiles": 0.2
+      "fissiles": 0.01
    },
-   "iconResource": "shipbuildericons/ICO_MinimagOrion"
+   "iconResource": "shipbuildericons/ICO_TritonTorusDrive"
 },
  {
-   "dataName": "AdvancedMinimagOrionx1",
-   "friendlyName": "Advanced Minimag Orion x1",
-   "thrusters": 1,
-   "driveClassification": "Fission_Pulse",
-   "thrust_N": 1870000,
-   "EV_kps": 157,
-   "specificPower_kgMW": 0.005,
-   "efficiency": 1,
+   "dataName": "TritonTorusDrivex4",
+   "friendlyName": "Triton Torus Drive x4",
+   "thrusters": 4,
+   "notes": "DT Magnetic Confinement Fusion",
+   "driveClassification": "Fusion_Thermal",
+   "requiredProjectName": "Project_TritonTorusDrive",
+   "thrust_N": 468000,
+   "EV_kps": 308,
+   "specificPower_kgMW": 0,
+   "efficiency": 0.85,
+   "thrustRating_GW": "72.072",
+   "req power": "84.791",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Any_General",
-   "thrustCap": 10,
-   "cooling": "Open",
-   "requiredProjectName": "Project_AdvancedMinimagOrion",
+   "requiredPowerPlant": "Toroid_Magnetic_Confinement_Fusion",
+   "thrustCap": 40,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "ReactionProducts",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "metals": 0.4,
-      "nobleMetals": 0.3,
-      "fissiles": 0.3
+      "water": 0.99,
+      "fissiles": 0.01
    },
-   "iconResource": "shipbuildericons/ICO_AdvancedMinimagOrion"
+   "iconResource": "shipbuildericons/ICO_TritonTorusDrive"
 },
  {
-   "dataName": "OrionDrivex1",
-   "friendlyName": "Orion Drive x1",
-   "thrusters": 1,
-   "notes": "20m Orion",
-   "driveClassification": "Fission_Pulse",
-   "thrust_N": 16000000,
-   "EV_kps": 42.1,
-   "specificPower_kgMW": 1.09,
-   "efficiency": 1,
+   "dataName": "TritonTorusDrivex5",
+   "friendlyName": "Triton Torus Drive x5",
+   "thrusters": 5,
+   "notes": "DT Magnetic Confinement Fusion",
+   "driveClassification": "Fusion_Thermal",
+   "requiredProjectName": "Project_TritonTorusDrive",
+   "thrust_N": 585000,
+   "EV_kps": 308,
+   "specificPower_kgMW": 0,
+   "efficiency": 0.85,
+   "thrustRating_GW": "90.090",
+   "req power": "105.988",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Any_General",
-   "thrustCap": 6,
-   "cooling": "Open",
-   "requiredProjectName": "Project_OrionDrive",
+   "requiredPowerPlant": "Toroid_Magnetic_Confinement_Fusion",
+   "thrustCap": 40,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "ReactionProducts",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "metals": 0.4,
-      "nobleMetals": 0.3,
-      "fissiles": 0.3
+      "water": 0.99,
+      "fissiles": 0.01
    },
-   "iconResource": "shipbuildericons/ICO_OrionDrive"
+   "iconResource": "shipbuildericons/ICO_TritonTorusDrive"
 },
  {
-   "dataName": "AdvancedOrionDrivex1",
-   "friendlyName": "Advanced Orion Drive x1",
-   "thrusters": 1,
-   "notes": "Advanced Orion",
-   "driveClassification": "Fission_Pulse",
-   "thrust_N": 24000000,
-   "EV_kps": 120,
-   "specificPower_kgMW": 0.14,
-   "efficiency": 1,
+   "dataName": "TritonTorusDrivex6",
+   "friendlyName": "Triton Torus Drive x6",
+   "thrusters": 6,
+   "notes": "DT Magnetic Confinement Fusion",
+   "driveClassification": "Fusion_Thermal",
+   "requiredProjectName": "Project_TritonTorusDrive",
+   "thrust_N": 702000,
+   "EV_kps": 308,
+   "specificPower_kgMW": 0,
+   "efficiency": 0.85,
+   "thrustRating_GW": "108.108",
+   "req power": "127.186",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Any_General",
-   "thrustCap": 6,
-   "cooling": "Open",
-   "requiredProjectName": "Project_AdvancedOrionDrive",
+   "requiredPowerPlant": "Toroid_Magnetic_Confinement_Fusion",
+   "thrustCap": 40,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "ReactionProducts",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "metals": 0.3,
-      "nobleMetals": 0.35,
-      "fissiles": 0.35
+      "water": 0.99,
+      "fissiles": 0.01
    },
-   "interstellar": true,
-   "iconResource": "shipbuildericons/ICO_AdvancedOrionDrive"
+   "iconResource": "shipbuildericons/ICO_TritonTorusDrive"
 },
  {
-   "dataName": "TritonPulseDrivex1",
-   "friendlyName": "Triton Pulse Drive x1",
+   "dataName": "DeuteronTorusDrivex1",
+   "friendlyName": "Deuteron Torus Drive x1",
    "thrusters": 1,
-   "notes": "Z-Pinch Pulsed Tritium Fusion (DTMC)",
+   "notes": "DD Magnetic Confinement Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 381200,
-   "EV_kps": 189.78,
+   "requiredProjectName": "Project_DeuteronTorusDrive",
+   "thrust_N": 156000,
+   "EV_kps": 769,
    "specificPower_kgMW": 0,
-   "efficiency": 0.885,
+   "efficiency": 0.9,
+   "thrustRating_GW": "59.982",
+   "req power": "66.647",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Z_Pinch_Fusion",
-   "thrustCap": 10,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_TritonPulseDrive",
+   "requiredPowerPlant": "Toroid_Magnetic_Confinement_Fusion",
+   "thrustCap": 80,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "ReactionProducts",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 0.995,
-      "fissiles": 0.005
+      "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_TritonPulseDrive"
+   "iconResource": "shipbuildericons/ICO_DeuteronTorusDrive"
 },
  {
-   "dataName": "TritonPulseDrivex2",
-   "friendlyName": "Triton Pulse Drive x2",
+   "dataName": "DeuteronTorusDrivex2",
+   "friendlyName": "Deuteron Torus Drive x2",
    "thrusters": 2,
-   "notes": "Z-Pinch Pulsed Tritium Fusion (DTMC)",
+   "notes": "DD Magnetic Confinement Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 762400,
-   "EV_kps": 189.78,
+   "requiredProjectName": "Project_DeuteronTorusDrive",
+   "thrust_N": 312000,
+   "EV_kps": 769,
    "specificPower_kgMW": 0,
-   "efficiency": 0.885,
+   "efficiency": 0.9,
+   "thrustRating_GW": "119.964",
+   "req power": "133.293",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Z_Pinch_Fusion",
-   "thrustCap": 10,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_TritonPulseDrive",
+   "requiredPowerPlant": "Toroid_Magnetic_Confinement_Fusion",
+   "thrustCap": 80,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "ReactionProducts",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 0.995,
-      "fissiles": 0.005
+      "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_TritonPulseDrive"
+   "iconResource": "shipbuildericons/ICO_DeuteronTorusDrive"
 },
  {
-   "dataName": "TritonPulseDrivex3",
-   "friendlyName": "Triton Pulse Drive x3",
+   "dataName": "DeuteronTorusDrivex3",
+   "friendlyName": "Deuteron Torus Drive x3",
    "thrusters": 3,
-   "notes": "Z-Pinch Pulsed Tritium Fusion (DTMC)",
+   "notes": "DD Magnetic Confinement Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 1143600,
-   "EV_kps": 189.78,
+   "requiredProjectName": "Project_DeuteronTorusDrive",
+   "thrust_N": 468000,
+   "EV_kps": 769,
    "specificPower_kgMW": 0,
-   "efficiency": 0.885,
+   "efficiency": 0.9,
+   "thrustRating_GW": "179.946",
+   "req power": "199.940",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Z_Pinch_Fusion",
-   "thrustCap": 10,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_TritonPulseDrive",
+   "requiredPowerPlant": "Toroid_Magnetic_Confinement_Fusion",
+   "thrustCap": 80,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "ReactionProducts",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 0.995,
-      "fissiles": 0.005
+      "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_TritonPulseDrive"
+   "iconResource": "shipbuildericons/ICO_DeuteronTorusDrive"
 },
  {
-   "dataName": "TritonPulseDrivex4",
-   "friendlyName": "Triton Pulse Drive x4",
+   "dataName": "DeuteronTorusDrivex4",
+   "friendlyName": "Deuteron Torus Drive x4",
    "thrusters": 4,
-   "notes": "Z-Pinch Pulsed Tritium Fusion (DTMC)",
+   "notes": "DD Magnetic Confinement Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 1524800,
-   "EV_kps": 189.78,
+   "requiredProjectName": "Project_DeuteronTorusDrive",
+   "thrust_N": 624000,
+   "EV_kps": 769,
    "specificPower_kgMW": 0,
-   "efficiency": 0.885,
+   "efficiency": 0.9,
+   "thrustRating_GW": "239.928",
+   "req power": "266.587",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Z_Pinch_Fusion",
-   "thrustCap": 10,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_TritonPulseDrive",
+   "requiredPowerPlant": "Toroid_Magnetic_Confinement_Fusion",
+   "thrustCap": 80,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "ReactionProducts",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 0.995,
-      "fissiles": 0.005
+      "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_TritonPulseDrive"
+   "iconResource": "shipbuildericons/ICO_DeuteronTorusDrive"
 },
  {
-   "dataName": "TritonPulseDrivex5",
-   "friendlyName": "Triton Pulse Drive x5",
+   "dataName": "DeuteronTorusDrivex5",
+   "friendlyName": "Deuteron Torus Drive x5",
    "thrusters": 5,
-   "notes": "Z-Pinch Pulsed Tritium Fusion (DTMC)",
+   "notes": "DD Magnetic Confinement Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 1906000,
-   "EV_kps": 189.78,
+   "requiredProjectName": "Project_DeuteronTorusDrive",
+   "thrust_N": 780000,
+   "EV_kps": 769,
    "specificPower_kgMW": 0,
-   "efficiency": 0.885,
+   "efficiency": 0.9,
+   "thrustRating_GW": "299.910",
+   "req power": "333.233",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Z_Pinch_Fusion",
-   "thrustCap": 10,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_TritonPulseDrive",
+   "requiredPowerPlant": "Toroid_Magnetic_Confinement_Fusion",
+   "thrustCap": 80,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "ReactionProducts",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 0.995,
-      "fissiles": 0.005
+      "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_TritonPulseDrive"
+   "iconResource": "shipbuildericons/ICO_DeuteronTorusDrive"
 },
  {
-   "dataName": "TritonPulseDrivex6",
-   "friendlyName": "Triton Pulse Drive x6",
+   "dataName": "DeuteronTorusDrivex6",
+   "friendlyName": "Deuteron Torus Drive x6",
    "thrusters": 6,
-   "notes": "Z-Pinch Pulsed Tritium Fusion (DTMC)",
+   "notes": "DD Magnetic Confinement Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 2287200,
-   "EV_kps": 189.78,
+   "requiredProjectName": "Project_DeuteronTorusDrive",
+   "thrust_N": 936000,
+   "EV_kps": 769,
    "specificPower_kgMW": 0,
-   "efficiency": 0.885,
+   "efficiency": 0.9,
+   "thrustRating_GW": "359.892",
+   "req power": "399.880",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Z_Pinch_Fusion",
-   "thrustCap": 10,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_TritonPulseDrive",
+   "requiredPowerPlant": "Toroid_Magnetic_Confinement_Fusion",
+   "thrustCap": 80,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "ReactionProducts",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 0.995,
-      "fissiles": 0.005
+      "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_TritonPulseDrive"
+   "iconResource": "shipbuildericons/ICO_DeuteronTorusDrive"
 },
  {
-   "dataName": "FireflyTorchx1",
-   "friendlyName": "Firefly Torch x1",
+   "dataName": "HelionTorusLanternx1",
+   "friendlyName": "Helion Torus Lantern x1",
    "thrusters": 1,
-   "notes": "Firefly Drive Z-Pinch DD",
+   "notes": "D-He3 Magnetic Confinement Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 855000,
-   "EV_kps": 98000,
+   "requiredProjectName": "Project_HelionTorusLantern",
+   "thrust_N": 556800,
+   "EV_kps": 690,
    "specificPower_kgMW": 0,
-   "efficiency": 0.85,
+   "efficiency": 0.925,
+   "thrustRating_GW": "192.096",
+   "req power": "207.671",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Z_Pinch_Fusion",
-   "thrustCap": 10,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_FireflyTorch",
+   "requiredPowerPlant": "Toroid_Magnetic_Confinement_Fusion",
+   "thrustCap": 70,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "ReactionProducts",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.9,
+      "fissiles": 0.1
    },
-   "interstellar": true,
-   "iconResource": "shipbuildericons/ICO_FireflyTorch"
+   "helium3Fuel": true,
+   "iconResource": "shipbuildericons/ICO_HelionTorusLantern"
 },
  {
-   "dataName": "FireflyTorchx2",
-   "friendlyName": "Firefly Torch x2",
+   "dataName": "HelionTorusLanternx2",
+   "friendlyName": "Helion Torus Lantern x2",
    "thrusters": 2,
-   "notes": "Firefly Drive Z-Pinch DD",
+   "notes": "D-He3 Magnetic Confinement Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 1710000,
-   "EV_kps": 98000,
+   "requiredProjectName": "Project_HelionTorusLantern",
+   "thrust_N": 1113600,
+   "EV_kps": 690,
    "specificPower_kgMW": 0,
-   "efficiency": 0.85,
+   "efficiency": 0.925,
+   "thrustRating_GW": "384.192",
+   "req power": "415.343",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Z_Pinch_Fusion",
-   "thrustCap": 10,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_FireflyTorch",
+   "requiredPowerPlant": "Toroid_Magnetic_Confinement_Fusion",
+   "thrustCap": 70,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "ReactionProducts",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.9,
+      "fissiles": 0.1
    },
-   "interstellar": true,
-   "iconResource": "shipbuildericons/ICO_FireflyTorch"
+   "helium3Fuel": true,
+   "iconResource": "shipbuildericons/ICO_HelionTorusLantern"
 },
  {
-   "dataName": "FireflyTorchx3",
-   "friendlyName": "Firefly Torch x3",
+   "dataName": "HelionTorusLanternx3",
+   "friendlyName": "Helion Torus Lantern x3",
    "thrusters": 3,
-   "notes": "Firefly Drive Z-Pinch DD",
+   "notes": "D-He3 Magnetic Confinement Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 2565000,
-   "EV_kps": 98000,
+   "requiredProjectName": "Project_HelionTorusLantern",
+   "thrust_N": 1670400,
+   "EV_kps": 690,
    "specificPower_kgMW": 0,
-   "efficiency": 0.85,
+   "efficiency": 0.925,
+   "thrustRating_GW": "576.288",
+   "req power": "623.014",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Z_Pinch_Fusion",
-   "thrustCap": 10,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_FireflyTorch",
+   "requiredPowerPlant": "Toroid_Magnetic_Confinement_Fusion",
+   "thrustCap": 70,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "ReactionProducts",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.9,
+      "fissiles": 0.1
    },
-   "interstellar": true,
-   "iconResource": "shipbuildericons/ICO_FireflyTorch"
+   "helium3Fuel": true,
+   "iconResource": "shipbuildericons/ICO_HelionTorusLantern"
 },
  {
-   "dataName": "FireflyTorchx4",
-   "friendlyName": "Firefly Torch x4",
+   "dataName": "HelionTorusLanternx4",
+   "friendlyName": "Helion Torus Lantern x4",
    "thrusters": 4,
-   "notes": "Firefly Drive Z-Pinch DD",
+   "notes": "D-He3 Magnetic Confinement Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 3420000,
-   "EV_kps": 98000,
+   "requiredProjectName": "Project_HelionTorusLantern",
+   "thrust_N": 2227200,
+   "EV_kps": 690,
    "specificPower_kgMW": 0,
-   "efficiency": 0.85,
+   "efficiency": 0.925,
+   "thrustRating_GW": "768.384",
+   "req power": "830.685",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Z_Pinch_Fusion",
-   "thrustCap": 10,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_FireflyTorch",
+   "requiredPowerPlant": "Toroid_Magnetic_Confinement_Fusion",
+   "thrustCap": 70,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "ReactionProducts",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.9,
+      "fissiles": 0.1
    },
-   "interstellar": true,
-   "iconResource": "shipbuildericons/ICO_FireflyTorch"
+   "helium3Fuel": true,
+   "iconResource": "shipbuildericons/ICO_HelionTorusLantern"
 },
  {
-   "dataName": "FireflyTorchx5",
-   "friendlyName": "Firefly Torch x5",
+   "dataName": "HelionTorusLanternx5",
+   "friendlyName": "Helion Torus Lantern x5",
    "thrusters": 5,
-   "notes": "Firefly Drive Z-Pinch DD",
+   "notes": "D-He3 Magnetic Confinement Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 4275000,
-   "EV_kps": 98000,
+   "requiredProjectName": "Project_HelionTorusLantern",
+   "thrust_N": 2784000,
+   "EV_kps": 690,
    "specificPower_kgMW": 0,
-   "efficiency": 0.85,
+   "efficiency": 0.925,
+   "thrustRating_GW": "960.480",
+   "req power": "1,038.357",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Z_Pinch_Fusion",
-   "thrustCap": 10,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_FireflyTorch",
+   "requiredPowerPlant": "Toroid_Magnetic_Confinement_Fusion",
+   "thrustCap": 70,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "ReactionProducts",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.9,
+      "fissiles": 0.1
    },
-   "interstellar": true,
-   "iconResource": "shipbuildericons/ICO_FireflyTorch"
+   "helium3Fuel": true,
+   "iconResource": "shipbuildericons/ICO_HelionTorusLantern"
 },
  {
-   "dataName": "FireflyTorchx6",
-   "friendlyName": "Firefly Torch x6",
+   "dataName": "HelionTorusLanternx6",
+   "friendlyName": "Helion Torus Lantern x6",
    "thrusters": 6,
-   "notes": "Firefly Drive Z-Pinch DD",
+   "notes": "D-He3 Magnetic Confinement Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 5130000,
-   "EV_kps": 98000,
+   "requiredProjectName": "Project_HelionTorusLantern",
+   "thrust_N": 3340800,
+   "EV_kps": 690,
    "specificPower_kgMW": 0,
-   "efficiency": 0.85,
+   "efficiency": 0.925,
+   "thrustRating_GW": "1,152.576",
+   "req power": "1,246.028",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Z_Pinch_Fusion",
-   "thrustCap": 10,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_FireflyTorch",
+   "requiredPowerPlant": "Toroid_Magnetic_Confinement_Fusion",
+   "thrustCap": 70,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "ReactionProducts",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.9,
+      "fissiles": 0.1
    },
-   "interstellar": true,
-   "iconResource": "shipbuildericons/ICO_FireflyTorch"
+   "helium3Fuel": true,
+   "iconResource": "shipbuildericons/ICO_HelionTorusLantern"
 },
  {
-   "dataName": "LithiumFusionLanternx1",
-   "friendlyName": "Lithium Fusion Lantern x1",
+   "dataName": "ProtiumTorusLanternx1",
+   "friendlyName": "Protium Torus Lantern x1",
    "thrusters": 1,
-   "notes": "Neutronium Li-6 Fusion Lantern",
+   "notes": "PP Magnetic Confinement Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 67100,
-   "EV_kps": 19.62,
+   "requiredProjectName": "Project_ProtiumTorusLantern",
+   "thrust_N": 1680000,
+   "EV_kps": 952,
    "specificPower_kgMW": 0,
-   "efficiency": 0.83,
+   "efficiency": 0.95,
+   "thrustRating_GW": "799.680",
+   "req power": "841.768",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Electrostatic_Confinement_Fusion",
-   "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_LithiumFusionLantern",
+   "requiredPowerPlant": "Toroid_Magnetic_Confinement_Fusion",
+   "thrustCap": 90,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "ReactionProducts",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 0.5,
-      "metals": 0.5
+      "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_LithiumFusionLantern"
+   "iconResource": "shipbuildericons/ICO_ProtiumTorusLantern"
 },
  {
-   "dataName": "LithiumFusionLanternx2",
-   "friendlyName": "Lithium Fusion Lantern x2",
+   "dataName": "ProtiumTorusLanternx2",
+   "friendlyName": "Protium Torus Lantern x2",
    "thrusters": 2,
-   "notes": "Neutronium Li-6 Fusion Lantern",
+   "notes": "PP Magnetic Confinement Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 134200,
-   "EV_kps": 19.62,
+   "requiredProjectName": "Project_ProtiumTorusLantern",
+   "thrust_N": 3360000,
+   "EV_kps": 952,
    "specificPower_kgMW": 0,
-   "efficiency": 0.83,
+   "efficiency": 0.95,
+   "thrustRating_GW": "1,599.360",
+   "req power": "1,683.537",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Electrostatic_Confinement_Fusion",
-   "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_LithiumFusionLantern",
+   "requiredPowerPlant": "Toroid_Magnetic_Confinement_Fusion",
+   "thrustCap": 90,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "ReactionProducts",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 0.5,
-      "metals": 0.5
+      "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_LithiumFusionLantern"
+   "iconResource": "shipbuildericons/ICO_ProtiumTorusLantern"
 },
  {
-   "dataName": "LithiumFusionLanternx3",
-   "friendlyName": "Lithium Fusion Lantern x3",
+   "dataName": "ProtiumTorusLanternx3",
+   "friendlyName": "Protium Torus Lantern x3",
    "thrusters": 3,
-   "notes": "Neutronium Li-6 Fusion Lantern",
+   "notes": "PP Magnetic Confinement Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 201300,
-   "EV_kps": 19.62,
+   "requiredProjectName": "Project_ProtiumTorusLantern",
+   "thrust_N": 5040000,
+   "EV_kps": 952,
    "specificPower_kgMW": 0,
-   "efficiency": 0.83,
+   "efficiency": 0.95,
+   "thrustRating_GW": "2,399.040",
+   "req power": "2,525.305",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Electrostatic_Confinement_Fusion",
-   "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_LithiumFusionLantern",
+   "requiredPowerPlant": "Toroid_Magnetic_Confinement_Fusion",
+   "thrustCap": 90,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "ReactionProducts",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 0.5,
-      "metals": 0.5
+      "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_LithiumFusionLantern"
+   "iconResource": "shipbuildericons/ICO_ProtiumTorusLantern"
 },
  {
-   "dataName": "LithiumFusionLanternx4",
-   "friendlyName": "Lithium Fusion Lantern x4",
+   "dataName": "ProtiumTorusLanternx4",
+   "friendlyName": "Protium Torus Lantern x4",
    "thrusters": 4,
-   "notes": "Neutronium Li-6 Fusion Lantern",
+   "notes": "PP Magnetic Confinement Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 268400,
-   "EV_kps": 19.62,
+   "requiredProjectName": "Project_ProtiumTorusLantern",
+   "thrust_N": 6720000,
+   "EV_kps": 952,
    "specificPower_kgMW": 0,
-   "efficiency": 0.83,
+   "efficiency": 0.95,
+   "thrustRating_GW": "3,198.720",
+   "req power": "3,367.074",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Electrostatic_Confinement_Fusion",
-   "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_LithiumFusionLantern",
+   "requiredPowerPlant": "Toroid_Magnetic_Confinement_Fusion",
+   "thrustCap": 90,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "ReactionProducts",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 0.5,
-      "metals": 0.5
+      "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_LithiumFusionLantern"
+   "iconResource": "shipbuildericons/ICO_ProtiumTorusLantern"
 },
  {
-   "dataName": "LithiumFusionLanternx5",
-   "friendlyName": "Lithium Fusion Lantern x5",
+   "dataName": "ProtiumTorusLanternx5",
+   "friendlyName": "Protium Torus Lantern x5",
    "thrusters": 5,
-   "notes": "Neutronium Li-6 Fusion Lantern",
+   "notes": "PP Magnetic Confinement Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 335500,
-   "EV_kps": 19.62,
+   "requiredProjectName": "Project_ProtiumTorusLantern",
+   "thrust_N": 8400000,
+   "EV_kps": 952,
    "specificPower_kgMW": 0,
-   "efficiency": 0.83,
+   "efficiency": 0.95,
+   "thrustRating_GW": "3,998.400",
+   "req power": "4,208.842",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Electrostatic_Confinement_Fusion",
-   "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_LithiumFusionLantern",
+   "requiredPowerPlant": "Toroid_Magnetic_Confinement_Fusion",
+   "thrustCap": 90,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "ReactionProducts",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 0.5,
-      "metals": 0.5
+      "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_LithiumFusionLantern"
+   "iconResource": "shipbuildericons/ICO_ProtiumTorusLantern"
 },
  {
-   "dataName": "LithiumFusionLanternx6",
-   "friendlyName": "Lithium Fusion Lantern x6",
+   "dataName": "ProtiumTorusLanternx6",
+   "friendlyName": "Protium Torus Lantern x6",
    "thrusters": 6,
-   "notes": "Neutronium Li-6 Fusion Lantern",
+   "notes": "PP Magnetic Confinement Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 402600,
-   "EV_kps": 19.62,
+   "requiredProjectName": "Project_ProtiumTorusLantern",
+   "thrust_N": 10080000,
+   "EV_kps": 952,
    "specificPower_kgMW": 0,
-   "efficiency": 0.83,
+   "efficiency": 0.95,
+   "thrustRating_GW": "4,798.080",
+   "req power": "5,050.611",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Electrostatic_Confinement_Fusion",
-   "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_LithiumFusionLantern",
+   "requiredPowerPlant": "Toroid_Magnetic_Confinement_Fusion",
+   "thrustCap": 90,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "ReactionProducts",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 0.5,
-      "metals": 0.5
+      "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_LithiumFusionLantern"
+   "iconResource": "shipbuildericons/ICO_ProtiumTorusLantern"
 },
  {
-   "dataName": "HybridFusionDrivex1",
-   "friendlyName": "Hybrid Fusion Drive x1",
+   "dataName": "TritonPolywellDrivex1",
+   "friendlyName": "Triton Polywell Drive x1",
    "thrusters": 1,
-   "notes": "DD MagnetoInternal Hybrid Fusion",
+   "notes": "DT Hybrid Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 13800,
-   "EV_kps": 50.4,
+   "requiredProjectName": "Project_TritonPolywellDrive",
+   "thrust_N": 174000,
+   "EV_kps": 276,
    "specificPower_kgMW": 0,
-   "efficiency": 0.95,
+   "efficiency": 0.85,
+   "thrustRating_GW": "24.012",
+   "req power": "28.249",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Hybrid_Confinement_Fusion",
-   "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_HybridFusionDrive",
+   "thrustCap": 25,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -8479,23 +10049,25 @@
    "perTankPropellantMaterials": {
       "metals": 1
    },
-   "iconResource": "shipbuildericons/ICO_HybridFusionDrive"
+   "iconResource": "shipbuildericons/ICO_TritonPolywellDrive"
 },
  {
-   "dataName": "HybridFusionDrivex2",
-   "friendlyName": "Hybrid Fusion Drive x2",
+   "dataName": "TritonPolywellDrivex2",
+   "friendlyName": "Triton Polywell Drive x2",
    "thrusters": 2,
-   "notes": "DD MagnetoInternal Hybrid Fusion",
+   "notes": "DT Hybrid Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 27600,
-   "EV_kps": 50.4,
+   "requiredProjectName": "Project_TritonPolywellDrive",
+   "thrust_N": 348000,
+   "EV_kps": 276,
    "specificPower_kgMW": 0,
-   "efficiency": 0.95,
+   "efficiency": 0.85,
+   "thrustRating_GW": "48.024",
+   "req power": "56.499",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Hybrid_Confinement_Fusion",
-   "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_HybridFusionDrive",
+   "thrustCap": 25,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -8503,23 +10075,25 @@
    "perTankPropellantMaterials": {
       "metals": 1
    },
-   "iconResource": "shipbuildericons/ICO_HybridFusionDrive"
+   "iconResource": "shipbuildericons/ICO_TritonPolywellDrive"
 },
  {
-   "dataName": "HybridFusionDrivex3",
-   "friendlyName": "Hybrid Fusion Drive x3",
+   "dataName": "TritonPolywellDrivex3",
+   "friendlyName": "Triton Polywell Drive x3",
    "thrusters": 3,
-   "notes": "DD MagnetoInternal Hybrid Fusion",
+   "notes": "DT Hybrid Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 41400,
-   "EV_kps": 50.4,
+   "requiredProjectName": "Project_TritonPolywellDrive",
+   "thrust_N": 522000,
+   "EV_kps": 276,
    "specificPower_kgMW": 0,
-   "efficiency": 0.95,
+   "efficiency": 0.85,
+   "thrustRating_GW": "72.036",
+   "req power": "84.748",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Hybrid_Confinement_Fusion",
-   "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_HybridFusionDrive",
+   "thrustCap": 25,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -8527,23 +10101,25 @@
    "perTankPropellantMaterials": {
       "metals": 1
    },
-   "iconResource": "shipbuildericons/ICO_HybridFusionDrive"
+   "iconResource": "shipbuildericons/ICO_TritonPolywellDrive"
 },
  {
-   "dataName": "HybridFusionDrivex4",
-   "friendlyName": "Hybrid Fusion Drive x4",
+   "dataName": "TritonPolywellDrivex4",
+   "friendlyName": "Triton Polywell Drive x4",
    "thrusters": 4,
-   "notes": "DD MagnetoInternal Hybrid Fusion",
+   "notes": "DT Hybrid Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 55200,
-   "EV_kps": 50.4,
+   "requiredProjectName": "Project_TritonPolywellDrive",
+   "thrust_N": 696000,
+   "EV_kps": 276,
    "specificPower_kgMW": 0,
-   "efficiency": 0.95,
+   "efficiency": 0.85,
+   "thrustRating_GW": "96.048",
+   "req power": "112.998",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Hybrid_Confinement_Fusion",
-   "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_HybridFusionDrive",
+   "thrustCap": 25,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -8551,23 +10127,25 @@
    "perTankPropellantMaterials": {
       "metals": 1
    },
-   "iconResource": "shipbuildericons/ICO_HybridFusionDrive"
+   "iconResource": "shipbuildericons/ICO_TritonPolywellDrive"
 },
  {
-   "dataName": "HybridFusionDrivex5",
-   "friendlyName": "Hybrid Fusion Drive x5",
+   "dataName": "TritonPolywellDrivex5",
+   "friendlyName": "Triton Polywell Drive x5",
    "thrusters": 5,
-   "notes": "DD MagnetoInternal Hybrid Fusion",
+   "notes": "DT Hybrid Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 69000,
-   "EV_kps": 50.4,
+   "requiredProjectName": "Project_TritonPolywellDrive",
+   "thrust_N": 870000,
+   "EV_kps": 276,
    "specificPower_kgMW": 0,
-   "efficiency": 0.95,
+   "efficiency": 0.85,
+   "thrustRating_GW": "120.060",
+   "req power": "141.247",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Hybrid_Confinement_Fusion",
-   "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_HybridFusionDrive",
+   "thrustCap": 25,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -8575,23 +10153,25 @@
    "perTankPropellantMaterials": {
       "metals": 1
    },
-   "iconResource": "shipbuildericons/ICO_HybridFusionDrive"
+   "iconResource": "shipbuildericons/ICO_TritonPolywellDrive"
 },
  {
-   "dataName": "HybridFusionDrivex6",
-   "friendlyName": "Hybrid Fusion Drive x6",
+   "dataName": "TritonPolywellDrivex6",
+   "friendlyName": "Triton Polywell Drive x6",
    "thrusters": 6,
-   "notes": "DD MagnetoInternal Hybrid Fusion",
+   "notes": "DT Hybrid Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 82800,
-   "EV_kps": 50.4,
+   "requiredProjectName": "Project_TritonPolywellDrive",
+   "thrust_N": 1044000,
+   "EV_kps": 276,
    "specificPower_kgMW": 0,
-   "efficiency": 0.95,
+   "efficiency": 0.85,
+   "thrustRating_GW": "144.072",
+   "req power": "169.496",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Hybrid_Confinement_Fusion",
-   "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_HybridFusionDrive",
+   "thrustCap": 25,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -8599,167 +10179,181 @@
    "perTankPropellantMaterials": {
       "metals": 1
    },
-   "iconResource": "shipbuildericons/ICO_HybridFusionDrive"
+   "iconResource": "shipbuildericons/ICO_TritonPolywellDrive"
 },
  {
-   "dataName": "IcarusDrivex1",
-   "friendlyName": "Icarus Drive x1",
+   "dataName": "DeuteronPolywellDrivex1",
+   "friendlyName": "Deuteron Polywell Drive x1",
    "thrusters": 1,
-   "notes": "Icarus Drive (Plasma Jet DD Magneto Inertial)",
+   "notes": "DD Hybrid Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 520000,
-   "EV_kps": 1189.79,
+   "requiredProjectName": "Project_DeuteronPolywellDrive",
+   "thrust_N": 251250,
+   "EV_kps": 597,
    "specificPower_kgMW": 0,
-   "efficiency": 0.95,
+   "efficiency": 0.9,
+   "thrustRating_GW": "74.998",
+   "req power": "83.331",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Hybrid_Confinement_Fusion",
-   "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_IcarusDrive",
+   "thrustCap": 50,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Hydrogen",
+   "propellant": "Metals",
    "perTankPropellantMaterials": {
-      "water": 1
+      "metals": 1
    },
-   "iconResource": "shipbuildericons/ICO_IcarusDrive"
+   "iconResource": "shipbuildericons/ICO_DeuteronPolywellDrive"
 },
  {
-   "dataName": "IcarusDrivex2",
-   "friendlyName": "Icarus Drive x2",
+   "dataName": "DeuteronPolywellDrivex2",
+   "friendlyName": "Deuteron Polywell Drive x2",
    "thrusters": 2,
-   "notes": "Icarus Drive (Plasma Jet DD Magneto Inertial)",
+   "notes": "DD Hybrid Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 1040000,
-   "EV_kps": 1189.79,
+   "requiredProjectName": "Project_DeuteronPolywellDrive",
+   "thrust_N": 502500,
+   "EV_kps": 597,
    "specificPower_kgMW": 0,
-   "efficiency": 0.95,
+   "efficiency": 0.9,
+   "thrustRating_GW": "149.996",
+   "req power": "166.663",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Hybrid_Confinement_Fusion",
-   "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_IcarusDrive",
+   "thrustCap": 50,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Hydrogen",
+   "propellant": "Metals",
    "perTankPropellantMaterials": {
-      "water": 1
+      "metals": 1
    },
-   "iconResource": "shipbuildericons/ICO_IcarusDrive"
+   "iconResource": "shipbuildericons/ICO_DeuteronPolywellDrive"
 },
  {
-   "dataName": "IcarusDrivex3",
-   "friendlyName": "Icarus Drive x3",
+   "dataName": "DeuteronPolywellDrivex3",
+   "friendlyName": "Deuteron Polywell Drive x3",
    "thrusters": 3,
-   "notes": "Icarus Drive (Plasma Jet DD Magneto Inertial)",
+   "notes": "DD Hybrid Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 1560000,
-   "EV_kps": 1189.79,
+   "requiredProjectName": "Project_DeuteronPolywellDrive",
+   "thrust_N": 753750,
+   "EV_kps": 597,
    "specificPower_kgMW": 0,
-   "efficiency": 0.95,
+   "efficiency": 0.9,
+   "thrustRating_GW": "224.994",
+   "req power": "249.994",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Hybrid_Confinement_Fusion",
-   "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_IcarusDrive",
+   "thrustCap": 50,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Hydrogen",
+   "propellant": "Metals",
    "perTankPropellantMaterials": {
-      "water": 1
+      "metals": 1
    },
-   "iconResource": "shipbuildericons/ICO_IcarusDrive"
+   "iconResource": "shipbuildericons/ICO_DeuteronPolywellDrive"
 },
  {
-   "dataName": "IcarusDrivex4",
-   "friendlyName": "Icarus Drive x4",
+   "dataName": "DeuteronPolywellDrivex4",
+   "friendlyName": "Deuteron Polywell Drive x4",
    "thrusters": 4,
-   "notes": "Icarus Drive (Plasma Jet DD Magneto Inertial)",
+   "notes": "DD Hybrid Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 2080000,
-   "EV_kps": 1189.79,
+   "requiredProjectName": "Project_DeuteronPolywellDrive",
+   "thrust_N": 1005000,
+   "EV_kps": 597,
    "specificPower_kgMW": 0,
-   "efficiency": 0.95,
+   "efficiency": 0.9,
+   "thrustRating_GW": "299.993",
+   "req power": "333.325",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Hybrid_Confinement_Fusion",
-   "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_IcarusDrive",
+   "thrustCap": 50,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Hydrogen",
+   "propellant": "Metals",
    "perTankPropellantMaterials": {
-      "water": 1
+      "metals": 1
    },
-   "iconResource": "shipbuildericons/ICO_IcarusDrive"
+   "iconResource": "shipbuildericons/ICO_DeuteronPolywellDrive"
 },
  {
-   "dataName": "IcarusDrivex5",
-   "friendlyName": "Icarus Drive x5",
+   "dataName": "DeuteronPolywellDrivex5",
+   "friendlyName": "Deuteron Polywell Drive x5",
    "thrusters": 5,
-   "notes": "Icarus Drive (Plasma Jet DD Magneto Inertial)",
+   "notes": "DD Hybrid Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 2600000,
-   "EV_kps": 1189.79,
+   "requiredProjectName": "Project_DeuteronPolywellDrive",
+   "thrust_N": 1256250,
+   "EV_kps": 597,
    "specificPower_kgMW": 0,
-   "efficiency": 0.95,
+   "efficiency": 0.9,
+   "thrustRating_GW": "374.991",
+   "req power": "416.656",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Hybrid_Confinement_Fusion",
-   "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_IcarusDrive",
+   "thrustCap": 50,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Hydrogen",
+   "propellant": "Metals",
    "perTankPropellantMaterials": {
-      "water": 1
+      "metals": 1
    },
-   "iconResource": "shipbuildericons/ICO_IcarusDrive"
+   "iconResource": "shipbuildericons/ICO_DeuteronPolywellDrive"
 },
  {
-   "dataName": "IcarusDrivex6",
-   "friendlyName": "Icarus Drive x6",
+   "dataName": "DeuteronPolywellDrivex6",
+   "friendlyName": "Deuteron Polywell Drive x6",
    "thrusters": 6,
-   "notes": "Icarus Drive (Plasma Jet DD Magneto Inertial)",
+   "notes": "DD Hybrid Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 3120000,
-   "EV_kps": 1189.79,
+   "requiredProjectName": "Project_DeuteronPolywellDrive",
+   "thrust_N": 1507500,
+   "EV_kps": 597,
    "specificPower_kgMW": 0,
-   "efficiency": 0.95,
+   "efficiency": 0.9,
+   "thrustRating_GW": "449.989",
+   "req power": "499.988",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Hybrid_Confinement_Fusion",
-   "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_IcarusDrive",
+   "thrustCap": 50,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Hydrogen",
+   "propellant": "Metals",
    "perTankPropellantMaterials": {
-      "water": 1
+      "metals": 1
    },
-   "iconResource": "shipbuildericons/ICO_IcarusDrive"
+   "iconResource": "shipbuildericons/ICO_DeuteronPolywellDrive"
 },
  {
-   "dataName": "IcarusTorchx1",
-   "friendlyName": "Icarus Torch x1",
+   "dataName": "HelionPlasmajetLanternx1",
+   "friendlyName": "Helion Plasmajet Lantern x1",
    "thrusters": 1,
-   "notes": "DD Hybrid Fusion",
+   "notes": "D-He3 Hybrid Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 1340000,
-   "EV_kps": 4461.27,
+   "requiredProjectName": "Project_HelionPlasmajetLantern",
+   "thrust_N": 1095000,
+   "EV_kps": 548,
    "specificPower_kgMW": 0,
    "efficiency": 0.95,
+   "thrustRating_GW": "300.030",
+   "req power": "315.821",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Hybrid_Confinement_Fusion",
-   "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_IcarusTorch",
+   "thrustCap": 50,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -8767,24 +10361,26 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "interstellar": true,
-   "iconResource": "shipbuildericons/ICO_IcarusTorch"
+   "helium3Fuel": true,
+   "iconResource": "shipbuildericons/ICO_HelionPlasmajetLantern"
 },
  {
-   "dataName": "IcarusTorchx2",
-   "friendlyName": "Icarus Torch x2",
+   "dataName": "HelionPlasmajetLanternx2",
+   "friendlyName": "Helion Plasmajet Lantern x2",
    "thrusters": 2,
-   "notes": "DD Hybrid Fusion",
+   "notes": "D-He3 Hybrid Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 2680000,
-   "EV_kps": 4461.27,
+   "requiredProjectName": "Project_HelionPlasmajetLantern",
+   "thrust_N": 2190000,
+   "EV_kps": 548,
    "specificPower_kgMW": 0,
    "efficiency": 0.95,
+   "thrustRating_GW": "600.060",
+   "req power": "631.642",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Hybrid_Confinement_Fusion",
-   "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_IcarusTorch",
+   "thrustCap": 50,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -8792,24 +10388,26 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "interstellar": true,
-   "iconResource": "shipbuildericons/ICO_IcarusTorch"
+   "helium3Fuel": true,
+   "iconResource": "shipbuildericons/ICO_HelionPlasmajetLantern"
 },
  {
-   "dataName": "IcarusTorchx3",
-   "friendlyName": "Icarus Torch x3",
+   "dataName": "HelionPlasmajetLanternx3",
+   "friendlyName": "Helion Plasmajet Lantern x3",
    "thrusters": 3,
-   "notes": "DD Hybrid Fusion",
+   "notes": "D-He3 Hybrid Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 4020000,
-   "EV_kps": 4461.27,
+   "requiredProjectName": "Project_HelionPlasmajetLantern",
+   "thrust_N": 3285000,
+   "EV_kps": 548,
    "specificPower_kgMW": 0,
    "efficiency": 0.95,
+   "thrustRating_GW": "900.090",
+   "req power": "947.463",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Hybrid_Confinement_Fusion",
-   "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_IcarusTorch",
+   "thrustCap": 50,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -8817,24 +10415,26 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "interstellar": true,
-   "iconResource": "shipbuildericons/ICO_IcarusTorch"
+   "helium3Fuel": true,
+   "iconResource": "shipbuildericons/ICO_HelionPlasmajetLantern"
 },
  {
-   "dataName": "IcarusTorchx4",
-   "friendlyName": "Icarus Torch x4",
+   "dataName": "HelionPlasmajetLanternx4",
+   "friendlyName": "Helion Plasmajet Lantern x4",
    "thrusters": 4,
-   "notes": "DD Hybrid Fusion",
+   "notes": "D-He3 Hybrid Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 5360000,
-   "EV_kps": 4461.27,
+   "requiredProjectName": "Project_HelionPlasmajetLantern",
+   "thrust_N": 4380000,
+   "EV_kps": 548,
    "specificPower_kgMW": 0,
    "efficiency": 0.95,
+   "thrustRating_GW": "1,200.120",
+   "req power": "1,263.284",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Hybrid_Confinement_Fusion",
-   "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_IcarusTorch",
+   "thrustCap": 50,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -8842,24 +10442,26 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "interstellar": true,
-   "iconResource": "shipbuildericons/ICO_IcarusTorch"
+   "helium3Fuel": true,
+   "iconResource": "shipbuildericons/ICO_HelionPlasmajetLantern"
 },
  {
-   "dataName": "IcarusTorchx5",
-   "friendlyName": "Icarus Torch x5",
+   "dataName": "HelionPlasmajetLanternx5",
+   "friendlyName": "Helion Plasmajet Lantern x5",
    "thrusters": 5,
-   "notes": "DD Hybrid Fusion",
+   "notes": "D-He3 Hybrid Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 6700000,
-   "EV_kps": 4461.27,
+   "requiredProjectName": "Project_HelionPlasmajetLantern",
+   "thrust_N": 5475000,
+   "EV_kps": 548,
    "specificPower_kgMW": 0,
    "efficiency": 0.95,
+   "thrustRating_GW": "1,500.150",
+   "req power": "1,579.105",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Hybrid_Confinement_Fusion",
-   "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_IcarusTorch",
+   "thrustCap": 50,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -8867,24 +10469,26 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "interstellar": true,
-   "iconResource": "shipbuildericons/ICO_IcarusTorch"
+   "helium3Fuel": true,
+   "iconResource": "shipbuildericons/ICO_HelionPlasmajetLantern"
 },
  {
-   "dataName": "IcarusTorchx6",
-   "friendlyName": "Icarus Torch x6",
+   "dataName": "HelionPlasmajetLanternx6",
+   "friendlyName": "Helion Plasmajet Lantern x6",
    "thrusters": 6,
-   "notes": "DD Hybrid Fusion",
+   "notes": "D-He3 Hybrid Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 8040000,
-   "EV_kps": 4461.27,
+   "requiredProjectName": "Project_HelionPlasmajetLantern",
+   "thrust_N": 6570000,
+   "EV_kps": 548,
    "specificPower_kgMW": 0,
    "efficiency": 0.95,
+   "thrustRating_GW": "1,800.180",
+   "req power": "1,894.926",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Hybrid_Confinement_Fusion",
-   "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_IcarusTorch",
+   "thrustCap": 50,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -8892,318 +10496,356 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "interstellar": true,
-   "iconResource": "shipbuildericons/ICO_IcarusTorch"
+   "helium3Fuel": true,
+   "iconResource": "shipbuildericons/ICO_HelionPlasmajetLantern"
 },
  {
-   "dataName": "AlienFusionLanternx1",
-   "friendlyName": "Alien Fusion Lantern x1",
+   "dataName": "BoranePlasmajetTorchx1",
+   "friendlyName": "Borane Plasmajet Torch x1",
    "thrusters": 1,
-   "notes": "Hybrid Fusion",
+   "notes": "p-B Hybrid Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 412000,
-   "EV_kps": 422,
+   "requiredProjectName": "Project_BoranePlasmajetTorch",
+   "thrust_N": 5040000,
+   "EV_kps": 714,
    "specificPower_kgMW": 0,
    "efficiency": 0.95,
+   "thrustRating_GW": "1,799.280",
+   "req power": "1,893.979",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Hybrid_Confinement_Fusion",
    "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_AlienMasterProject",
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
    "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.8,
+      "volatiles": 0.1,
+      "metals": 0.1
    },
-   "iconResource": "shipbuildericons/ICO_AlienFusionTorch"
+   "iconResource": "shipbuildericons/ICO_BoranePlasmajetTorch"
 },
  {
-   "dataName": "AlienFusionLanternx2",
-   "friendlyName": "Alien Fusion Lantern x2",
+   "dataName": "BoranePlasmajetTorchx2",
+   "friendlyName": "Borane Plasmajet Torch x2",
    "thrusters": 2,
-   "notes": "Hybrid Fusion",
+   "notes": "p-B Hybrid Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 824000,
-   "EV_kps": 422,
+   "requiredProjectName": "Project_BoranePlasmajetTorch",
+   "thrust_N": 10080000,
+   "EV_kps": 714,
    "specificPower_kgMW": 0,
    "efficiency": 0.95,
+   "thrustRating_GW": "3,598.560",
+   "req power": "3,787.958",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Hybrid_Confinement_Fusion",
    "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_AlienMasterProject",
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
    "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.8,
+      "volatiles": 0.1,
+      "metals": 0.1
    },
-   "iconResource": "shipbuildericons/ICO_AlienFusionTorch"
+   "iconResource": "shipbuildericons/ICO_BoranePlasmajetTorch"
 },
  {
-   "dataName": "AlienFusionLanternx3",
-   "friendlyName": "Alien Fusion Lantern x3",
+   "dataName": "BoranePlasmajetTorchx3",
+   "friendlyName": "Borane Plasmajet Torch x3",
    "thrusters": 3,
-   "notes": "Hybrid Fusion",
+   "notes": "p-B Hybrid Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 1236000,
-   "EV_kps": 422,
+   "requiredProjectName": "Project_BoranePlasmajetTorch",
+   "thrust_N": 15120000,
+   "EV_kps": 714,
    "specificPower_kgMW": 0,
    "efficiency": 0.95,
+   "thrustRating_GW": "5,397.840",
+   "req power": "5,681.937",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Hybrid_Confinement_Fusion",
    "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_AlienMasterProject",
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
    "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.8,
+      "volatiles": 0.1,
+      "metals": 0.1
    },
-   "iconResource": "shipbuildericons/ICO_AlienFusionTorch"
+   "iconResource": "shipbuildericons/ICO_BoranePlasmajetTorch"
 },
  {
-   "dataName": "AlienFusionLanternx4",
-   "friendlyName": "Alien Fusion Lantern x4",
+   "dataName": "BoranePlasmajetTorchx4",
+   "friendlyName": "Borane Plasmajet Torch x4",
    "thrusters": 4,
-   "notes": "Hybrid Fusion",
+   "notes": "p-B Hybrid Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 1648000,
-   "EV_kps": 422,
+   "requiredProjectName": "Project_BoranePlasmajetTorch",
+   "thrust_N": 20160000,
+   "EV_kps": 714,
    "specificPower_kgMW": 0,
    "efficiency": 0.95,
+   "thrustRating_GW": "7,197.120",
+   "req power": "7,575.916",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Hybrid_Confinement_Fusion",
    "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_AlienMasterProject",
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
    "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.8,
+      "volatiles": 0.1,
+      "metals": 0.1
    },
-   "iconResource": "shipbuildericons/ICO_AlienFusionTorch"
+   "iconResource": "shipbuildericons/ICO_BoranePlasmajetTorch"
 },
  {
-   "dataName": "AlienFusionLanternx5",
-   "friendlyName": "Alien Fusion Lantern x5",
+   "dataName": "BoranePlasmajetTorchx5",
+   "friendlyName": "Borane Plasmajet Torch x5",
    "thrusters": 5,
-   "notes": "Hybrid Fusion",
+   "notes": "p-B Hybrid Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 2060000,
-   "EV_kps": 422,
+   "requiredProjectName": "Project_BoranePlasmajetTorch",
+   "thrust_N": 25200000,
+   "EV_kps": 714,
    "specificPower_kgMW": 0,
    "efficiency": 0.95,
+   "thrustRating_GW": "8,996.400",
+   "req power": "9,469.895",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Hybrid_Confinement_Fusion",
    "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_AlienMasterProject",
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
    "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.8,
+      "volatiles": 0.1,
+      "metals": 0.1
    },
-   "iconResource": "shipbuildericons/ICO_AlienFusionTorch"
+   "iconResource": "shipbuildericons/ICO_BoranePlasmajetTorch"
 },
  {
-   "dataName": "AlienFusionLanternx6",
-   "friendlyName": "Alien Fusion Lantern x6",
+   "dataName": "BoranePlasmajetTorchx6",
+   "friendlyName": "Borane Plasmajet Torch x6",
    "thrusters": 6,
-   "notes": "Hybrid Fusion",
+   "notes": "p-B Hybrid Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 2472000,
-   "EV_kps": 422,
+   "requiredProjectName": "Project_BoranePlasmajetTorch",
+   "thrust_N": 30240000,
+   "EV_kps": 714,
    "specificPower_kgMW": 0,
    "efficiency": 0.95,
+   "thrustRating_GW": "10,795.680",
+   "req power": "11,363.874",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Hybrid_Confinement_Fusion",
    "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_AlienMasterProject",
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
    "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.8,
+      "volatiles": 0.1,
+      "metals": 0.1
    },
-   "iconResource": "shipbuildericons/ICO_AlienFusionTorch"
+   "iconResource": "shipbuildericons/ICO_BoranePlasmajetTorch"
 },
  {
-   "dataName": "AlienFusionTorchx1",
-   "friendlyName": "Alien Fusion Torch x1",
+   "dataName": "ZetaTritonDrivex1",
+   "friendlyName": "Zeta Triton Drive x1",
    "thrusters": 1,
-   "notes": "Hybrid Fusion",
+   "notes": "Z-Pinch Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 1340000,
-   "EV_kps": 1300,
+   "requiredProjectName": "Project_ZetaTritonDrive",
+   "thrust_N": 183600,
+   "EV_kps": 392,
    "specificPower_kgMW": 0,
-   "efficiency": 0.97,
-   "flatMass_tons": 10,
-   "requiredPowerPlant": "Hybrid_Confinement_Fusion",
-   "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_AlienMasterProject",
+   "efficiency": 0.85,
+   "thrustRating_GW": "35.986",
+   "req power": "42.336",
+   "flatMass_tons": 0,
+   "requiredPowerPlant": "Z_Pinch_Fusion",
+   "thrustCap": 30,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
-      "metals": 0.9,
-      "exotics": 0.1
+      "metals": 1
    },
-   "propellant": "Hydrogen",
+   "propellant": "ReactionProducts",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.99,
+      "fissiles": 0.01
    },
-   "iconResource": "shipbuildericons/ICO_AlienFusionTorch"
+   "iconResource": "shipbuildericons/ICO_ZetaTritonDrive"
 },
  {
-   "dataName": "AlienFusionTorchx2",
-   "friendlyName": "Alien Fusion Torch x2",
+   "dataName": "ZetaTritonDrivex2",
+   "friendlyName": "Zeta Triton Drive x2",
    "thrusters": 2,
-   "notes": "Hybrid Fusion",
+   "notes": "Z-Pinch Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 2680000,
-   "EV_kps": 1300,
+   "requiredProjectName": "Project_ZetaTritonDrive",
+   "thrust_N": 367200,
+   "EV_kps": 392,
    "specificPower_kgMW": 0,
-   "efficiency": 0.97,
-   "flatMass_tons": 20,
-   "requiredPowerPlant": "Hybrid_Confinement_Fusion",
-   "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_AlienMasterProject",
+   "efficiency": 0.85,
+   "thrustRating_GW": "71.971",
+   "req power": "84.672",
+   "flatMass_tons": 0,
+   "requiredPowerPlant": "Z_Pinch_Fusion",
+   "thrustCap": 30,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
-      "metals": 0.9,
-      "exotics": 0.1
+      "metals": 1
    },
-   "propellant": "Hydrogen",
+   "propellant": "ReactionProducts",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.99,
+      "fissiles": 0.01
    },
-   "iconResource": "shipbuildericons/ICO_AlienFusionTorch"
+   "iconResource": "shipbuildericons/ICO_ZetaTritonDrive"
 },
  {
-   "dataName": "AlienFusionTorchx3",
-   "friendlyName": "Alien Fusion Torch x3",
+   "dataName": "ZetaTritonDrivex3",
+   "friendlyName": "Zeta Triton Drive x3",
    "thrusters": 3,
-   "notes": "Hybrid Fusion",
+   "notes": "Z-Pinch Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 4020000,
-   "EV_kps": 1300,
+   "requiredProjectName": "Project_ZetaTritonDrive",
+   "thrust_N": 550800,
+   "EV_kps": 392,
    "specificPower_kgMW": 0,
-   "efficiency": 0.97,
-   "flatMass_tons": 30,
-   "requiredPowerPlant": "Hybrid_Confinement_Fusion",
-   "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_AlienMasterProject",
+   "efficiency": 0.85,
+   "thrustRating_GW": "107.957",
+   "req power": "127.008",
+   "flatMass_tons": 0,
+   "requiredPowerPlant": "Z_Pinch_Fusion",
+   "thrustCap": 30,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
-      "metals": 0.9,
-      "exotics": 0.1
+      "metals": 1
    },
-   "propellant": "Hydrogen",
+   "propellant": "ReactionProducts",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.99,
+      "fissiles": 0.01
    },
-   "iconResource": "shipbuildericons/ICO_AlienFusionTorch"
+   "iconResource": "shipbuildericons/ICO_ZetaTritonDrive"
 },
  {
-   "dataName": "AlienFusionTorchx4",
-   "friendlyName": "Alien Fusion Torch x4",
+   "dataName": "ZetaTritonDrivex4",
+   "friendlyName": "Zeta Triton Drive x4",
    "thrusters": 4,
-   "notes": "Hybrid Fusion",
+   "notes": "Z-Pinch Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 5360000,
-   "EV_kps": 1300,
+   "requiredProjectName": "Project_ZetaTritonDrive",
+   "thrust_N": 734400,
+   "EV_kps": 392,
    "specificPower_kgMW": 0,
-   "efficiency": 0.97,
-   "flatMass_tons": 40,
-   "requiredPowerPlant": "Hybrid_Confinement_Fusion",
-   "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_AlienMasterProject",
+   "efficiency": 0.85,
+   "thrustRating_GW": "143.942",
+   "req power": "169.344",
+   "flatMass_tons": 0,
+   "requiredPowerPlant": "Z_Pinch_Fusion",
+   "thrustCap": 30,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
-      "metals": 0.9,
-      "exotics": 0.1
+      "metals": 1
    },
-   "propellant": "Hydrogen",
+   "propellant": "ReactionProducts",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.99,
+      "fissiles": 0.01
    },
-   "iconResource": "shipbuildericons/ICO_AlienFusionTorch"
+   "iconResource": "shipbuildericons/ICO_ZetaTritonDrive"
 },
  {
-   "dataName": "AlienFusionTorchx5",
-   "friendlyName": "Alien Fusion Torch x5",
+   "dataName": "ZetaTritonDrivex5",
+   "friendlyName": "Zeta Triton Drive x5",
    "thrusters": 5,
-   "notes": "Hybrid Fusion",
+   "notes": "Z-Pinch Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 6700000,
-   "EV_kps": 1300,
+   "requiredProjectName": "Project_ZetaTritonDrive",
+   "thrust_N": 918000,
+   "EV_kps": 392,
    "specificPower_kgMW": 0,
-   "efficiency": 0.97,
-   "flatMass_tons": 50,
-   "requiredPowerPlant": "Hybrid_Confinement_Fusion",
-   "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_AlienMasterProject",
+   "efficiency": 0.85,
+   "thrustRating_GW": "179.928",
+   "req power": "211.680",
+   "flatMass_tons": 0,
+   "requiredPowerPlant": "Z_Pinch_Fusion",
+   "thrustCap": 30,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
-      "metals": 0.9,
-      "exotics": 0.1
+      "metals": 1
    },
-   "propellant": "Hydrogen",
+   "propellant": "ReactionProducts",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.99,
+      "fissiles": 0.01
    },
-   "iconResource": "shipbuildericons/ICO_AlienFusionTorch"
+   "iconResource": "shipbuildericons/ICO_ZetaTritonDrive"
 },
  {
-   "dataName": "AlienFusionTorchx6",
-   "friendlyName": "Alien Fusion Torch x6",
+   "dataName": "ZetaTritonDrivex6",
+   "friendlyName": "Zeta Triton Drive x6",
    "thrusters": 6,
-   "notes": "Hybrid Fusion",
+   "notes": "Z-Pinch Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 8040000,
-   "EV_kps": 1300,
+   "requiredProjectName": "Project_ZetaTritonDrive",
+   "thrust_N": 1101600,
+   "EV_kps": 392,
    "specificPower_kgMW": 0,
-   "efficiency": 0.97,
-   "flatMass_tons": 60,
-   "requiredPowerPlant": "Hybrid_Confinement_Fusion",
-   "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_AlienMasterProject",
+   "efficiency": 0.85,
+   "thrustRating_GW": "215.914",
+   "req power": "254.016",
+   "flatMass_tons": 0,
+   "requiredPowerPlant": "Z_Pinch_Fusion",
+   "thrustCap": 30,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
-      "metals": 0.9,
-      "exotics": 0.1
+      "metals": 1
    },
-   "propellant": "Hydrogen",
+   "propellant": "ReactionProducts",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.99,
+      "fissiles": 0.01
    },
-   "iconResource": "shipbuildericons/ICO_AlienFusionTorch"
+   "iconResource": "shipbuildericons/ICO_ZetaTritonDrive"
 },
  {
-   "dataName": "TritonTorusDrivex1",
-   "friendlyName": "Triton Torus Drive x1",
+   "dataName": "ZetaDeuteronDrivex1",
+   "friendlyName": "Zeta Deuteron Drive x1",
    "thrusters": 1,
-   "notes": "DT Magnetic Confinement Fusion",
+   "notes": "Z-Pinch Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 66800,
-   "EV_kps": 66.8,
+   "requiredProjectName": "Project_ZetaDeuteronDrive",
+   "thrust_N": 108000,
+   "EV_kps": 1667,
    "specificPower_kgMW": 0,
-   "efficiency": 0.65,
+   "efficiency": 0.9,
+   "thrustRating_GW": "90.018",
+   "req power": "100.020",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Toroid_Magnetic_Confinement_Fusion",
-   "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_TritonTorusDrive",
+   "requiredPowerPlant": "Z_Pinch_Fusion",
+   "thrustCap": 50,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -9211,23 +10853,25 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_TritonTorusDrive"
+   "iconResource": "shipbuildericons/ICO_ZetaDeuteronDrive"
 },
  {
-   "dataName": "TritonTorusDrivex2",
-   "friendlyName": "Triton Torus Drive x2",
+   "dataName": "ZetaDeuteronDrivex2",
+   "friendlyName": "Zeta Deuteron Drive x2",
    "thrusters": 2,
-   "notes": "DT Magnetic Confinement Fusion",
+   "notes": "Z-Pinch Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 133600,
-   "EV_kps": 66.8,
+   "requiredProjectName": "Project_ZetaDeuteronDrive",
+   "thrust_N": 216000,
+   "EV_kps": 1667,
    "specificPower_kgMW": 0,
-   "efficiency": 0.65,
+   "efficiency": 0.9,
+   "thrustRating_GW": "180.036",
+   "req power": "200.040",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Toroid_Magnetic_Confinement_Fusion",
-   "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_TritonTorusDrive",
+   "requiredPowerPlant": "Z_Pinch_Fusion",
+   "thrustCap": 50,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -9235,23 +10879,25 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_TritonTorusDrive"
+   "iconResource": "shipbuildericons/ICO_ZetaDeuteronDrive"
 },
  {
-   "dataName": "TritonTorusDrivex3",
-   "friendlyName": "Triton Torus Drive x3",
+   "dataName": "ZetaDeuteronDrivex3",
+   "friendlyName": "Zeta Deuteron Drive x3",
    "thrusters": 3,
-   "notes": "DT Magnetic Confinement Fusion",
+   "notes": "Z-Pinch Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 200400,
-   "EV_kps": 66.8,
+   "requiredProjectName": "Project_ZetaDeuteronDrive",
+   "thrust_N": 324000,
+   "EV_kps": 1667,
    "specificPower_kgMW": 0,
-   "efficiency": 0.65,
+   "efficiency": 0.9,
+   "thrustRating_GW": "270.054",
+   "req power": "300.060",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Toroid_Magnetic_Confinement_Fusion",
-   "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_TritonTorusDrive",
+   "requiredPowerPlant": "Z_Pinch_Fusion",
+   "thrustCap": 50,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -9259,23 +10905,25 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_TritonTorusDrive"
+   "iconResource": "shipbuildericons/ICO_ZetaDeuteronDrive"
 },
  {
-   "dataName": "TritonTorusDrivex4",
-   "friendlyName": "Triton Torus Drive x4",
+   "dataName": "ZetaDeuteronDrivex4",
+   "friendlyName": "Zeta Deuteron Drive x4",
    "thrusters": 4,
-   "notes": "DT Magnetic Confinement Fusion",
+   "notes": "Z-Pinch Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 267200,
-   "EV_kps": 66.8,
+   "requiredProjectName": "Project_ZetaDeuteronDrive",
+   "thrust_N": 432000,
+   "EV_kps": 1667,
    "specificPower_kgMW": 0,
-   "efficiency": 0.65,
+   "efficiency": 0.9,
+   "thrustRating_GW": "360.072",
+   "req power": "400.080",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Toroid_Magnetic_Confinement_Fusion",
-   "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_TritonTorusDrive",
+   "requiredPowerPlant": "Z_Pinch_Fusion",
+   "thrustCap": 50,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -9283,23 +10931,25 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_TritonTorusDrive"
+   "iconResource": "shipbuildericons/ICO_ZetaDeuteronDrive"
 },
  {
-   "dataName": "TritonTorusDrivex5",
-   "friendlyName": "Triton Torus Drive x5",
+   "dataName": "ZetaDeuteronDrivex5",
+   "friendlyName": "Zeta Deuteron Drive x5",
    "thrusters": 5,
-   "notes": "DT Magnetic Confinement Fusion",
+   "notes": "Z-Pinch Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 334000,
-   "EV_kps": 66.8,
+   "requiredProjectName": "Project_ZetaDeuteronDrive",
+   "thrust_N": 540000,
+   "EV_kps": 1667,
    "specificPower_kgMW": 0,
-   "efficiency": 0.65,
+   "efficiency": 0.9,
+   "thrustRating_GW": "450.090",
+   "req power": "500.100",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Toroid_Magnetic_Confinement_Fusion",
-   "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_TritonTorusDrive",
+   "requiredPowerPlant": "Z_Pinch_Fusion",
+   "thrustCap": 50,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -9307,23 +10957,25 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_TritonTorusDrive"
+   "iconResource": "shipbuildericons/ICO_ZetaDeuteronDrive"
 },
  {
-   "dataName": "TritonTorusDrivex6",
-   "friendlyName": "Triton Torus Drive x6",
+   "dataName": "ZetaDeuteronDrivex6",
+   "friendlyName": "Zeta Deuteron Drive x6",
    "thrusters": 6,
-   "notes": "DT Magnetic Confinement Fusion",
+   "notes": "Z-Pinch Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 400800,
-   "EV_kps": 66.8,
+   "requiredProjectName": "Project_ZetaDeuteronDrive",
+   "thrust_N": 648000,
+   "EV_kps": 1667,
    "specificPower_kgMW": 0,
-   "efficiency": 0.65,
+   "efficiency": 0.9,
+   "thrustRating_GW": "540.108",
+   "req power": "600.120",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Toroid_Magnetic_Confinement_Fusion",
-   "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_TritonTorusDrive",
+   "requiredPowerPlant": "Z_Pinch_Fusion",
+   "thrustCap": 50,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -9331,1469 +10983,1693 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_TritonTorusDrive"
+   "iconResource": "shipbuildericons/ICO_ZetaDeuteronDrive"
 },
  {
-   "dataName": "TritonReflexDrivex1",
-   "friendlyName": "Triton Reflex Drive x1",
+   "dataName": "ZetaDeuteronTorchx1",
+   "friendlyName": "Zeta Deuteron Torch x1",
    "thrusters": 1,
-   "notes": "DT Magnetic Confinement Fusion",
+   "notes": "Z-Pinch Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 47000,
-   "EV_kps": 1960,
+   "requiredProjectName": "Project_ZetaDeuteronTorch",
+   "thrust_N": 720000,
+   "EV_kps": 3334,
    "specificPower_kgMW": 0,
-   "efficiency": 0.77,
+   "efficiency": 0.95,
+   "thrustRating_GW": "1,200.240",
+   "req power": "1,263.411",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Mirrored_Magnetic_Confinement_Fusion",
+   "requiredPowerPlant": "Z_Pinch_Fusion",
    "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_TritonReflexDrive",
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Hydrogen",
+   "propellant": "ReactionProducts",
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_TritonReflexDrive"
+   "iconResource": "shipbuildericons/ICO_ZetaDeuteronTorch"
 },
  {
-   "dataName": "TritonReflexDrivex2",
-   "friendlyName": "Triton Reflex Drive x2",
+   "dataName": "ZetaDeuteronTorchx2",
+   "friendlyName": "Zeta Deuteron Torch x2",
    "thrusters": 2,
-   "notes": "DT Magnetic Confinement Fusion",
+   "notes": "Z-Pinch Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 94000,
-   "EV_kps": 1960,
+   "requiredProjectName": "Project_ZetaDeuteronTorch",
+   "thrust_N": 1440000,
+   "EV_kps": 3334,
    "specificPower_kgMW": 0,
-   "efficiency": 0.77,
+   "efficiency": 0.95,
+   "thrustRating_GW": "2,400.480",
+   "req power": "2,526.821",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Mirrored_Magnetic_Confinement_Fusion",
+   "requiredPowerPlant": "Z_Pinch_Fusion",
    "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_TritonReflexDrive",
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Hydrogen",
+   "propellant": "ReactionProducts",
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_TritonReflexDrive"
+   "iconResource": "shipbuildericons/ICO_ZetaDeuteronTorch"
 },
  {
-   "dataName": "TritonReflexDrivex3",
-   "friendlyName": "Triton Reflex Drive x3",
+   "dataName": "ZetaDeuteronTorchx3",
+   "friendlyName": "Zeta Deuteron Torch x3",
    "thrusters": 3,
-   "notes": "DT Magnetic Confinement Fusion",
+   "notes": "Z-Pinch Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 141000,
-   "EV_kps": 1960,
+   "requiredProjectName": "Project_ZetaDeuteronTorch",
+   "thrust_N": 2160000,
+   "EV_kps": 3334,
    "specificPower_kgMW": 0,
-   "efficiency": 0.77,
+   "efficiency": 0.95,
+   "thrustRating_GW": "3,600.720",
+   "req power": "3,790.232",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Mirrored_Magnetic_Confinement_Fusion",
+   "requiredPowerPlant": "Z_Pinch_Fusion",
    "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_TritonReflexDrive",
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Hydrogen",
+   "propellant": "ReactionProducts",
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_TritonReflexDrive"
+   "iconResource": "shipbuildericons/ICO_ZetaDeuteronTorch"
 },
  {
-   "dataName": "TritonReflexDrivex4",
-   "friendlyName": "Triton Reflex Drive x4",
+   "dataName": "ZetaDeuteronTorchx4",
+   "friendlyName": "Zeta Deuteron Torch x4",
    "thrusters": 4,
-   "notes": "DT Magnetic Confinement Fusion",
+   "notes": "Z-Pinch Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 188000,
-   "EV_kps": 1960,
+   "requiredProjectName": "Project_ZetaDeuteronTorch",
+   "thrust_N": 2880000,
+   "EV_kps": 3334,
    "specificPower_kgMW": 0,
-   "efficiency": 0.77,
+   "efficiency": 0.95,
+   "thrustRating_GW": "4,800.960",
+   "req power": "5,053.642",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Mirrored_Magnetic_Confinement_Fusion",
+   "requiredPowerPlant": "Z_Pinch_Fusion",
    "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_TritonReflexDrive",
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Hydrogen",
+   "propellant": "ReactionProducts",
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_TritonReflexDrive"
+   "iconResource": "shipbuildericons/ICO_ZetaDeuteronTorch"
 },
  {
-   "dataName": "TritonReflexDrivex5",
-   "friendlyName": "Triton Reflex Drive x5",
+   "dataName": "ZetaDeuteronTorchx5",
+   "friendlyName": "Zeta Deuteron Torch x5",
    "thrusters": 5,
-   "notes": "DT Magnetic Confinement Fusion",
+   "notes": "Z-Pinch Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 235000,
-   "EV_kps": 1960,
+   "requiredProjectName": "Project_ZetaDeuteronTorch",
+   "thrust_N": 3600000,
+   "EV_kps": 3334,
    "specificPower_kgMW": 0,
-   "efficiency": 0.77,
+   "efficiency": 0.95,
+   "thrustRating_GW": "6,001.200",
+   "req power": "6,317.053",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Mirrored_Magnetic_Confinement_Fusion",
+   "requiredPowerPlant": "Z_Pinch_Fusion",
    "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_TritonReflexDrive",
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Hydrogen",
+   "propellant": "ReactionProducts",
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_TritonReflexDrive"
+   "iconResource": "shipbuildericons/ICO_ZetaDeuteronTorch"
 },
  {
-   "dataName": "TritonReflexDrivex6",
-   "friendlyName": "Triton Reflex Drive x6",
+   "dataName": "ZetaDeuteronTorchx6",
+   "friendlyName": "Zeta Deuteron Torch x6",
    "thrusters": 6,
-   "notes": "DT Magnetic Confinement Fusion",
+   "notes": "Z-Pinch Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 282000,
-   "EV_kps": 1960,
+   "requiredProjectName": "Project_ZetaDeuteronTorch",
+   "thrust_N": 4320000,
+   "EV_kps": 3334,
    "specificPower_kgMW": 0,
-   "efficiency": 0.77,
+   "efficiency": 0.95,
+   "thrustRating_GW": "7,201.440",
+   "req power": "7,580.463",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Mirrored_Magnetic_Confinement_Fusion",
+   "requiredPowerPlant": "Z_Pinch_Fusion",
    "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_TritonReflexDrive",
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Hydrogen",
+   "propellant": "ReactionProducts",
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_TritonReflexDrive"
+   "iconResource": "shipbuildericons/ICO_ZetaDeuteronTorch"
 },
  {
-   "dataName": "HelionTorusDrivex1",
-   "friendlyName": "Helion Torus Drive x1",
+   "dataName": "ZetaHelionLanternx1",
+   "friendlyName": "Zeta Helion Lantern x1",
    "thrusters": 1,
-   "notes": "D-He3 Magnetic Confinement Fusion",
+   "notes": "Z-Pinch Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 18000,
-   "EV_kps": 347,
+   "requiredProjectName": "Project_ZetaHelionLantern",
+   "thrust_N": 600000,
+   "EV_kps": 1335,
    "specificPower_kgMW": 0,
-   "efficiency": 0.65,
+   "efficiency": 0.96,
+   "thrustRating_GW": "400.500",
+   "req power": "417.188",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Toroid_Magnetic_Confinement_Fusion",
+   "requiredPowerPlant": "Z_Pinch_Fusion",
    "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_HelionTorusDrive",
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Hydrogen",
+   "propellant": "ReactionProducts",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.9,
+      "fissiles": 0.1
    },
-   "iconResource": "shipbuildericons/ICO_HelionTorusDrive"
+   "helium3Fuel": true,
+   "iconResource": "shipbuildericons/ICO_ZetaHelionLantern"
 },
  {
-   "dataName": "HelionTorusDrivex2",
-   "friendlyName": "Helion Torus Drive x2",
+   "dataName": "ZetaHelionLanternx2",
+   "friendlyName": "Zeta Helion Lantern x2",
    "thrusters": 2,
-   "notes": "D-He3 Magnetic Confinement Fusion",
+   "notes": "Z-Pinch Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 36000,
-   "EV_kps": 347,
+   "requiredProjectName": "Project_ZetaHelionLantern",
+   "thrust_N": 1200000,
+   "EV_kps": 1335,
    "specificPower_kgMW": 0,
-   "efficiency": 0.65,
+   "efficiency": 0.96,
+   "thrustRating_GW": "801.000",
+   "req power": "834.375",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Toroid_Magnetic_Confinement_Fusion",
+   "requiredPowerPlant": "Z_Pinch_Fusion",
    "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_HelionTorusDrive",
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Hydrogen",
+   "propellant": "ReactionProducts",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.9,
+      "fissiles": 0.1
    },
-   "iconResource": "shipbuildericons/ICO_HelionTorusDrive"
+   "helium3Fuel": true,
+   "iconResource": "shipbuildericons/ICO_ZetaHelionLantern"
 },
  {
-   "dataName": "HelionTorusDrivex3",
-   "friendlyName": "Helion Torus Drive x3",
+   "dataName": "ZetaHelionLanternx3",
+   "friendlyName": "Zeta Helion Lantern x3",
    "thrusters": 3,
-   "notes": "D-He3 Magnetic Confinement Fusion",
+   "notes": "Z-Pinch Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 54000,
-   "EV_kps": 347,
+   "requiredProjectName": "Project_ZetaHelionLantern",
+   "thrust_N": 1800000,
+   "EV_kps": 1335,
    "specificPower_kgMW": 0,
-   "efficiency": 0.65,
+   "efficiency": 0.96,
+   "thrustRating_GW": "1,201.500",
+   "req power": "1,251.563",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Toroid_Magnetic_Confinement_Fusion",
+   "requiredPowerPlant": "Z_Pinch_Fusion",
    "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_HelionTorusDrive",
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Hydrogen",
+   "propellant": "ReactionProducts",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.9,
+      "fissiles": 0.1
    },
-   "iconResource": "shipbuildericons/ICO_HelionTorusDrive"
+   "helium3Fuel": true,
+   "iconResource": "shipbuildericons/ICO_ZetaHelionLantern"
 },
  {
-   "dataName": "HelionTorusDrivex4",
-   "friendlyName": "Helion Torus Drive x4",
+   "dataName": "ZetaHelionLanternx4",
+   "friendlyName": "Zeta Helion Lantern x4",
    "thrusters": 4,
-   "notes": "D-He3 Magnetic Confinement Fusion",
+   "notes": "Z-Pinch Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 72000,
-   "EV_kps": 347,
+   "requiredProjectName": "Project_ZetaHelionLantern",
+   "thrust_N": 2400000,
+   "EV_kps": 1335,
    "specificPower_kgMW": 0,
-   "efficiency": 0.65,
+   "efficiency": 0.96,
+   "thrustRating_GW": "1,602.000",
+   "req power": "1,668.750",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Toroid_Magnetic_Confinement_Fusion",
+   "requiredPowerPlant": "Z_Pinch_Fusion",
    "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_HelionTorusDrive",
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Hydrogen",
+   "propellant": "ReactionProducts",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.9,
+      "fissiles": 0.1
    },
-   "iconResource": "shipbuildericons/ICO_HelionTorusDrive"
+   "helium3Fuel": true,
+   "iconResource": "shipbuildericons/ICO_ZetaHelionLantern"
 },
  {
-   "dataName": "HelionTorusDrivex5",
-   "friendlyName": "Helion Torus Drive x5",
+   "dataName": "ZetaHelionLanternx5",
+   "friendlyName": "Zeta Helion Lantern x5",
    "thrusters": 5,
-   "notes": "D-He3 Magnetic Confinement Fusion",
+   "notes": "Z-Pinch Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 90000,
-   "EV_kps": 347,
+   "requiredProjectName": "Project_ZetaHelionLantern",
+   "thrust_N": 3000000,
+   "EV_kps": 1335,
    "specificPower_kgMW": 0,
-   "efficiency": 0.65,
+   "efficiency": 0.96,
+   "thrustRating_GW": "2,002.500",
+   "req power": "2,085.938",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Toroid_Magnetic_Confinement_Fusion",
+   "requiredPowerPlant": "Z_Pinch_Fusion",
    "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_HelionTorusDrive",
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Hydrogen",
+   "propellant": "ReactionProducts",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.9,
+      "fissiles": 0.1
    },
-   "iconResource": "shipbuildericons/ICO_HelionTorusDrive"
+   "helium3Fuel": true,
+   "iconResource": "shipbuildericons/ICO_ZetaHelionLantern"
 },
  {
-   "dataName": "HelionTorusDrivex6",
-   "friendlyName": "Helion Torus Drive x6",
+   "dataName": "ZetaHelionLanternx6",
+   "friendlyName": "Zeta Helion Lantern x6",
    "thrusters": 6,
-   "notes": "D-He3 Magnetic Confinement Fusion",
+   "notes": "Z-Pinch Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 108000,
-   "EV_kps": 347,
+   "requiredProjectName": "Project_ZetaHelionLantern",
+   "thrust_N": 3600000,
+   "EV_kps": 1335,
    "specificPower_kgMW": 0,
-   "efficiency": 0.65,
+   "efficiency": 0.96,
+   "thrustRating_GW": "2,403.000",
+   "req power": "2,503.125",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Toroid_Magnetic_Confinement_Fusion",
+   "requiredPowerPlant": "Z_Pinch_Fusion",
    "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_HelionTorusDrive",
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Hydrogen",
+   "propellant": "ReactionProducts",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.9,
+      "fissiles": 0.1
    },
-   "iconResource": "shipbuildericons/ICO_HelionTorusDrive"
+   "helium3Fuel": true,
+   "iconResource": "shipbuildericons/ICO_ZetaHelionLantern"
 },
  {
-   "dataName": "AdvancedHelionTorusDrivex1",
-   "friendlyName": "Advanced Helion Torus Drive x1",
+   "dataName": "ZetaBoraneLanternx1",
+   "friendlyName": "Zeta Borane Lantern x1",
    "thrusters": 1,
-   "notes": "D-He3 Magnetic Confinement Fusion",
+   "notes": "Z-Pinch Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 49000,
-   "EV_kps": 7840,
+   "requiredProjectName": "Project_ZetaBoraneLantern",
+   "thrust_N": 416000,
+   "EV_kps": 3077,
    "specificPower_kgMW": 0,
-   "efficiency": 0.95,
+   "efficiency": 0.97,
+   "thrustRating_GW": "640.016",
+   "req power": "659.810",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Toroid_Magnetic_Confinement_Fusion",
+   "requiredPowerPlant": "Z_Pinch_Fusion",
    "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_AdvancedHelionTorusDrive",
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Hydrogen",
+   "propellant": "ReactionProducts",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.8,
+      "volatiles": 0.1,
+      "metals": 0.1
    },
-   "iconResource": "shipbuildericons/ICO_AdvancedHelionTorusDrive"
+   "iconResource": "shipbuildericons/ICO_ZetaBoraneLantern"
 },
  {
-   "dataName": "AdvancedHelionTorusDrivex2",
-   "friendlyName": "Advanced Helion Torus Drive x2",
+   "dataName": "ZetaBoraneLanternx2",
+   "friendlyName": "Zeta Borane Lantern x2",
    "thrusters": 2,
-   "notes": "D-He3 Magnetic Confinement Fusion",
+   "notes": "Z-Pinch Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 98000,
-   "EV_kps": 7840,
+   "requiredProjectName": "Project_ZetaBoraneLantern",
+   "thrust_N": 832000,
+   "EV_kps": 3077,
    "specificPower_kgMW": 0,
-   "efficiency": 0.95,
+   "efficiency": 0.97,
+   "thrustRating_GW": "1,280.032",
+   "req power": "1,319.621",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Toroid_Magnetic_Confinement_Fusion",
+   "requiredPowerPlant": "Z_Pinch_Fusion",
    "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_AdvancedHelionTorusDrive",
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Hydrogen",
+   "propellant": "ReactionProducts",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.8,
+      "volatiles": 0.1,
+      "metals": 0.1
    },
-   "iconResource": "shipbuildericons/ICO_AdvancedHelionTorusDrive"
+   "iconResource": "shipbuildericons/ICO_ZetaBoraneLantern"
 },
  {
-   "dataName": "AdvancedHelionTorusDrivex3",
-   "friendlyName": "Advanced Helion Torus Drive x3",
+   "dataName": "ZetaBoraneLanternx3",
+   "friendlyName": "Zeta Borane Lantern x3",
    "thrusters": 3,
-   "notes": "D-He3 Magnetic Confinement Fusion",
+   "notes": "Z-Pinch Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 147000,
-   "EV_kps": 7840,
+   "requiredProjectName": "Project_ZetaBoraneLantern",
+   "thrust_N": 1248000,
+   "EV_kps": 3077,
    "specificPower_kgMW": 0,
-   "efficiency": 0.95,
+   "efficiency": 0.97,
+   "thrustRating_GW": "1,920.048",
+   "req power": "1,979.431",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Toroid_Magnetic_Confinement_Fusion",
+   "requiredPowerPlant": "Z_Pinch_Fusion",
    "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_AdvancedHelionTorusDrive",
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Hydrogen",
+   "propellant": "ReactionProducts",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.8,
+      "volatiles": 0.1,
+      "metals": 0.1
    },
-   "iconResource": "shipbuildericons/ICO_AdvancedHelionTorusDrive"
+   "iconResource": "shipbuildericons/ICO_ZetaBoraneLantern"
 },
  {
-   "dataName": "AdvancedHelionTorusDrivex4",
-   "friendlyName": "Advanced Helion Torus Drive x4",
+   "dataName": "ZetaBoraneLanternx4",
+   "friendlyName": "Zeta Borane Lantern x4",
    "thrusters": 4,
-   "notes": "D-He3 Magnetic Confinement Fusion",
+   "notes": "Z-Pinch Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 196000,
-   "EV_kps": 7840,
+   "requiredProjectName": "Project_ZetaBoraneLantern",
+   "thrust_N": 1664000,
+   "EV_kps": 3077,
    "specificPower_kgMW": 0,
-   "efficiency": 0.95,
+   "efficiency": 0.97,
+   "thrustRating_GW": "2,560.064",
+   "req power": "2,639.241",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Toroid_Magnetic_Confinement_Fusion",
+   "requiredPowerPlant": "Z_Pinch_Fusion",
    "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_AdvancedHelionTorusDrive",
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Hydrogen",
+   "propellant": "ReactionProducts",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.8,
+      "volatiles": 0.1,
+      "metals": 0.1
    },
-   "iconResource": "shipbuildericons/ICO_AdvancedHelionTorusDrive"
+   "iconResource": "shipbuildericons/ICO_ZetaBoraneLantern"
 },
  {
-   "dataName": "AdvancedHelionTorusDrivex5",
-   "friendlyName": "Advanced Helion Torus Drive x5",
+   "dataName": "ZetaBoraneLanternx5",
+   "friendlyName": "Zeta Borane Lantern x5",
    "thrusters": 5,
-   "notes": "D-He3 Magnetic Confinement Fusion",
+   "notes": "Z-Pinch Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 245000,
-   "EV_kps": 7840,
+   "requiredProjectName": "Project_ZetaBoraneLantern",
+   "thrust_N": 2080000,
+   "EV_kps": 3077,
    "specificPower_kgMW": 0,
-   "efficiency": 0.95,
+   "efficiency": 0.97,
+   "thrustRating_GW": "3,200.080",
+   "req power": "3,299.052",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Toroid_Magnetic_Confinement_Fusion",
+   "requiredPowerPlant": "Z_Pinch_Fusion",
    "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_AdvancedHelionTorusDrive",
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Hydrogen",
+   "propellant": "ReactionProducts",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.8,
+      "volatiles": 0.1,
+      "metals": 0.1
    },
-   "iconResource": "shipbuildericons/ICO_AdvancedHelionTorusDrive"
+   "iconResource": "shipbuildericons/ICO_ZetaBoraneLantern"
 },
  {
-   "dataName": "AdvancedHelionTorusDrivex6",
-   "friendlyName": "Advanced Helion Torus Drive x6",
+   "dataName": "ZetaBoraneLanternx6",
+   "friendlyName": "Zeta Borane Lantern x6",
    "thrusters": 6,
-   "notes": "D-He3 Magnetic Confinement Fusion",
+   "notes": "Z-Pinch Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 294000,
-   "EV_kps": 7840,
+   "requiredProjectName": "Project_ZetaBoraneLantern",
+   "thrust_N": 2496000,
+   "EV_kps": 3077,
    "specificPower_kgMW": 0,
-   "efficiency": 0.95,
+   "efficiency": 0.97,
+   "thrustRating_GW": "3,840.096",
+   "req power": "3,958.862",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Toroid_Magnetic_Confinement_Fusion",
+   "requiredPowerPlant": "Z_Pinch_Fusion",
    "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_AdvancedHelionTorusDrive",
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Hydrogen",
+   "propellant": "ReactionProducts",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.8,
+      "volatiles": 0.1,
+      "metals": 0.1
    },
-   "iconResource": "shipbuildericons/ICO_AdvancedHelionTorusDrive"
+   "iconResource": "shipbuildericons/ICO_ZetaBoraneLantern"
 },
  {
-   "dataName": "HelionReflexDrivex1",
-   "friendlyName": "Helion Reflex Drive x1",
+   "dataName": "TritonNovaDrivex1",
+   "friendlyName": "Triton Nova Drive x1",
    "thrusters": 1,
-   "notes": "D-He3 Magnetic Confinement Fusion",
+   "notes": "DT Inertial Confinement Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 26500,
-   "EV_kps": 313.9,
+   "requiredProjectName": "Project_TritonNovaDrive",
+   "thrust_N": 355200,
+   "EV_kps": 270,
    "specificPower_kgMW": 0,
-   "efficiency": 0.83,
+   "efficiency": 0.8,
+   "thrustRating_GW": "47.952",
+   "req power": "59.940",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Mirrored_Magnetic_Confinement_Fusion",
-   "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_HelionReflexDrive",
+   "requiredPowerPlant": "Inertial_Confinement_Fusion",
+   "thrustCap": 30,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
    "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.98,
+      "nobleMetals": 0.01,
+      "fissiles": 0.01
    },
-   "iconResource": "shipbuildericons/ICO_HelionReflexDrive"
+   "iconResource": "shipbuildericons/ICO_TritonNovaDrive"
 },
  {
-   "dataName": "HelionReflexDrivex2",
-   "friendlyName": "Helion Reflex Drive x2",
+   "dataName": "TritonNovaDrivex2",
+   "friendlyName": "Triton Nova Drive x2",
    "thrusters": 2,
-   "notes": "D-He3 Magnetic Confinement Fusion",
+   "notes": "DT Inertial Confinement Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 53000,
-   "EV_kps": 313.9,
+   "requiredProjectName": "Project_TritonNovaDrive",
+   "thrust_N": 710400,
+   "EV_kps": 270,
    "specificPower_kgMW": 0,
-   "efficiency": 0.83,
+   "efficiency": 0.8,
+   "thrustRating_GW": "95.904",
+   "req power": "119.880",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Mirrored_Magnetic_Confinement_Fusion",
-   "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_HelionReflexDrive",
+   "requiredPowerPlant": "Inertial_Confinement_Fusion",
+   "thrustCap": 30,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
    "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.98,
+      "nobleMetals": 0.01,
+      "fissiles": 0.01
    },
-   "iconResource": "shipbuildericons/ICO_HelionReflexDrive"
+   "iconResource": "shipbuildericons/ICO_TritonNovaDrive"
 },
- {
-   "dataName": "HelionReflexDrivex3",
-   "friendlyName": "Helion Reflex Drive x3",
+ {
+   "dataName": "TritonNovaDrivex3",
+   "friendlyName": "Triton Nova Drive x3",
    "thrusters": 3,
-   "notes": "D-He3 Magnetic Confinement Fusion",
+   "notes": "DT Inertial Confinement Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 79500,
-   "EV_kps": 313.9,
+   "requiredProjectName": "Project_TritonNovaDrive",
+   "thrust_N": 1065600,
+   "EV_kps": 270,
    "specificPower_kgMW": 0,
-   "efficiency": 0.83,
+   "efficiency": 0.8,
+   "thrustRating_GW": "143.856",
+   "req power": "179.820",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Mirrored_Magnetic_Confinement_Fusion",
-   "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_HelionReflexDrive",
+   "requiredPowerPlant": "Inertial_Confinement_Fusion",
+   "thrustCap": 30,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
    "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.98,
+      "nobleMetals": 0.01,
+      "fissiles": 0.01
    },
-   "iconResource": "shipbuildericons/ICO_HelionReflexDrive"
+   "iconResource": "shipbuildericons/ICO_TritonNovaDrive"
 },
  {
-   "dataName": "HelionReflexDrivex4",
-   "friendlyName": "Helion Reflex Drive x4",
+   "dataName": "TritonNovaDrivex4",
+   "friendlyName": "Triton Nova Drive x4",
    "thrusters": 4,
-   "notes": "D-He3 Magnetic Confinement Fusion",
+   "notes": "DT Inertial Confinement Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 106000,
-   "EV_kps": 313.9,
+   "requiredProjectName": "Project_TritonNovaDrive",
+   "thrust_N": 1420800,
+   "EV_kps": 270,
    "specificPower_kgMW": 0,
-   "efficiency": 0.83,
+   "efficiency": 0.8,
+   "thrustRating_GW": "191.808",
+   "req power": "239.760",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Mirrored_Magnetic_Confinement_Fusion",
-   "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_HelionReflexDrive",
+   "requiredPowerPlant": "Inertial_Confinement_Fusion",
+   "thrustCap": 30,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
    "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.98,
+      "nobleMetals": 0.01,
+      "fissiles": 0.01
    },
-   "iconResource": "shipbuildericons/ICO_HelionReflexDrive"
+   "iconResource": "shipbuildericons/ICO_TritonNovaDrive"
 },
  {
-   "dataName": "HelionReflexDrivex5",
-   "friendlyName": "Helion Reflex Drive x5",
+   "dataName": "TritonNovaDrivex5",
+   "friendlyName": "Triton Nova Drive x5",
    "thrusters": 5,
-   "notes": "D-He3 Magnetic Confinement Fusion",
+   "notes": "DT Inertial Confinement Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 132500,
-   "EV_kps": 313.9,
+   "requiredProjectName": "Project_TritonNovaDrive",
+   "thrust_N": 1776000,
+   "EV_kps": 270,
    "specificPower_kgMW": 0,
-   "efficiency": 0.83,
+   "efficiency": 0.8,
+   "thrustRating_GW": "239.760",
+   "req power": "299.700",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Mirrored_Magnetic_Confinement_Fusion",
-   "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_HelionReflexDrive",
+   "requiredPowerPlant": "Inertial_Confinement_Fusion",
+   "thrustCap": 30,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
    "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.98,
+      "nobleMetals": 0.01,
+      "fissiles": 0.01
    },
-   "iconResource": "shipbuildericons/ICO_HelionReflexDrive"
+   "iconResource": "shipbuildericons/ICO_TritonNovaDrive"
 },
  {
-   "dataName": "HelionReflexDrivex6",
-   "friendlyName": "Helion Reflex Drive x6",
+   "dataName": "TritonNovaDrivex6",
+   "friendlyName": "Triton Nova Drive x6",
    "thrusters": 6,
-   "notes": "D-He3 Magnetic Confinement Fusion",
+   "notes": "DT Inertial Confinement Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 159000,
-   "EV_kps": 313.9,
+   "requiredProjectName": "Project_TritonNovaDrive",
+   "thrust_N": 2131200,
+   "EV_kps": 270,
    "specificPower_kgMW": 0,
-   "efficiency": 0.83,
+   "efficiency": 0.8,
+   "thrustRating_GW": "287.712",
+   "req power": "359.640",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Mirrored_Magnetic_Confinement_Fusion",
-   "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_HelionReflexDrive",
+   "requiredPowerPlant": "Inertial_Confinement_Fusion",
+   "thrustCap": 30,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
    "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.98,
+      "nobleMetals": 0.01,
+      "fissiles": 0.01
    },
-   "iconResource": "shipbuildericons/ICO_HelionReflexDrive"
+   "iconResource": "shipbuildericons/ICO_TritonNovaDrive"
 },
  {
-   "dataName": "AdvancedHelionReflexDrivex1",
-   "friendlyName": "Advanced Helion Reflex Drive x1",
+   "dataName": "DeuteronNovaLanternx1",
+   "friendlyName": "Deuteron Nova Lantern x1",
    "thrusters": 1,
-   "notes": "D-He3 Magnetic Confinement Fusion",
+   "notes": "DD Inertial Confinement Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 73560,
-   "EV_kps": 981,
+   "requiredProjectName": "Project_DeuteronNovaLantern",
+   "thrust_N": 420000,
+   "EV_kps": 572,
    "specificPower_kgMW": 0,
-   "efficiency": 0.83,
+   "efficiency": 0.85,
+   "thrustRating_GW": "120.120",
+   "req power": "141.318",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Mirrored_Magnetic_Confinement_Fusion",
-   "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_AdvancedHelionReflexDrive",
+   "requiredPowerPlant": "Inertial_Confinement_Fusion",
+   "thrustCap": 50,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
    "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.99,
+      "nobleMetals": 0.01
    },
-   "iconResource": "shipbuildericons/ICO_AdvancedHelionReflexDrive"
+   "iconResource": "shipbuildericons/ICO_DeuteronNovaLantern"
 },
  {
-   "dataName": "AdvancedHelionReflexDrivex2",
-   "friendlyName": "Advanced Helion Reflex Drive x2",
+   "dataName": "DeuteronNovaLanternx2",
+   "friendlyName": "Deuteron Nova Lantern x2",
    "thrusters": 2,
-   "notes": "D-He3 Magnetic Confinement Fusion",
+   "notes": "DD Inertial Confinement Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 147120,
-   "EV_kps": 981,
+   "requiredProjectName": "Project_DeuteronNovaLantern",
+   "thrust_N": 840000,
+   "EV_kps": 572,
    "specificPower_kgMW": 0,
-   "efficiency": 0.83,
+   "efficiency": 0.85,
+   "thrustRating_GW": "240.240",
+   "req power": "282.635",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Mirrored_Magnetic_Confinement_Fusion",
-   "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_AdvancedHelionReflexDrive",
+   "requiredPowerPlant": "Inertial_Confinement_Fusion",
+   "thrustCap": 50,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
    "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.99,
+      "nobleMetals": 0.01
    },
-   "iconResource": "shipbuildericons/ICO_AdvancedHelionReflexDrive"
+   "iconResource": "shipbuildericons/ICO_DeuteronNovaLantern"
 },
  {
-   "dataName": "AdvancedHelionReflexDrivex3",
-   "friendlyName": "Advanced Helion Reflex Drive x3",
+   "dataName": "DeuteronNovaLanternx3",
+   "friendlyName": "Deuteron Nova Lantern x3",
    "thrusters": 3,
-   "notes": "D-He3 Magnetic Confinement Fusion",
+   "notes": "DD Inertial Confinement Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 220680,
-   "EV_kps": 981,
+   "requiredProjectName": "Project_DeuteronNovaLantern",
+   "thrust_N": 1260000,
+   "EV_kps": 572,
    "specificPower_kgMW": 0,
-   "efficiency": 0.83,
+   "efficiency": 0.85,
+   "thrustRating_GW": "360.360",
+   "req power": "423.953",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Mirrored_Magnetic_Confinement_Fusion",
-   "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_AdvancedHelionReflexDrive",
+   "requiredPowerPlant": "Inertial_Confinement_Fusion",
+   "thrustCap": 50,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
    "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.99,
+      "nobleMetals": 0.01
    },
-   "iconResource": "shipbuildericons/ICO_AdvancedHelionReflexDrive"
+   "iconResource": "shipbuildericons/ICO_DeuteronNovaLantern"
 },
  {
-   "dataName": "AdvancedHelionReflexDrivex4",
-   "friendlyName": "Advanced Helion Reflex Drive x4",
+   "dataName": "DeuteronNovaLanternx4",
+   "friendlyName": "Deuteron Nova Lantern x4",
    "thrusters": 4,
-   "notes": "D-He3 Magnetic Confinement Fusion",
+   "notes": "DD Inertial Confinement Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 294240,
-   "EV_kps": 981,
+   "requiredProjectName": "Project_DeuteronNovaLantern",
+   "thrust_N": 1680000,
+   "EV_kps": 572,
    "specificPower_kgMW": 0,
-   "efficiency": 0.83,
+   "efficiency": 0.85,
+   "thrustRating_GW": "480.480",
+   "req power": "565.271",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Mirrored_Magnetic_Confinement_Fusion",
-   "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_AdvancedHelionReflexDrive",
+   "requiredPowerPlant": "Inertial_Confinement_Fusion",
+   "thrustCap": 50,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
    "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.99,
+      "nobleMetals": 0.01
    },
-   "iconResource": "shipbuildericons/ICO_AdvancedHelionReflexDrive"
+   "iconResource": "shipbuildericons/ICO_DeuteronNovaLantern"
 },
  {
-   "dataName": "AdvancedHelionReflexDrivex5",
-   "friendlyName": "Advanced Helion Reflex Drive x5",
+   "dataName": "DeuteronNovaLanternx5",
+   "friendlyName": "Deuteron Nova Lantern x5",
    "thrusters": 5,
-   "notes": "D-He3 Magnetic Confinement Fusion",
+   "notes": "DD Inertial Confinement Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 367800,
-   "EV_kps": 981,
+   "requiredProjectName": "Project_DeuteronNovaLantern",
+   "thrust_N": 2100000,
+   "EV_kps": 572,
    "specificPower_kgMW": 0,
-   "efficiency": 0.83,
+   "efficiency": 0.85,
+   "thrustRating_GW": "600.600",
+   "req power": "706.588",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Mirrored_Magnetic_Confinement_Fusion",
-   "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_AdvancedHelionReflexDrive",
+   "requiredPowerPlant": "Inertial_Confinement_Fusion",
+   "thrustCap": 50,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
    "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.99,
+      "nobleMetals": 0.01
    },
-   "iconResource": "shipbuildericons/ICO_AdvancedHelionReflexDrive"
+   "iconResource": "shipbuildericons/ICO_DeuteronNovaLantern"
 },
  {
-   "dataName": "AdvancedHelionReflexDrivex6",
-   "friendlyName": "Advanced Helion Reflex Drive x6",
+   "dataName": "DeuteronNovaLanternx6",
+   "friendlyName": "Deuteron Nova Lantern x6",
    "thrusters": 6,
-   "notes": "D-He3 Magnetic Confinement Fusion",
+   "notes": "DD Inertial Confinement Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 441360,
-   "EV_kps": 981,
+   "requiredProjectName": "Project_DeuteronNovaLantern",
+   "thrust_N": 2520000,
+   "EV_kps": 572,
    "specificPower_kgMW": 0,
-   "efficiency": 0.83,
+   "efficiency": 0.85,
+   "thrustRating_GW": "720.720",
+   "req power": "847.906",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Mirrored_Magnetic_Confinement_Fusion",
-   "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_AdvancedHelionReflexDrive",
+   "requiredPowerPlant": "Inertial_Confinement_Fusion",
+   "thrustCap": 50,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
    "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.99,
+      "nobleMetals": 0.01
    },
-   "iconResource": "shipbuildericons/ICO_AdvancedHelionReflexDrive"
+   "iconResource": "shipbuildericons/ICO_DeuteronNovaLantern"
 },
  {
-   "dataName": "ZetaHelionDrivex1",
-   "friendlyName": "Zeta Helion Drive x1",
+   "dataName": "HelionNovaLanternx1",
+   "friendlyName": "Helion Nova Lantern x1",
    "thrusters": 1,
-   "notes": "Z-Pinch Fusion",
+   "notes": "D-He3 Inertial Confinement Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 330000,
-   "EV_kps": 3500,
+   "requiredProjectName": "Project_HelionNovaLantern",
+   "thrust_N": 1900000,
+   "EV_kps": 527,
    "specificPower_kgMW": 0,
-   "efficiency": 0.88,
+   "efficiency": 0.95,
+   "thrustRating_GW": "500.650",
+   "req power": "527.000",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Z_Pinch_Fusion",
-   "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_ZetaHelionDrive",
+   "requiredPowerPlant": "Inertial_Confinement_Fusion",
+   "thrustCap": 50,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
    "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.89,
+      "nobleMetals": 0.01,
+      "fissiles": 0.1
    },
-   "iconResource": "shipbuildericons/ICO_ZetaHelionDrive"
+   "helium3Fuel": true,
+   "iconResource": "shipbuildericons/ICO_HelionNovaLantern"
 },
  {
-   "dataName": "ZetaHelionDrivex2",
-   "friendlyName": "Zeta Helion Drive x2",
+   "dataName": "HelionNovaLanternx2",
+   "friendlyName": "Helion Nova Lantern x2",
    "thrusters": 2,
-   "notes": "Z-Pinch Fusion",
+   "notes": "D-He3 Inertial Confinement Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 660000,
-   "EV_kps": 3500,
+   "requiredProjectName": "Project_HelionNovaLantern",
+   "thrust_N": 3800000,
+   "EV_kps": 527,
    "specificPower_kgMW": 0,
-   "efficiency": 0.88,
+   "efficiency": 0.95,
+   "thrustRating_GW": "1,001.300",
+   "req power": "1,054.000",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Z_Pinch_Fusion",
-   "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_ZetaHelionDrive",
+   "requiredPowerPlant": "Inertial_Confinement_Fusion",
+   "thrustCap": 50,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
    "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.89,
+      "nobleMetals": 0.01,
+      "fissiles": 0.1
    },
-   "iconResource": "shipbuildericons/ICO_ZetaHelionDrive"
+   "helium3Fuel": true,
+   "iconResource": "shipbuildericons/ICO_HelionNovaLantern"
 },
  {
-   "dataName": "ZetaHelionDrivex3",
-   "friendlyName": "Zeta Helion Drive x3",
+   "dataName": "HelionNovaLanternx3",
+   "friendlyName": "Helion Nova Lantern x3",
    "thrusters": 3,
-   "notes": "Z-Pinch Fusion",
+   "notes": "D-He3 Inertial Confinement Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 990000,
-   "EV_kps": 3500,
+   "requiredProjectName": "Project_HelionNovaLantern",
+   "thrust_N": 5700000,
+   "EV_kps": 527,
    "specificPower_kgMW": 0,
-   "efficiency": 0.88,
+   "efficiency": 0.95,
+   "thrustRating_GW": "1,501.950",
+   "req power": "1,581.000",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Z_Pinch_Fusion",
-   "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_ZetaHelionDrive",
+   "requiredPowerPlant": "Inertial_Confinement_Fusion",
+   "thrustCap": 50,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
    "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.89,
+      "nobleMetals": 0.01,
+      "fissiles": 0.1
    },
-   "iconResource": "shipbuildericons/ICO_ZetaHelionDrive"
+   "helium3Fuel": true,
+   "iconResource": "shipbuildericons/ICO_HelionNovaLantern"
 },
  {
-   "dataName": "ZetaHelionDrivex4",
-   "friendlyName": "Zeta Helion Drive x4",
+   "dataName": "HelionNovaLanternx4",
+   "friendlyName": "Helion Nova Lantern x4",
    "thrusters": 4,
-   "notes": "Z-Pinch Fusion",
+   "notes": "D-He3 Inertial Confinement Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 1320000,
-   "EV_kps": 3500,
+   "requiredProjectName": "Project_HelionNovaLantern",
+   "thrust_N": 7600000,
+   "EV_kps": 527,
    "specificPower_kgMW": 0,
-   "efficiency": 0.88,
+   "efficiency": 0.95,
+   "thrustRating_GW": "2,002.600",
+   "req power": "2,108.000",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Z_Pinch_Fusion",
-   "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_ZetaHelionDrive",
+   "requiredPowerPlant": "Inertial_Confinement_Fusion",
+   "thrustCap": 50,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
    "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.89,
+      "nobleMetals": 0.01,
+      "fissiles": 0.1
    },
-   "iconResource": "shipbuildericons/ICO_ZetaHelionDrive"
+   "helium3Fuel": true,
+   "iconResource": "shipbuildericons/ICO_HelionNovaLantern"
 },
  {
-   "dataName": "ZetaHelionDrivex5",
-   "friendlyName": "Zeta Helion Drive x5",
+   "dataName": "HelionNovaLanternx5",
+   "friendlyName": "Helion Nova Lantern x5",
    "thrusters": 5,
-   "notes": "Z-Pinch Fusion",
+   "notes": "D-He3 Inertial Confinement Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 1650000,
-   "EV_kps": 3500,
+   "requiredProjectName": "Project_HelionNovaLantern",
+   "thrust_N": 9500000,
+   "EV_kps": 527,
    "specificPower_kgMW": 0,
-   "efficiency": 0.88,
+   "efficiency": 0.95,
+   "thrustRating_GW": "2,503.250",
+   "req power": "2,635.000",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Z_Pinch_Fusion",
-   "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_ZetaHelionDrive",
+   "requiredPowerPlant": "Inertial_Confinement_Fusion",
+   "thrustCap": 50,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
    "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.89,
+      "nobleMetals": 0.01,
+      "fissiles": 0.1
    },
-   "iconResource": "shipbuildericons/ICO_ZetaHelionDrive"
+   "helium3Fuel": true,
+   "iconResource": "shipbuildericons/ICO_HelionNovaLantern"
 },
  {
-   "dataName": "ZetaHelionDrivex6",
-   "friendlyName": "Zeta Helion Drive x6",
+   "dataName": "HelionNovaLanternx6",
+   "friendlyName": "Helion Nova Lantern x6",
    "thrusters": 6,
-   "notes": "Z-Pinch Fusion",
+   "notes": "D-He3 Inertial Confinement Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 1980000,
-   "EV_kps": 3500,
+   "requiredProjectName": "Project_HelionNovaLantern",
+   "thrust_N": 11400000,
+   "EV_kps": 527,
    "specificPower_kgMW": 0,
-   "efficiency": 0.88,
+   "efficiency": 0.95,
+   "thrustRating_GW": "3,003.900",
+   "req power": "3,162.000",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Z_Pinch_Fusion",
-   "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_ZetaHelionDrive",
+   "requiredPowerPlant": "Inertial_Confinement_Fusion",
+   "thrustCap": 50,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
    "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.89,
+      "nobleMetals": 0.01,
+      "fissiles": 0.1
    },
-   "iconResource": "shipbuildericons/ICO_ZetaHelionDrive"
+   "helium3Fuel": true,
+   "iconResource": "shipbuildericons/ICO_HelionNovaLantern"
 },
  {
-   "dataName": "ZetaBoronFusionDrivex1",
-   "friendlyName": "Zeta Boron Fusion Drive x1",
+   "dataName": "HelionNovaTorchx1",
+   "friendlyName": "Helion Nova Torch x1",
    "thrusters": 1,
-   "notes": "Z-Pinch Fusion",
+   "notes": "Daedelus D-He3 Inertial Confinement Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 680000,
-   "EV_kps": 1300,
+   "requiredProjectName": "Project_HelionNovaTorch",
+   "thrust_N": 663000,
+   "EV_kps": 9210,
    "specificPower_kgMW": 0,
-   "efficiency": 0.85,
+   "efficiency": 0.96,
+   "thrustRating_GW": "3,053.115",
+   "req power": "3,180.328",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Z_Pinch_Fusion",
-   "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_ZetaBoronFusionDrive",
+   "requiredPowerPlant": "Inertial_Confinement_Fusion",
+   "thrustCap": 70,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
    "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.89,
+      "nobleMetals": 0.01,
+      "fissiles": 0.1
    },
-   "iconResource": "shipbuildericons/ICO_ZetaBoronFusionDrive"
+   "helium3Fuel": true,
+   "iconResource": "shipbuildericons/ICO_HelionNovaTorch"
 },
  {
-   "dataName": "ZetaBoronFusionDrivex2",
-   "friendlyName": "Zeta Boron Fusion Drive x2",
+   "dataName": "HelionNovaTorchx2",
+   "friendlyName": "Helion Nova Torch x2",
    "thrusters": 2,
-   "notes": "Z-Pinch Fusion",
+   "notes": "Daedelus D-He3 Inertial Confinement Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 1360000,
-   "EV_kps": 1300,
+   "requiredProjectName": "Project_HelionNovaTorch",
+   "thrust_N": 1326000,
+   "EV_kps": 9210,
    "specificPower_kgMW": 0,
-   "efficiency": 0.85,
+   "efficiency": 0.96,
+   "thrustRating_GW": "6,106.230",
+   "req power": "6,360.656",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Z_Pinch_Fusion",
-   "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_ZetaBoronFusionDrive",
+   "requiredPowerPlant": "Inertial_Confinement_Fusion",
+   "thrustCap": 70,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
    "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.89,
+      "nobleMetals": 0.01,
+      "fissiles": 0.1
    },
-   "iconResource": "shipbuildericons/ICO_ZetaBoronFusionDrive"
+   "helium3Fuel": true,
+   "iconResource": "shipbuildericons/ICO_HelionNovaTorch"
 },
  {
-   "dataName": "ZetaBoronFusionDrivex3",
-   "friendlyName": "Zeta Boron Fusion Drive x3",
+   "dataName": "HelionNovaTorchx3",
+   "friendlyName": "Helion Nova Torch x3",
    "thrusters": 3,
-   "notes": "Z-Pinch Fusion",
+   "notes": "Daedelus D-He3 Inertial Confinement Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 2040000,
-   "EV_kps": 1300,
+   "requiredProjectName": "Project_HelionNovaTorch",
+   "thrust_N": 1989000,
+   "EV_kps": 9210,
    "specificPower_kgMW": 0,
-   "efficiency": 0.85,
+   "efficiency": 0.96,
+   "thrustRating_GW": "9,159.345",
+   "req power": "9,540.984",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Z_Pinch_Fusion",
-   "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_ZetaBoronFusionDrive",
+   "requiredPowerPlant": "Inertial_Confinement_Fusion",
+   "thrustCap": 70,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
    "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.89,
+      "nobleMetals": 0.01,
+      "fissiles": 0.1
    },
-   "iconResource": "shipbuildericons/ICO_ZetaBoronFusionDrive"
+   "helium3Fuel": true,
+   "iconResource": "shipbuildericons/ICO_HelionNovaTorch"
 },
  {
-   "dataName": "ZetaBoronFusionDrivex4",
-   "friendlyName": "Zeta Boron Fusion Drive x4",
+   "dataName": "HelionNovaTorchx4",
+   "friendlyName": "Helion Nova Torch x4",
    "thrusters": 4,
-   "notes": "Z-Pinch Fusion",
+   "notes": "Daedelus D-He3 Inertial Confinement Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 2720000,
-   "EV_kps": 1300,
+   "requiredProjectName": "Project_HelionNovaTorch",
+   "thrust_N": 2652000,
+   "EV_kps": 9210,
    "specificPower_kgMW": 0,
-   "efficiency": 0.85,
+   "efficiency": 0.96,
+   "thrustRating_GW": "12,212.460",
+   "req power": "12,721.313",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Z_Pinch_Fusion",
-   "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_ZetaBoronFusionDrive",
+   "requiredPowerPlant": "Inertial_Confinement_Fusion",
+   "thrustCap": 70,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
    "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.89,
+      "nobleMetals": 0.01,
+      "fissiles": 0.1
    },
-   "iconResource": "shipbuildericons/ICO_ZetaBoronFusionDrive"
+   "helium3Fuel": true,
+   "iconResource": "shipbuildericons/ICO_HelionNovaTorch"
 },
  {
-   "dataName": "ZetaBoronFusionDrivex5",
-   "friendlyName": "Zeta Boron Fusion Drive x5",
+   "dataName": "HelionNovaTorchx5",
+   "friendlyName": "Helion Nova Torch x5",
    "thrusters": 5,
-   "notes": "Z-Pinch Fusion",
+   "notes": "Daedelus D-He3 Inertial Confinement Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 3400000,
-   "EV_kps": 1300,
+   "requiredProjectName": "Project_HelionNovaTorch",
+   "thrust_N": 3315000,
+   "EV_kps": 9210,
    "specificPower_kgMW": 0,
-   "efficiency": 0.85,
+   "efficiency": 0.96,
+   "thrustRating_GW": "15,265.575",
+   "req power": "15,901.641",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Z_Pinch_Fusion",
-   "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_ZetaBoronFusionDrive",
+   "requiredPowerPlant": "Inertial_Confinement_Fusion",
+   "thrustCap": 70,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
    "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.89,
+      "nobleMetals": 0.01,
+      "fissiles": 0.1
    },
-   "iconResource": "shipbuildericons/ICO_ZetaBoronFusionDrive"
+   "helium3Fuel": true,
+   "iconResource": "shipbuildericons/ICO_HelionNovaTorch"
 },
  {
-   "dataName": "ZetaBoronFusionDrivex6",
-   "friendlyName": "Zeta Boron Fusion Drive x6",
+   "dataName": "HelionNovaTorchx6",
+   "friendlyName": "Helion Nova Torch x6",
    "thrusters": 6,
-   "notes": "Z-Pinch Fusion",
+   "notes": "Daedelus D-He3 Inertial Confinement Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 4080000,
-   "EV_kps": 1300,
+   "requiredProjectName": "Project_HelionNovaTorch",
+   "thrust_N": 3978000,
+   "EV_kps": 9210,
    "specificPower_kgMW": 0,
-   "efficiency": 0.85,
+   "efficiency": 0.96,
+   "thrustRating_GW": "18,318.690",
+   "req power": "19,081.969",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Z_Pinch_Fusion",
-   "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_ZetaBoronFusionDrive",
+   "requiredPowerPlant": "Inertial_Confinement_Fusion",
+   "thrustCap": 70,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
    "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.89,
+      "nobleMetals": 0.01,
+      "fissiles": 0.1
    },
-   "iconResource": "shipbuildericons/ICO_ZetaBoronFusionDrive"
+   "helium3Fuel": true,
+   "iconResource": "shipbuildericons/ICO_HelionNovaTorch"
 },
  {
-   "dataName": "MagProtiumFusionDrivex1",
-   "friendlyName": "Mag Protium Fusion Drive x1",
+   "dataName": "BoraneNovaLanternx1",
+   "friendlyName": "Borane Nova Lantern x1",
    "thrusters": 1,
-   "notes": "PP Magnetic Confinement Fusion",
+   "notes": "HB Inertial Confinement Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 200000,
-   "EV_kps": 8000,
+   "requiredProjectName": "Project_BoraneNovaLantern",
+   "thrust_N": 2669750,
+   "EV_kps": 678,
    "specificPower_kgMW": 0,
-   "efficiency": 0.95,
+   "efficiency": 0.99,
+   "thrustRating_GW": "905.045",
+   "req power": "914.187",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Any_Magnetic_Confinement_Fusion",
+   "requiredPowerPlant": "Inertial_Confinement_Fusion",
    "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_MagProtiumFusionDrive",
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "ReactionProducts",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.79,
+      "volatiles": 0.1,
+      "metals": 0.1,
+      "nobleMetals": 0.01
    },
-   "interstellar": true,
-   "iconResource": "shipbuildericons/ICO_MagProtiumFusionDrive"
+   "iconResource": "shipbuildericons/ICO_BoraneNovaLantern"
 },
  {
-   "dataName": "MagProtiumFusionDrivex2",
-   "friendlyName": "Mag Protium Fusion Drive x2",
+   "dataName": "BoraneNovaLanternx2",
+   "friendlyName": "Borane Nova Lantern x2",
    "thrusters": 2,
-   "notes": "PP Magnetic Confinement Fusion",
+   "notes": "HB Inertial Confinement Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 400000,
-   "EV_kps": 8000,
+   "requiredProjectName": "Project_BoraneNovaLantern",
+   "thrust_N": 5339500,
+   "EV_kps": 678,
    "specificPower_kgMW": 0,
-   "efficiency": 0.95,
+   "efficiency": 0.99,
+   "thrustRating_GW": "1,810.091",
+   "req power": "1,828.374",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Any_Magnetic_Confinement_Fusion",
+   "requiredPowerPlant": "Inertial_Confinement_Fusion",
    "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_MagProtiumFusionDrive",
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "ReactionProducts",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.79,
+      "volatiles": 0.1,
+      "metals": 0.1,
+      "nobleMetals": 0.01
    },
-   "interstellar": true,
-   "iconResource": "shipbuildericons/ICO_MagProtiumFusionDrive"
+   "iconResource": "shipbuildericons/ICO_BoraneNovaLantern"
 },
  {
-   "dataName": "MagProtiumFusionDrivex3",
-   "friendlyName": "Mag Protium Fusion Drive x3",
+   "dataName": "BoraneNovaLanternx3",
+   "friendlyName": "Borane Nova Lantern x3",
    "thrusters": 3,
-   "notes": "PP Magnetic Confinement Fusion",
+   "notes": "HB Inertial Confinement Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 600000,
-   "EV_kps": 8000,
+   "requiredProjectName": "Project_BoraneNovaLantern",
+   "thrust_N": 8009250,
+   "EV_kps": 678,
    "specificPower_kgMW": 0,
-   "efficiency": 0.95,
+   "efficiency": 0.99,
+   "thrustRating_GW": "2,715.136",
+   "req power": "2,742.561",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Any_Magnetic_Confinement_Fusion",
+   "requiredPowerPlant": "Inertial_Confinement_Fusion",
    "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_MagProtiumFusionDrive",
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "ReactionProducts",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.79,
+      "volatiles": 0.1,
+      "metals": 0.1,
+      "nobleMetals": 0.01
    },
-   "interstellar": true,
-   "iconResource": "shipbuildericons/ICO_MagProtiumFusionDrive"
+   "iconResource": "shipbuildericons/ICO_BoraneNovaLantern"
 },
  {
-   "dataName": "MagProtiumFusionDrivex4",
-   "friendlyName": "Mag Protium Fusion Drive x4",
+   "dataName": "BoraneNovaLanternx4",
+   "friendlyName": "Borane Nova Lantern x4",
    "thrusters": 4,
-   "notes": "PP Magnetic Confinement Fusion",
+   "notes": "HB Inertial Confinement Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 800000,
-   "EV_kps": 8000,
+   "requiredProjectName": "Project_BoraneNovaLantern",
+   "thrust_N": 10679000,
+   "EV_kps": 678,
    "specificPower_kgMW": 0,
-   "efficiency": 0.95,
+   "efficiency": 0.99,
+   "thrustRating_GW": "3,620.181",
+   "req power": "3,656.748",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Any_Magnetic_Confinement_Fusion",
+   "requiredPowerPlant": "Inertial_Confinement_Fusion",
    "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_MagProtiumFusionDrive",
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "ReactionProducts",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.79,
+      "volatiles": 0.1,
+      "metals": 0.1,
+      "nobleMetals": 0.01
    },
-   "interstellar": true,
-   "iconResource": "shipbuildericons/ICO_MagProtiumFusionDrive"
+   "iconResource": "shipbuildericons/ICO_BoraneNovaLantern"
 },
  {
-   "dataName": "MagProtiumFusionDrivex5",
-   "friendlyName": "Mag Protium Fusion Drive x5",
+   "dataName": "BoraneNovaLanternx5",
+   "friendlyName": "Borane Nova Lantern x5",
    "thrusters": 5,
-   "notes": "PP Magnetic Confinement Fusion",
+   "notes": "HB Inertial Confinement Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 1000000,
-   "EV_kps": 8000,
+   "requiredProjectName": "Project_BoraneNovaLantern",
+   "thrust_N": 13348750,
+   "EV_kps": 678,
    "specificPower_kgMW": 0,
-   "efficiency": 0.95,
+   "efficiency": 0.99,
+   "thrustRating_GW": "4,525.226",
+   "req power": "4,570.936",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Any_Magnetic_Confinement_Fusion",
+   "requiredPowerPlant": "Inertial_Confinement_Fusion",
    "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_MagProtiumFusionDrive",
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "ReactionProducts",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.79,
+      "volatiles": 0.1,
+      "metals": 0.1,
+      "nobleMetals": 0.01
    },
-   "interstellar": true,
-   "iconResource": "shipbuildericons/ICO_MagProtiumFusionDrive"
+   "iconResource": "shipbuildericons/ICO_BoraneNovaLantern"
 },
  {
-   "dataName": "MagProtiumFusionDrivex6",
-   "friendlyName": "Mag Protium Fusion Drive x6",
+   "dataName": "BoraneNovaLanternx6",
+   "friendlyName": "Borane Nova Lantern x6",
    "thrusters": 6,
-   "notes": "PP Magnetic Confinement Fusion",
+   "notes": "HB Inertial Confinement Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 1200000,
-   "EV_kps": 8000,
+   "requiredProjectName": "Project_BoraneNovaLantern",
+   "thrust_N": 16018500,
+   "EV_kps": 678,
    "specificPower_kgMW": 0,
-   "efficiency": 0.95,
+   "efficiency": 0.99,
+   "thrustRating_GW": "5,430.272",
+   "req power": "5,485.123",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Any_Magnetic_Confinement_Fusion",
+   "requiredPowerPlant": "Inertial_Confinement_Fusion",
    "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_MagProtiumFusionDrive",
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "ReactionProducts",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.79,
+      "volatiles": 0.1,
+      "metals": 0.1,
+      "nobleMetals": 0.01
    },
-   "interstellar": true,
-   "iconResource": "shipbuildericons/ICO_MagProtiumFusionDrive"
+   "iconResource": "shipbuildericons/ICO_BoraneNovaLantern"
 },
  {
-   "dataName": "TritonHopeInertialDrivex1",
-   "friendlyName": "Triton Hope Inertial Drive x1",
+   "dataName": "ProtiumNovaTorchx1",
+   "friendlyName": "Protium Nova Torch x1",
    "thrusters": 1,
-   "notes": "DT Inertial Confinement Fusion",
+   "notes": "PP Inertial Confinement Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 5798,
-   "EV_kps": 691.46,
+   "requiredProjectName": "Project_ProtiumNovaTorch",
+   "thrust_N": 6600000,
+   "EV_kps": 1000,
    "specificPower_kgMW": 0,
-   "efficiency": 0.76,
+   "efficiency": 0.97,
+   "thrustRating_GW": "3,300.000",
+   "req power": "3,402.062",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Inertial_Confinement_Fusion",
    "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_TritonHopeInertialDrive",
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "ReactionProducts",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.99,
+      "nobleMetals": 0.01
    },
-   "iconResource": "shipbuildericons/ICO_TritonHopeInertialDrive"
+   "iconResource": "shipbuildericons/ICO_ProtiumNovaTorch"
 },
  {
-   "dataName": "TritonHopeInertialDrivex2",
-   "friendlyName": "Triton Hope Inertial Drive x2",
+   "dataName": "ProtiumNovaTorchx2",
+   "friendlyName": "Protium Nova Torch x2",
    "thrusters": 2,
-   "notes": "DT Inertial Confinement Fusion",
+   "notes": "PP Inertial Confinement Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 11596,
-   "EV_kps": 691.46,
+   "requiredProjectName": "Project_ProtiumNovaTorch",
+   "thrust_N": 13200000,
+   "EV_kps": 1000,
    "specificPower_kgMW": 0,
-   "efficiency": 0.76,
+   "efficiency": 0.97,
+   "thrustRating_GW": "6,600.000",
+   "req power": "6,804.124",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Inertial_Confinement_Fusion",
    "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_TritonHopeInertialDrive",
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "ReactionProducts",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.99,
+      "nobleMetals": 0.01
    },
-   "iconResource": "shipbuildericons/ICO_TritonHopeInertialDrive"
+   "iconResource": "shipbuildericons/ICO_ProtiumNovaTorch"
 },
  {
-   "dataName": "TritonHopeInertialDrivex3",
-   "friendlyName": "Triton Hope Inertial Drive x3",
+   "dataName": "ProtiumNovaTorchx3",
+   "friendlyName": "Protium Nova Torch x3",
    "thrusters": 3,
-   "notes": "DT Inertial Confinement Fusion",
+   "notes": "PP Inertial Confinement Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 17394,
-   "EV_kps": 691.46,
+   "requiredProjectName": "Project_ProtiumNovaTorch",
+   "thrust_N": 19800000,
+   "EV_kps": 1000,
    "specificPower_kgMW": 0,
-   "efficiency": 0.76,
+   "efficiency": 0.97,
+   "thrustRating_GW": "9,900.000",
+   "req power": "10,206.186",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Inertial_Confinement_Fusion",
    "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_TritonHopeInertialDrive",
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "ReactionProducts",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.99,
+      "nobleMetals": 0.01
    },
-   "iconResource": "shipbuildericons/ICO_TritonHopeInertialDrive"
+   "iconResource": "shipbuildericons/ICO_ProtiumNovaTorch"
 },
  {
-   "dataName": "TritonHopeInertialDrivex4",
-   "friendlyName": "Triton Hope Inertial Drive x4",
+   "dataName": "ProtiumNovaTorchx4",
+   "friendlyName": "Protium Nova Torch x4",
    "thrusters": 4,
-   "notes": "DT Inertial Confinement Fusion",
+   "notes": "PP Inertial Confinement Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 23192,
-   "EV_kps": 691.46,
+   "requiredProjectName": "Project_ProtiumNovaTorch",
+   "thrust_N": 26400000,
+   "EV_kps": 1000,
    "specificPower_kgMW": 0,
-   "efficiency": 0.76,
+   "efficiency": 0.97,
+   "thrustRating_GW": "13,200.000",
+   "req power": "13,608.247",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Inertial_Confinement_Fusion",
    "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_TritonHopeInertialDrive",
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "ReactionProducts",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.99,
+      "nobleMetals": 0.01
    },
-   "iconResource": "shipbuildericons/ICO_TritonHopeInertialDrive"
+   "iconResource": "shipbuildericons/ICO_ProtiumNovaTorch"
 },
  {
-   "dataName": "TritonHopeInertialDrivex5",
-   "friendlyName": "Triton Hope Inertial Drive x5",
+   "dataName": "ProtiumNovaTorchx5",
+   "friendlyName": "Protium Nova Torch x5",
    "thrusters": 5,
-   "notes": "DT Inertial Confinement Fusion",
+   "notes": "PP Inertial Confinement Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 28990,
-   "EV_kps": 691.46,
+   "requiredProjectName": "Project_ProtiumNovaTorch",
+   "thrust_N": 33000000,
+   "EV_kps": 1000,
    "specificPower_kgMW": 0,
-   "efficiency": 0.76,
+   "efficiency": 0.97,
+   "thrustRating_GW": "16,500.000",
+   "req power": "17,010.309",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Inertial_Confinement_Fusion",
    "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_TritonHopeInertialDrive",
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "ReactionProducts",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.99,
+      "nobleMetals": 0.01
    },
-   "iconResource": "shipbuildericons/ICO_TritonHopeInertialDrive"
+   "iconResource": "shipbuildericons/ICO_ProtiumNovaTorch"
 },
  {
-   "dataName": "TritonHopeInertialDrivex6",
-   "friendlyName": "Triton Hope Inertial Drive x6",
+   "dataName": "ProtiumNovaTorchx6",
+   "friendlyName": "Protium Nova Torch x6",
    "thrusters": 6,
-   "notes": "DT Inertial Confinement Fusion",
+   "notes": "PP Inertial Confinement Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 34788,
-   "EV_kps": 691.46,
+   "requiredProjectName": "Project_ProtiumNovaTorch",
+   "thrust_N": 39600000,
+   "EV_kps": 1000,
    "specificPower_kgMW": 0,
-   "efficiency": 0.76,
+   "efficiency": 0.97,
+   "thrustRating_GW": "19,800.000",
+   "req power": "20,412.371",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Inertial_Confinement_Fusion",
    "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_TritonHopeInertialDrive",
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "ReactionProducts",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.99,
+      "nobleMetals": 0.01
    },
-   "iconResource": "shipbuildericons/ICO_TritonHopeInertialDrive"
+   "iconResource": "shipbuildericons/ICO_ProtiumNovaTorch"
 },
  {
-   "dataName": "TritonVistaInertialDrivex1",
-   "friendlyName": "Triton Vista Inertial Drive x1",
+   "dataName": "ProtiumConverterTorchx1",
+   "friendlyName": "Protium Converter Torch x1",
    "thrusters": 1,
-   "notes": "DT Inertial Confinement Fusion",
+   "notes": "PP Inertial Confinement Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 240000,
-   "EV_kps": 170,
+   "requiredProjectName": "Project_ProtiumConverterTorch",
+   "thrust_N": 9760000,
+   "EV_kps": 10256,
    "specificPower_kgMW": 0,
-   "efficiency": 0.8,
+   "efficiency": 0.98,
+   "thrustRating_GW": "50,049.280",
+   "req power": "51,070.694",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Inertial_Confinement_Fusion",
    "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_TritonVistaInertialDrive",
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
    "propellant": "ReactionProducts",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.99,
+      "nobleMetals": 0.01
    },
-   "iconResource": "shipbuildericons/ICO_TritonVistaInertialDrive"
+   "iconResource": "shipbuildericons/ICO_ProtiumConverterTorch"
 },
  {
-   "dataName": "TritonVistaInertialDrivex2",
-   "friendlyName": "Triton Vista Inertial Drive x2",
+   "dataName": "ProtiumConverterTorchx2",
+   "friendlyName": "Protium Converter Torch x2",
    "thrusters": 2,
-   "notes": "DT Inertial Confinement Fusion",
+   "notes": "PP Inertial Confinement Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 480000,
-   "EV_kps": 170,
+   "requiredProjectName": "Project_ProtiumConverterTorch",
+   "thrust_N": 19520000,
+   "EV_kps": 10256,
    "specificPower_kgMW": 0,
-   "efficiency": 0.8,
+   "efficiency": 0.98,
+   "thrustRating_GW": "100,098.560",
+   "req power": "102,141.388",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Inertial_Confinement_Fusion",
    "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_TritonVistaInertialDrive",
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
    "propellant": "ReactionProducts",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.99,
+      "nobleMetals": 0.01
    },
-   "iconResource": "shipbuildericons/ICO_TritonVistaInertialDrive"
+   "iconResource": "shipbuildericons/ICO_ProtiumConverterTorch"
 },
  {
-   "dataName": "TritonVistaInertialDrivex3",
-   "friendlyName": "Triton Vista Inertial Drive x3",
+   "dataName": "ProtiumConverterTorchx3",
+   "friendlyName": "Protium Converter Torch x3",
    "thrusters": 3,
-   "notes": "DT Inertial Confinement Fusion",
+   "notes": "PP Inertial Confinement Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 720000,
-   "EV_kps": 170,
+   "requiredProjectName": "Project_ProtiumConverterTorch",
+   "thrust_N": 29280000,
+   "EV_kps": 10256,
    "specificPower_kgMW": 0,
-   "efficiency": 0.8,
+   "efficiency": 0.98,
+   "thrustRating_GW": "150,147.840",
+   "req power": "153,212.082",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Inertial_Confinement_Fusion",
    "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_TritonVistaInertialDrive",
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
    "propellant": "ReactionProducts",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.99,
+      "nobleMetals": 0.01
    },
-   "iconResource": "shipbuildericons/ICO_TritonVistaInertialDrive"
+   "iconResource": "shipbuildericons/ICO_ProtiumConverterTorch"
 },
  {
-   "dataName": "TritonVistaInertialDrivex4",
-   "friendlyName": "Triton Vista Inertial Drive x4",
+   "dataName": "ProtiumConverterTorchx4",
+   "friendlyName": "Protium Converter Torch x4",
    "thrusters": 4,
-   "notes": "DT Inertial Confinement Fusion",
+   "notes": "PP Inertial Confinement Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 960000,
-   "EV_kps": 170,
+   "requiredProjectName": "Project_ProtiumConverterTorch",
+   "thrust_N": 39040000,
+   "EV_kps": 10256,
    "specificPower_kgMW": 0,
-   "efficiency": 0.8,
+   "efficiency": 0.98,
+   "thrustRating_GW": "200,197.120",
+   "req power": "204,282.776",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Inertial_Confinement_Fusion",
    "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_TritonVistaInertialDrive",
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
    "propellant": "ReactionProducts",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.99,
+      "nobleMetals": 0.01
    },
-   "iconResource": "shipbuildericons/ICO_TritonVistaInertialDrive"
+   "iconResource": "shipbuildericons/ICO_ProtiumConverterTorch"
 },
  {
-   "dataName": "TritonVistaInertialDrivex5",
-   "friendlyName": "Triton Vista Inertial Drive x5",
+   "dataName": "ProtiumConverterTorchx5",
+   "friendlyName": "Protium Converter Torch x5",
    "thrusters": 5,
-   "notes": "DT Inertial Confinement Fusion",
+   "notes": "PP Inertial Confinement Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 1200000,
-   "EV_kps": 170,
+   "requiredProjectName": "Project_ProtiumConverterTorch",
+   "thrust_N": 48800000,
+   "EV_kps": 10256,
    "specificPower_kgMW": 0,
-   "efficiency": 0.8,
+   "efficiency": 0.98,
+   "thrustRating_GW": "250,246.400",
+   "req power": "255,353.469",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Inertial_Confinement_Fusion",
    "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_TritonVistaInertialDrive",
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
    "propellant": "ReactionProducts",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.99,
+      "nobleMetals": 0.01
    },
-   "iconResource": "shipbuildericons/ICO_TritonVistaInertialDrive"
+   "iconResource": "shipbuildericons/ICO_ProtiumConverterTorch"
 },
  {
-   "dataName": "TritonVistaInertialDrivex6",
-   "friendlyName": "Triton Vista Inertial Drive x6",
+   "dataName": "ProtiumConverterTorchx6",
+   "friendlyName": "Protium Converter Torch x6",
    "thrusters": 6,
-   "notes": "DT Inertial Confinement Fusion",
+   "notes": "PP Inertial Confinement Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 1440000,
-   "EV_kps": 170,
+   "requiredProjectName": "Project_ProtiumConverterTorch",
+   "thrust_N": 58560000,
+   "EV_kps": 10256,
    "specificPower_kgMW": 0,
-   "efficiency": 0.8,
+   "efficiency": 0.98,
+   "thrustRating_GW": "300,295.680",
+   "req power": "306,424.163",
    "flatMass_tons": 0,
    "requiredPowerPlant": "Inertial_Confinement_Fusion",
    "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_TritonVistaInertialDrive",
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
    "propellant": "ReactionProducts",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.99,
+      "nobleMetals": 0.01
    },
-   "iconResource": "shipbuildericons/ICO_TritonVistaInertialDrive"
+   "iconResource": "shipbuildericons/ICO_ProtiumConverterTorch"
 },
  {
-   "dataName": "HelionInertialDrivex1",
-   "friendlyName": "Helion Inertial Drive x1",
+   "dataName": "AlienFusionLanternx1",
+   "friendlyName": "Alien Fusion Lantern x1",
    "thrusters": 1,
-   "notes": "D-He3 Inertial Confinement Fusion",
+   "notes": "DD Hybrid Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 55000,
-   "EV_kps": 598,
+   "requiredProjectName": "Project_AlienMasterProject",
+   "thrust_N": 500000,
+   "EV_kps": 633,
    "specificPower_kgMW": 0,
    "efficiency": 0.95,
+   "thrustRating_GW": "158.250",
+   "req power": "166.579",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Inertial_Confinement_Fusion",
+   "requiredPowerPlant": "Hybrid_Confinement_Fusion",
    "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_HelionInertialDrive",
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -10801,23 +12677,25 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_HelionInertialDrive"
+   "iconResource": "shipbuildericons/ICO_AlienFusionTorch"
 },
  {
-   "dataName": "HelionInertialDrivex2",
-   "friendlyName": "Helion Inertial Drive x2",
+   "dataName": "AlienFusionLanternx2",
+   "friendlyName": "Alien Fusion Lantern x2",
    "thrusters": 2,
-   "notes": "D-He3 Inertial Confinement Fusion",
+   "notes": "DD Hybrid Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 110000,
-   "EV_kps": 598,
+   "requiredProjectName": "Project_AlienMasterProject",
+   "thrust_N": 1000000,
+   "EV_kps": 633,
    "specificPower_kgMW": 0,
    "efficiency": 0.95,
+   "thrustRating_GW": "316.500",
+   "req power": "333.158",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Inertial_Confinement_Fusion",
+   "requiredPowerPlant": "Hybrid_Confinement_Fusion",
    "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_HelionInertialDrive",
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -10825,23 +12703,25 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_HelionInertialDrive"
+   "iconResource": "shipbuildericons/ICO_AlienFusionTorch"
 },
  {
-   "dataName": "HelionInertialDrivex3",
-   "friendlyName": "Helion Inertial Drive x3",
+   "dataName": "AlienFusionLanternx3",
+   "friendlyName": "Alien Fusion Lantern x3",
    "thrusters": 3,
-   "notes": "D-He3 Inertial Confinement Fusion",
+   "notes": "DD Hybrid Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 165000,
-   "EV_kps": 598,
+   "requiredProjectName": "Project_AlienMasterProject",
+   "thrust_N": 1500000,
+   "EV_kps": 633,
    "specificPower_kgMW": 0,
    "efficiency": 0.95,
+   "thrustRating_GW": "474.750",
+   "req power": "499.737",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Inertial_Confinement_Fusion",
+   "requiredPowerPlant": "Hybrid_Confinement_Fusion",
    "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_HelionInertialDrive",
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -10849,23 +12729,25 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_HelionInertialDrive"
+   "iconResource": "shipbuildericons/ICO_AlienFusionTorch"
 },
  {
-   "dataName": "HelionInertialDrivex4",
-   "friendlyName": "Helion Inertial Drive x4",
+   "dataName": "AlienFusionLanternx4",
+   "friendlyName": "Alien Fusion Lantern x4",
    "thrusters": 4,
-   "notes": "D-He3 Inertial Confinement Fusion",
+   "notes": "DD Hybrid Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 220000,
-   "EV_kps": 598,
+   "requiredProjectName": "Project_AlienMasterProject",
+   "thrust_N": 2000000,
+   "EV_kps": 633,
    "specificPower_kgMW": 0,
    "efficiency": 0.95,
+   "thrustRating_GW": "633.000",
+   "req power": "666.316",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Inertial_Confinement_Fusion",
+   "requiredPowerPlant": "Hybrid_Confinement_Fusion",
    "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_HelionInertialDrive",
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -10873,23 +12755,25 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_HelionInertialDrive"
+   "iconResource": "shipbuildericons/ICO_AlienFusionTorch"
 },
  {
-   "dataName": "HelionInertialDrivex5",
-   "friendlyName": "Helion Inertial Drive x5",
+   "dataName": "AlienFusionLanternx5",
+   "friendlyName": "Alien Fusion Lantern x5",
    "thrusters": 5,
-   "notes": "D-He3 Inertial Confinement Fusion",
+   "notes": "DD Hybrid Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 275000,
-   "EV_kps": 598,
+   "requiredProjectName": "Project_AlienMasterProject",
+   "thrust_N": 2500000,
+   "EV_kps": 633,
    "specificPower_kgMW": 0,
    "efficiency": 0.95,
+   "thrustRating_GW": "791.250",
+   "req power": "832.895",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Inertial_Confinement_Fusion",
+   "requiredPowerPlant": "Hybrid_Confinement_Fusion",
    "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_HelionInertialDrive",
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -10897,23 +12781,25 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_HelionInertialDrive"
+   "iconResource": "shipbuildericons/ICO_AlienFusionTorch"
 },
  {
-   "dataName": "HelionInertialDrivex6",
-   "friendlyName": "Helion Inertial Drive x6",
+   "dataName": "AlienFusionLanternx6",
+   "friendlyName": "Alien Fusion Lantern x6",
    "thrusters": 6,
-   "notes": "D-He3 Inertial Confinement Fusion",
+   "notes": "DD Hybrid Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 330000,
-   "EV_kps": 598,
+   "requiredProjectName": "Project_AlienMasterProject",
+   "thrust_N": 3000000,
+   "EV_kps": 633,
    "specificPower_kgMW": 0,
    "efficiency": 0.95,
+   "thrustRating_GW": "949.500",
+   "req power": "999.474",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Inertial_Confinement_Fusion",
+   "requiredPowerPlant": "Hybrid_Confinement_Fusion",
    "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_HelionInertialDrive",
+   "cooling": "Closed",
    "weightedBuildMaterials": {
       "metals": 1
    },
@@ -10921,1335 +12807,1423 @@
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_HelionInertialDrive"
+   "iconResource": "shipbuildericons/ICO_AlienFusionTorch"
 },
  {
-   "dataName": "DaedelusTorchx1",
-   "friendlyName": "Daedelus Torch x1",
+   "dataName": "AlienFusionTorchx1",
+   "friendlyName": "Alien Fusion Torch x1",
    "thrusters": 1,
-   "notes": "D-He3 Inertial Confinement Fusion",
+   "notes": "DD Hybrid Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 663000,
-   "EV_kps": 9210,
+   "requiredProjectName": "Project_AlienMasterProject",
+   "thrust_N": 1590000,
+   "EV_kps": 1300,
    "specificPower_kgMW": 0,
-   "efficiency": 0.98,
-   "flatMass_tons": 0,
-   "requiredPowerPlant": "Inertial_Confinement_Fusion",
-   "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_DaedelusTorch",
+   "efficiency": 0.97,
+   "thrustRating_GW": "1,033.500",
+   "req power": "1,065.464",
+   "flatMass_tons": 10,
+   "requiredPowerPlant": "Hybrid_Confinement_Fusion",
+   "thrustCap": 65,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
-      "metals": 1
+      "metals": 0.9,
+      "exotics": 0.1
    },
    "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "interstellar": true,
-   "iconResource": "shipbuildericons/ICO_DaedelusTorch"
+   "iconResource": "shipbuildericons/ICO_AlienFusionTorch"
 },
  {
-   "dataName": "DaedelusTorchx2",
-   "friendlyName": "Daedelus Torch x2",
+   "dataName": "AlienFusionTorchx2",
+   "friendlyName": "Alien Fusion Torch x2",
    "thrusters": 2,
-   "notes": "D-He3 Inertial Confinement Fusion",
+   "notes": "DD Hybrid Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 1326000,
-   "EV_kps": 9210,
+   "requiredProjectName": "Project_AlienMasterProject",
+   "thrust_N": 3180000,
+   "EV_kps": 1300,
    "specificPower_kgMW": 0,
-   "efficiency": 0.98,
-   "flatMass_tons": 0,
-   "requiredPowerPlant": "Inertial_Confinement_Fusion",
-   "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_DaedelusTorch",
+   "efficiency": 0.97,
+   "thrustRating_GW": "2,067.000",
+   "req power": "2,130.928",
+   "flatMass_tons": 20,
+   "requiredPowerPlant": "Hybrid_Confinement_Fusion",
+   "thrustCap": 65,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
-      "metals": 1
+      "metals": 0.9,
+      "exotics": 0.1
    },
    "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "interstellar": true,
-   "iconResource": "shipbuildericons/ICO_DaedelusTorch"
+   "iconResource": "shipbuildericons/ICO_AlienFusionTorch"
 },
  {
-   "dataName": "DaedelusTorchx3",
-   "friendlyName": "Daedelus Torch x3",
+   "dataName": "AlienFusionTorchx3",
+   "friendlyName": "Alien Fusion Torch x3",
    "thrusters": 3,
-   "notes": "D-He3 Inertial Confinement Fusion",
+   "notes": "DD Hybrid Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 1989000,
-   "EV_kps": 9210,
+   "requiredProjectName": "Project_AlienMasterProject",
+   "thrust_N": 4770000,
+   "EV_kps": 1300,
    "specificPower_kgMW": 0,
-   "efficiency": 0.98,
-   "flatMass_tons": 0,
-   "requiredPowerPlant": "Inertial_Confinement_Fusion",
-   "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_DaedelusTorch",
+   "efficiency": 0.97,
+   "thrustRating_GW": "3,100.500",
+   "req power": "3,196.392",
+   "flatMass_tons": 30,
+   "requiredPowerPlant": "Hybrid_Confinement_Fusion",
+   "thrustCap": 65,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
-      "metals": 1
+      "metals": 0.9,
+      "exotics": 0.1
    },
    "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "interstellar": true,
-   "iconResource": "shipbuildericons/ICO_DaedelusTorch"
+   "iconResource": "shipbuildericons/ICO_AlienFusionTorch"
 },
  {
-   "dataName": "DaedelusTorchx4",
-   "friendlyName": "Daedelus Torch x4",
+   "dataName": "AlienFusionTorchx4",
+   "friendlyName": "Alien Fusion Torch x4",
    "thrusters": 4,
-   "notes": "D-He3 Inertial Confinement Fusion",
+   "notes": "DD Hybrid Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 2652000,
-   "EV_kps": 9210,
+   "requiredProjectName": "Project_AlienMasterProject",
+   "thrust_N": 6360000,
+   "EV_kps": 1300,
    "specificPower_kgMW": 0,
-   "efficiency": 0.98,
-   "flatMass_tons": 0,
-   "requiredPowerPlant": "Inertial_Confinement_Fusion",
-   "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_DaedelusTorch",
+   "efficiency": 0.97,
+   "thrustRating_GW": "4,134.000",
+   "req power": "4,261.856",
+   "flatMass_tons": 40,
+   "requiredPowerPlant": "Hybrid_Confinement_Fusion",
+   "thrustCap": 65,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
-      "metals": 1
+      "metals": 0.9,
+      "exotics": 0.1
    },
    "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "interstellar": true,
-   "iconResource": "shipbuildericons/ICO_DaedelusTorch"
+   "iconResource": "shipbuildericons/ICO_AlienFusionTorch"
 },
  {
-   "dataName": "DaedelusTorchx5",
-   "friendlyName": "Daedelus Torch x5",
+   "dataName": "AlienFusionTorchx5",
+   "friendlyName": "Alien Fusion Torch x5",
    "thrusters": 5,
-   "notes": "D-He3 Inertial Confinement Fusion",
+   "notes": "DD Hybrid Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 3315000,
-   "EV_kps": 9210,
+   "requiredProjectName": "Project_AlienMasterProject",
+   "thrust_N": 7950000,
+   "EV_kps": 1300,
    "specificPower_kgMW": 0,
-   "efficiency": 0.98,
-   "flatMass_tons": 0,
-   "requiredPowerPlant": "Inertial_Confinement_Fusion",
-   "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_DaedelusTorch",
+   "efficiency": 0.97,
+   "thrustRating_GW": "5,167.500",
+   "req power": "5,327.320",
+   "flatMass_tons": 50,
+   "requiredPowerPlant": "Hybrid_Confinement_Fusion",
+   "thrustCap": 65,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
-      "metals": 1
+      "metals": 0.9,
+      "exotics": 0.1
    },
    "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "interstellar": true,
-   "iconResource": "shipbuildericons/ICO_DaedelusTorch"
+   "iconResource": "shipbuildericons/ICO_AlienFusionTorch"
 },
  {
-   "dataName": "DaedelusTorchx6",
-   "friendlyName": "Daedelus Torch x6",
+   "dataName": "AlienFusionTorchx6",
+   "friendlyName": "Alien Fusion Torch x6",
    "thrusters": 6,
-   "notes": "D-He3 Inertial Confinement Fusion",
+   "notes": "DD Hybrid Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 3978000,
-   "EV_kps": 9210,
+   "requiredProjectName": "Project_AlienMasterProject",
+   "thrust_N": 9540000,
+   "EV_kps": 1300,
    "specificPower_kgMW": 0,
-   "efficiency": 0.98,
-   "flatMass_tons": 0,
-   "requiredPowerPlant": "Inertial_Confinement_Fusion",
-   "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_DaedelusTorch",
+   "efficiency": 0.97,
+   "thrustRating_GW": "6,201.000",
+   "req power": "6,392.784",
+   "flatMass_tons": 60,
+   "requiredPowerPlant": "Hybrid_Confinement_Fusion",
+   "thrustCap": 65,
+   "cooling": "Closed",
    "weightedBuildMaterials": {
-      "metals": 1
+      "metals": 0.9,
+      "exotics": 0.1
    },
    "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
       "water": 1
    },
-   "interstellar": true,
-   "iconResource": "shipbuildericons/ICO_DaedelusTorch"
+   "iconResource": "shipbuildericons/ICO_AlienFusionTorch"
 },
  {
-   "dataName": "BoronInertialDrivex1",
-   "friendlyName": "Boron Inertial Drive x1",
+   "dataName": "AdvancedAlienFusionTorchx1",
+   "friendlyName": "Advanced Alien Fusion Torch x1",
    "thrusters": 1,
-   "notes": "HB Inertial Confinement Fusion",
+   "notes": "DD Hybrid Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 31000,
-   "EV_kps": 156.9,
+   "requiredProjectName": "Project_AlienAdvancedMasterProject",
+   "thrust_N": 4390000,
+   "EV_kps": 1600,
    "specificPower_kgMW": 0,
-   "efficiency": 1,
-   "flatMass_tons": 0,
-   "requiredPowerPlant": "Inertial_Confinement_Fusion",
-   "thrustCap": 60,
+   "efficiency": 0.98,
+   "thrustRating_GW": "3,512.000",
+   "req power": "3,583.673",
+   "flatMass_tons": 10,
+   "requiredPowerPlant": "Hybrid_Confinement_Fusion",
+   "thrustCap": 70,
    "cooling": "Calc",
-   "requiredProjectName": "Project_BoronInertialDrive",
    "weightedBuildMaterials": {
-      "metals": 1
+      "metals": 0.95,
+      "exotics": 0.05
    },
-   "propellant": "Volatiles",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 0.5,
-      "volatiles": 0.5
+      "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_BoronInertialDrive"
+   "iconResource": "shipbuildericons/ICO_AlienFusionTorch"
 },
  {
-   "dataName": "BoronInertialDrivex2",
-   "friendlyName": "Boron Inertial Drive x2",
+   "dataName": "AdvancedAlienFusionTorchx2",
+   "friendlyName": "Advanced Alien Fusion Torch x2",
    "thrusters": 2,
-   "notes": "HB Inertial Confinement Fusion",
+   "notes": "DD Hybrid Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 62000,
-   "EV_kps": 156.9,
+   "requiredProjectName": "Project_AlienAdvancedMasterProject",
+   "thrust_N": 8780000,
+   "EV_kps": 1600,
    "specificPower_kgMW": 0,
-   "efficiency": 1,
-   "flatMass_tons": 0,
-   "requiredPowerPlant": "Inertial_Confinement_Fusion",
-   "thrustCap": 60,
+   "efficiency": 0.98,
+   "thrustRating_GW": "7,024.000",
+   "req power": "7,167.347",
+   "flatMass_tons": 20,
+   "requiredPowerPlant": "Hybrid_Confinement_Fusion",
+   "thrustCap": 70,
    "cooling": "Calc",
-   "requiredProjectName": "Project_BoronInertialDrive",
    "weightedBuildMaterials": {
-      "metals": 1
+      "metals": 0.95,
+      "exotics": 0.05
    },
-   "propellant": "Volatiles",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 0.5,
-      "volatiles": 0.5
+      "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_BoronInertialDrive"
+   "iconResource": "shipbuildericons/ICO_AlienFusionTorch"
 },
  {
-   "dataName": "BoronInertialDrivex3",
-   "friendlyName": "Boron Inertial Drive x3",
+   "dataName": "AdvancedAlienFusionTorchx3",
+   "friendlyName": "Advanced Alien Fusion Torch x3",
    "thrusters": 3,
-   "notes": "HB Inertial Confinement Fusion",
+   "notes": "DD Hybrid Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 93000,
-   "EV_kps": 156.9,
+   "requiredProjectName": "Project_AlienAdvancedMasterProject",
+   "thrust_N": 13170000,
+   "EV_kps": 1600,
    "specificPower_kgMW": 0,
-   "efficiency": 1,
-   "flatMass_tons": 0,
-   "requiredPowerPlant": "Inertial_Confinement_Fusion",
-   "thrustCap": 60,
+   "efficiency": 0.98,
+   "thrustRating_GW": "10,536.000",
+   "req power": "10,751.020",
+   "flatMass_tons": 30,
+   "requiredPowerPlant": "Hybrid_Confinement_Fusion",
+   "thrustCap": 70,
    "cooling": "Calc",
-   "requiredProjectName": "Project_BoronInertialDrive",
    "weightedBuildMaterials": {
-      "metals": 1
+      "metals": 0.95,
+      "exotics": 0.05
    },
-   "propellant": "Volatiles",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 0.5,
-      "volatiles": 0.5
+      "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_BoronInertialDrive"
+   "iconResource": "shipbuildericons/ICO_AlienFusionTorch"
 },
  {
-   "dataName": "BoronInertialDrivex4",
-   "friendlyName": "Boron Inertial Drive x4",
+   "dataName": "AdvancedAlienFusionTorchx4",
+   "friendlyName": "Advanced Alien Fusion Torch x4",
    "thrusters": 4,
-   "notes": "HB Inertial Confinement Fusion",
+   "notes": "DD Hybrid Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 124000,
-   "EV_kps": 156.9,
+   "requiredProjectName": "Project_AlienAdvancedMasterProject",
+   "thrust_N": 17560000,
+   "EV_kps": 1600,
    "specificPower_kgMW": 0,
-   "efficiency": 1,
-   "flatMass_tons": 0,
-   "requiredPowerPlant": "Inertial_Confinement_Fusion",
-   "thrustCap": 60,
+   "efficiency": 0.98,
+   "thrustRating_GW": "14,048.000",
+   "req power": "14,334.694",
+   "flatMass_tons": 40,
+   "requiredPowerPlant": "Hybrid_Confinement_Fusion",
+   "thrustCap": 70,
    "cooling": "Calc",
-   "requiredProjectName": "Project_BoronInertialDrive",
    "weightedBuildMaterials": {
-      "metals": 1
+      "metals": 0.95,
+      "exotics": 0.05
    },
-   "propellant": "Volatiles",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 0.5,
-      "volatiles": 0.5
+      "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_BoronInertialDrive"
+   "iconResource": "shipbuildericons/ICO_AlienFusionTorch"
 },
  {
-   "dataName": "BoronInertialDrivex5",
-   "friendlyName": "Boron Inertial Drive x5",
+   "dataName": "AdvancedAlienFusionTorchx5",
+   "friendlyName": "Advanced Alien Fusion Torch x5",
    "thrusters": 5,
-   "notes": "HB Inertial Confinement Fusion",
+   "notes": "DD Hybrid Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 155000,
-   "EV_kps": 156.9,
+   "requiredProjectName": "Project_AlienAdvancedMasterProject",
+   "thrust_N": 21950000,
+   "EV_kps": 1600,
    "specificPower_kgMW": 0,
-   "efficiency": 1,
-   "flatMass_tons": 0,
-   "requiredPowerPlant": "Inertial_Confinement_Fusion",
-   "thrustCap": 60,
+   "efficiency": 0.98,
+   "thrustRating_GW": "17,560.000",
+   "req power": "17,918.367",
+   "flatMass_tons": 50,
+   "requiredPowerPlant": "Hybrid_Confinement_Fusion",
+   "thrustCap": 70,
    "cooling": "Calc",
-   "requiredProjectName": "Project_BoronInertialDrive",
    "weightedBuildMaterials": {
-      "metals": 1
+      "metals": 0.95,
+      "exotics": 0.05
    },
-   "propellant": "Volatiles",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 0.5,
-      "volatiles": 0.5
+      "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_BoronInertialDrive"
+   "iconResource": "shipbuildericons/ICO_AlienFusionTorch"
 },
  {
-   "dataName": "BoronInertialDrivex6",
-   "friendlyName": "Boron Inertial Drive x6",
+   "dataName": "AdvancedAlienFusionTorchx6",
+   "friendlyName": "Advanced Alien Fusion Torch x6",
    "thrusters": 6,
-   "notes": "HB Inertial Confinement Fusion",
+   "notes": "DD Hybrid Fusion",
    "driveClassification": "Fusion_Thermal",
-   "thrust_N": 186000,
-   "EV_kps": 156.9,
+   "requiredProjectName": "Project_AlienAdvancedMasterProject",
+   "thrust_N": 26340000,
+   "EV_kps": 1600,
    "specificPower_kgMW": 0,
-   "efficiency": 1,
-   "flatMass_tons": 0,
-   "requiredPowerPlant": "Inertial_Confinement_Fusion",
-   "thrustCap": 60,
+   "efficiency": 0.98,
+   "thrustRating_GW": "21,072.000",
+   "req power": "21,502.041",
+   "flatMass_tons": 60,
+   "requiredPowerPlant": "Hybrid_Confinement_Fusion",
+   "thrustCap": 70,
    "cooling": "Calc",
-   "requiredProjectName": "Project_BoronInertialDrive",
    "weightedBuildMaterials": {
-      "metals": 1
+      "metals": 0.95,
+      "exotics": 0.05
    },
-   "propellant": "Volatiles",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 0.5,
-      "volatiles": 0.5
+      "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_BoronInertialDrive"
+   "iconResource": "shipbuildericons/ICO_AlienFusionTorch"
 },
  {
-   "dataName": "BoronInertialTorchx1",
-   "friendlyName": "Boron Inertial Torch x1",
+   "dataName": "AntimatterPulsedPlasmaCoreLanternx1",
+   "friendlyName": "Antimatter Pulsed Plasma Core Lantern x1",
    "thrusters": 1,
-   "notes": "HB Inertial Confinement Fusion",
-   "driveClassification": "Fusion_Thermal",
-   "thrust_N": 96000,
-   "EV_kps": 17000,
+   "driveClassification": "Antimatter",
+   "requiredProjectName": "Project_AntimatterPulsedPlasmaCoreLantern",
+   "thrust_N": 1600000,
+   "EV_kps": 240,
    "specificPower_kgMW": 0,
-   "efficiency": 1,
+   "efficiency": 0.998,
+   "thrustRating_GW": "192.000",
+   "req power": "192.385",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Inertial_Confinement_Fusion",
+   "requiredPowerPlant": "Antimatter_Plasma_Core",
    "thrustCap": 60,
    "cooling": "Calc",
-   "requiredProjectName": "Project_BoronInertialTorch",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "ReactionProducts",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 0.5,
-      "volatiles": 0.5
+      "water": 0.999968059,
+      "antimatter": 0.000031941
    },
-   "iconResource": "shipbuildericons/ICO_BoronInertialTorch"
+   "iconResource": "shipbuildericons/ICO_AntimatterPulsedPlasmaCoreLantern"
 },
  {
-   "dataName": "BoronInertialTorchx2",
-   "friendlyName": "Boron Inertial Torch x2",
-   "thrusters": 2,
-   "notes": "HB Inertial Confinement Fusion",
-   "driveClassification": "Fusion_Thermal",
-   "thrust_N": 192000,
-   "EV_kps": 17000,
+   "dataName": "AntimatterPulsedPlasmaCoreLanternx2",
+   "friendlyName": "Antimatter Pulsed Plasma Core Lantern x2",
+   "thrusters": 2,
+   "driveClassification": "Antimatter",
+   "requiredProjectName": "Project_AntimatterPulsedPlasmaCoreLantern",
+   "thrust_N": 3200000,
+   "EV_kps": 240,
    "specificPower_kgMW": 0,
-   "efficiency": 1,
+   "efficiency": 0.998,
+   "thrustRating_GW": "384.000",
+   "req power": "384.770",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Inertial_Confinement_Fusion",
+   "requiredPowerPlant": "Antimatter_Plasma_Core",
    "thrustCap": 60,
    "cooling": "Calc",
-   "requiredProjectName": "Project_BoronInertialTorch",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "ReactionProducts",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 0.5,
-      "volatiles": 0.5
+      "water": 0.999968059,
+      "antimatter": 0.000031941
    },
-   "iconResource": "shipbuildericons/ICO_BoronInertialTorch"
+   "iconResource": "shipbuildericons/ICO_AntimatterPulsedPlasmaCoreLantern"
 },
  {
-   "dataName": "BoronInertialTorchx3",
-   "friendlyName": "Boron Inertial Torch x3",
+   "dataName": "AntimatterPulsedPlasmaCoreLanternx3",
+   "friendlyName": "Antimatter Pulsed Plasma Core Lantern x3",
    "thrusters": 3,
-   "notes": "HB Inertial Confinement Fusion",
-   "driveClassification": "Fusion_Thermal",
-   "thrust_N": 288000,
-   "EV_kps": 17000,
+   "driveClassification": "Antimatter",
+   "requiredProjectName": "Project_AntimatterPulsedPlasmaCoreLantern",
+   "thrust_N": 4800000,
+   "EV_kps": 240,
    "specificPower_kgMW": 0,
-   "efficiency": 1,
+   "efficiency": 0.998,
+   "thrustRating_GW": "576.000",
+   "req power": "577.154",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Inertial_Confinement_Fusion",
+   "requiredPowerPlant": "Antimatter_Plasma_Core",
    "thrustCap": 60,
    "cooling": "Calc",
-   "requiredProjectName": "Project_BoronInertialTorch",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "ReactionProducts",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 0.5,
-      "volatiles": 0.5
+      "water": 0.999968059,
+      "antimatter": 0.000031941
    },
-   "iconResource": "shipbuildericons/ICO_BoronInertialTorch"
+   "iconResource": "shipbuildericons/ICO_AntimatterPulsedPlasmaCoreLantern"
 },
  {
-   "dataName": "BoronInertialTorchx4",
-   "friendlyName": "Boron Inertial Torch x4",
+   "dataName": "AntimatterPulsedPlasmaCoreLanternx4",
+   "friendlyName": "Antimatter Pulsed Plasma Core Lantern x4",
    "thrusters": 4,
-   "notes": "HB Inertial Confinement Fusion",
-   "driveClassification": "Fusion_Thermal",
-   "thrust_N": 384000,
-   "EV_kps": 17000,
+   "driveClassification": "Antimatter",
+   "requiredProjectName": "Project_AntimatterPulsedPlasmaCoreLantern",
+   "thrust_N": 6400000,
+   "EV_kps": 240,
    "specificPower_kgMW": 0,
-   "efficiency": 1,
+   "efficiency": 0.998,
+   "thrustRating_GW": "768.000",
+   "req power": "769.539",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Inertial_Confinement_Fusion",
+   "requiredPowerPlant": "Antimatter_Plasma_Core",
    "thrustCap": 60,
    "cooling": "Calc",
-   "requiredProjectName": "Project_BoronInertialTorch",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "ReactionProducts",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 0.5,
-      "volatiles": 0.5
+      "water": 0.999968059,
+      "antimatter": 0.000031941
    },
-   "iconResource": "shipbuildericons/ICO_BoronInertialTorch"
+   "iconResource": "shipbuildericons/ICO_AntimatterPulsedPlasmaCoreLantern"
 },
  {
-   "dataName": "BoronInertialTorchx5",
-   "friendlyName": "Boron Inertial Torch x5",
+   "dataName": "AntimatterPulsedPlasmaCoreLanternx5",
+   "friendlyName": "Antimatter Pulsed Plasma Core Lantern x5",
    "thrusters": 5,
-   "notes": "HB Inertial Confinement Fusion",
-   "driveClassification": "Fusion_Thermal",
-   "thrust_N": 480000,
-   "EV_kps": 17000,
+   "driveClassification": "Antimatter",
+   "requiredProjectName": "Project_AntimatterPulsedPlasmaCoreLantern",
+   "thrust_N": 8000000,
+   "EV_kps": 240,
    "specificPower_kgMW": 0,
-   "efficiency": 1,
+   "efficiency": 0.998,
+   "thrustRating_GW": "960.000",
+   "req power": "961.924",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Inertial_Confinement_Fusion",
+   "requiredPowerPlant": "Antimatter_Plasma_Core",
    "thrustCap": 60,
    "cooling": "Calc",
-   "requiredProjectName": "Project_BoronInertialTorch",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "ReactionProducts",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 0.5,
-      "volatiles": 0.5
+      "water": 0.999968059,
+      "antimatter": 0.000031941
    },
-   "iconResource": "shipbuildericons/ICO_BoronInertialTorch"
+   "iconResource": "shipbuildericons/ICO_AntimatterPulsedPlasmaCoreLantern"
 },
  {
-   "dataName": "BoronInertialTorchx6",
-   "friendlyName": "Boron Inertial Torch x6",
+   "dataName": "AntimatterPulsedPlasmaCoreLanternx6",
+   "friendlyName": "Antimatter Pulsed Plasma Core Lantern x6",
    "thrusters": 6,
-   "notes": "HB Inertial Confinement Fusion",
-   "driveClassification": "Fusion_Thermal",
-   "thrust_N": 576000,
-   "EV_kps": 17000,
+   "driveClassification": "Antimatter",
+   "requiredProjectName": "Project_AntimatterPulsedPlasmaCoreLantern",
+   "thrust_N": 9600000,
+   "EV_kps": 240,
    "specificPower_kgMW": 0,
-   "efficiency": 1,
+   "efficiency": 0.998,
+   "thrustRating_GW": "1,152.000",
+   "req power": "1,154.309",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Inertial_Confinement_Fusion",
+   "requiredPowerPlant": "Antimatter_Plasma_Core",
    "thrustCap": 60,
    "cooling": "Calc",
-   "requiredProjectName": "Project_BoronInertialTorch",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "ReactionProducts",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 0.5,
-      "volatiles": 0.5
+      "water": 0.999968059,
+      "antimatter": 0.000031941
    },
-   "iconResource": "shipbuildericons/ICO_BoronInertialTorch"
+   "iconResource": "shipbuildericons/ICO_AntimatterPulsedPlasmaCoreLantern"
 },
  {
-   "dataName": "ProtiumInertialTorchx1",
-   "friendlyName": "Protium Inertial Torch x1",
+   "dataName": "AntimatterPlasmaCoreTorchx1",
+   "friendlyName": "Antimatter Plasma Core Torch x1",
    "thrusters": 1,
-   "notes": "PP Inertial Confinement Fusion",
-   "driveClassification": "Fusion_Thermal",
-   "thrust_N": 275000,
-   "EV_kps": 10000,
+   "driveClassification": "Antimatter",
+   "requiredProjectName": "Project_AntimatterPlasmaCoreTorch",
+   "thrust_N": 3500000,
+   "EV_kps": 595,
    "specificPower_kgMW": 0,
-   "efficiency": 0.95,
+   "efficiency": 0.998,
+   "thrustRating_GW": "1,041.250",
+   "req power": "1,043.337",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Inertial_Confinement_Fusion",
+   "requiredPowerPlant": "Antimatter_Plasma_Core",
    "thrustCap": 60,
    "cooling": "Calc",
-   "requiredProjectName": "Project_ProtiumInertialTorch",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "ReactionProducts",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.999909,
+      "antimatter": 0.000091
    },
-   "iconResource": "shipbuildericons/ICO_ProtiumInertialTorch"
+   "iconResource": "shipbuildericons/ICO_AntimatterPlasmaCoreTorch"
 },
  {
-   "dataName": "ProtiumInertialTorchx2",
-   "friendlyName": "Protium Inertial Torch x2",
+   "dataName": "AntimatterPlasmaCoreTorchx2",
+   "friendlyName": "Antimatter Plasma Core Torch x2",
    "thrusters": 2,
-   "notes": "PP Inertial Confinement Fusion",
-   "driveClassification": "Fusion_Thermal",
-   "thrust_N": 550000,
-   "EV_kps": 10000,
+   "driveClassification": "Antimatter",
+   "requiredProjectName": "Project_AntimatterPlasmaCoreTorch",
+   "thrust_N": 7000000,
+   "EV_kps": 595,
    "specificPower_kgMW": 0,
-   "efficiency": 0.95,
+   "efficiency": 0.998,
+   "thrustRating_GW": "2,082.500",
+   "req power": "2,086.673",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Inertial_Confinement_Fusion",
+   "requiredPowerPlant": "Antimatter_Plasma_Core",
    "thrustCap": 60,
    "cooling": "Calc",
-   "requiredProjectName": "Project_ProtiumInertialTorch",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "ReactionProducts",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.999909,
+      "antimatter": 0.000091
    },
-   "iconResource": "shipbuildericons/ICO_ProtiumInertialTorch"
+   "iconResource": "shipbuildericons/ICO_AntimatterPlasmaCoreTorch"
 },
  {
-   "dataName": "ProtiumInertialTorchx3",
-   "friendlyName": "Protium Inertial Torch x3",
+   "dataName": "AntimatterPlasmaCoreTorchx3",
+   "friendlyName": "Antimatter Plasma Core Torch x3",
    "thrusters": 3,
-   "notes": "PP Inertial Confinement Fusion",
-   "driveClassification": "Fusion_Thermal",
-   "thrust_N": 825000,
-   "EV_kps": 10000,
+   "driveClassification": "Antimatter",
+   "requiredProjectName": "Project_AntimatterPlasmaCoreTorch",
+   "thrust_N": 10500000,
+   "EV_kps": 595,
    "specificPower_kgMW": 0,
-   "efficiency": 0.95,
+   "efficiency": 0.998,
+   "thrustRating_GW": "3,123.750",
+   "req power": "3,130.010",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Inertial_Confinement_Fusion",
+   "requiredPowerPlant": "Antimatter_Plasma_Core",
    "thrustCap": 60,
    "cooling": "Calc",
-   "requiredProjectName": "Project_ProtiumInertialTorch",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "ReactionProducts",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.999909,
+      "antimatter": 0.000091
    },
-   "iconResource": "shipbuildericons/ICO_ProtiumInertialTorch"
+   "iconResource": "shipbuildericons/ICO_AntimatterPlasmaCoreTorch"
 },
  {
-   "dataName": "ProtiumInertialTorchx4",
-   "friendlyName": "Protium Inertial Torch x4",
+   "dataName": "AntimatterPlasmaCoreTorchx4",
+   "friendlyName": "Antimatter Plasma Core Torch x4",
    "thrusters": 4,
-   "notes": "PP Inertial Confinement Fusion",
-   "driveClassification": "Fusion_Thermal",
-   "thrust_N": 1100000,
-   "EV_kps": 10000,
+   "driveClassification": "Antimatter",
+   "requiredProjectName": "Project_AntimatterPlasmaCoreTorch",
+   "thrust_N": 14000000,
+   "EV_kps": 595,
    "specificPower_kgMW": 0,
-   "efficiency": 0.95,
+   "efficiency": 0.998,
+   "thrustRating_GW": "4,165.000",
+   "req power": "4,173.347",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Inertial_Confinement_Fusion",
+   "requiredPowerPlant": "Antimatter_Plasma_Core",
    "thrustCap": 60,
    "cooling": "Calc",
-   "requiredProjectName": "Project_ProtiumInertialTorch",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "ReactionProducts",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.999909,
+      "antimatter": 0.000091
    },
-   "iconResource": "shipbuildericons/ICO_ProtiumInertialTorch"
+   "iconResource": "shipbuildericons/ICO_AntimatterPlasmaCoreTorch"
 },
  {
-   "dataName": "ProtiumInertialTorchx5",
-   "friendlyName": "Protium Inertial Torch x5",
+   "dataName": "AntimatterPlasmaCoreTorchx5",
+   "friendlyName": "Antimatter Plasma Core Torch x5",
    "thrusters": 5,
-   "notes": "PP Inertial Confinement Fusion",
-   "driveClassification": "Fusion_Thermal",
-   "thrust_N": 1375000,
-   "EV_kps": 10000,
+   "driveClassification": "Antimatter",
+   "requiredProjectName": "Project_AntimatterPlasmaCoreTorch",
+   "thrust_N": 17500000,
+   "EV_kps": 595,
    "specificPower_kgMW": 0,
-   "efficiency": 0.95,
+   "efficiency": 0.998,
+   "thrustRating_GW": "5,206.250",
+   "req power": "5,216.683",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Inertial_Confinement_Fusion",
+   "requiredPowerPlant": "Antimatter_Plasma_Core",
    "thrustCap": 60,
    "cooling": "Calc",
-   "requiredProjectName": "Project_ProtiumInertialTorch",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "ReactionProducts",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.999909,
+      "antimatter": 0.000091
    },
-   "iconResource": "shipbuildericons/ICO_ProtiumInertialTorch"
+   "iconResource": "shipbuildericons/ICO_AntimatterPlasmaCoreTorch"
 },
  {
-   "dataName": "ProtiumInertialTorchx6",
-   "friendlyName": "Protium Inertial Torch x6",
+   "dataName": "AntimatterPlasmaCoreTorchx6",
+   "friendlyName": "Antimatter Plasma Core Torch x6",
    "thrusters": 6,
-   "notes": "PP Inertial Confinement Fusion",
-   "driveClassification": "Fusion_Thermal",
-   "thrust_N": 1650000,
-   "EV_kps": 10000,
+   "driveClassification": "Antimatter",
+   "requiredProjectName": "Project_AntimatterPlasmaCoreTorch",
+   "thrust_N": 21000000,
+   "EV_kps": 595,
    "specificPower_kgMW": 0,
-   "efficiency": 0.95,
+   "efficiency": 0.998,
+   "thrustRating_GW": "6,247.500",
+   "req power": "6,260.020",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Inertial_Confinement_Fusion",
+   "requiredPowerPlant": "Antimatter_Plasma_Core",
    "thrustCap": 60,
    "cooling": "Calc",
-   "requiredProjectName": "Project_ProtiumInertialTorch",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "ReactionProducts",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.999909,
+      "antimatter": 0.000091
    },
-   "iconResource": "shipbuildericons/ICO_ProtiumInertialTorch"
+   "iconResource": "shipbuildericons/ICO_AntimatterPlasmaCoreTorch"
 },
  {
-   "dataName": "ProtiumConverterTorchx1",
-   "friendlyName": "Protium Converter Torch x1",
+   "dataName": "AdvancedAntimatterPlasmaCoreTorchx1",
+   "friendlyName": "Advanced Antimatter Plasma Core Torch x1",
    "thrusters": 1,
-   "notes": "PP Inertial Confinement Fusion",
-   "driveClassification": "Fusion_Thermal",
-   "thrust_N": 100000000,
-   "EV_kps": 10000,
-   "specificPower_kgMW": 0.02,
-   "efficiency": 0.98,
+   "driveClassification": "Antimatter",
+   "requiredProjectName": "Project_AdvancedAntimatterPlasmaCoreTorch",
+   "thrust_N": 4900000,
+   "EV_kps": 2800,
+   "specificPower_kgMW": 0,
+   "efficiency": 0.998,
+   "thrustRating_GW": "6,860.000",
+   "req power": "6,873.747",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Inertial_Confinement_Fusion",
+   "requiredPowerPlant": "Antimatter_Plasma_Core",
    "thrustCap": 60,
    "cooling": "Calc",
-   "requiredProjectName": "Project_ProtiumConverterTorch",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "ReactionProducts",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.9999,
+      "antimatter": 0.0001
    },
-   "interstellar": true,
-   "iconResource": "shipbuildericons/ICO_ProtiumConverterTorch"
+   "iconResource": "shipbuildericons/ICO_AdvancedAntimatterPlasmaCoreTorch"
 },
  {
-   "dataName": "ProtiumConverterTorchx2",
-   "friendlyName": "Protium Converter Torch x2",
+   "dataName": "AdvancedAntimatterPlasmaCoreTorchx2",
+   "friendlyName": "Advanced Antimatter Plasma Core Torch x2",
    "thrusters": 2,
-   "notes": "PP Inertial Confinement Fusion",
-   "driveClassification": "Fusion_Thermal",
-   "thrust_N": 200000000,
-   "EV_kps": 10000,
-   "specificPower_kgMW": 0.02,
-   "efficiency": 0.98,
+   "driveClassification": "Antimatter",
+   "requiredProjectName": "Project_AdvancedAntimatterPlasmaCoreTorch",
+   "thrust_N": 9800000,
+   "EV_kps": 2800,
+   "specificPower_kgMW": 0,
+   "efficiency": 0.998,
+   "thrustRating_GW": "13,720.000",
+   "req power": "13,747.495",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Inertial_Confinement_Fusion",
+   "requiredPowerPlant": "Antimatter_Plasma_Core",
    "thrustCap": 60,
    "cooling": "Calc",
-   "requiredProjectName": "Project_ProtiumConverterTorch",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "ReactionProducts",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.9999,
+      "antimatter": 0.0001
    },
-   "interstellar": true,
-   "iconResource": "shipbuildericons/ICO_ProtiumConverterTorch"
+   "iconResource": "shipbuildericons/ICO_AdvancedAntimatterPlasmaCoreTorch"
 },
  {
-   "dataName": "ProtiumConverterTorchx3",
-   "friendlyName": "Protium Converter Torch x3",
+   "dataName": "AdvancedAntimatterPlasmaCoreTorchx3",
+   "friendlyName": "Advanced Antimatter Plasma Core Torch x3",
    "thrusters": 3,
-   "notes": "PP Inertial Confinement Fusion",
-   "driveClassification": "Fusion_Thermal",
-   "thrust_N": 300000000,
-   "EV_kps": 10000,
-   "specificPower_kgMW": 0.02,
-   "efficiency": 0.98,
+   "driveClassification": "Antimatter",
+   "requiredProjectName": "Project_AdvancedAntimatterPlasmaCoreTorch",
+   "thrust_N": 14700000,
+   "EV_kps": 2800,
+   "specificPower_kgMW": 0,
+   "efficiency": 0.998,
+   "thrustRating_GW": "20,580.000",
+   "req power": "20,621.242",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Inertial_Confinement_Fusion",
+   "requiredPowerPlant": "Antimatter_Plasma_Core",
    "thrustCap": 60,
    "cooling": "Calc",
-   "requiredProjectName": "Project_ProtiumConverterTorch",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "ReactionProducts",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.9999,
+      "antimatter": 0.0001
    },
-   "interstellar": true,
-   "iconResource": "shipbuildericons/ICO_ProtiumConverterTorch"
+   "iconResource": "shipbuildericons/ICO_AdvancedAntimatterPlasmaCoreTorch"
 },
  {
-   "dataName": "ProtiumConverterTorchx4",
-   "friendlyName": "Protium Converter Torch x4",
+   "dataName": "AdvancedAntimatterPlasmaCoreTorchx4",
+   "friendlyName": "Advanced Antimatter Plasma Core Torch x4",
    "thrusters": 4,
-   "notes": "PP Inertial Confinement Fusion",
-   "driveClassification": "Fusion_Thermal",
-   "thrust_N": 400000000,
-   "EV_kps": 10000,
-   "specificPower_kgMW": 0.02,
-   "efficiency": 0.98,
+   "driveClassification": "Antimatter",
+   "requiredProjectName": "Project_AdvancedAntimatterPlasmaCoreTorch",
+   "thrust_N": 19600000,
+   "EV_kps": 2800,
+   "specificPower_kgMW": 0,
+   "efficiency": 0.998,
+   "thrustRating_GW": "27,440.000",
+   "req power": "27,494.990",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Inertial_Confinement_Fusion",
+   "requiredPowerPlant": "Antimatter_Plasma_Core",
    "thrustCap": 60,
    "cooling": "Calc",
-   "requiredProjectName": "Project_ProtiumConverterTorch",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "ReactionProducts",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.9999,
+      "antimatter": 0.0001
    },
-   "interstellar": true,
-   "iconResource": "shipbuildericons/ICO_ProtiumConverterTorch"
+   "iconResource": "shipbuildericons/ICO_AdvancedAntimatterPlasmaCoreTorch"
 },
  {
-   "dataName": "ProtiumConverterTorchx5",
-   "friendlyName": "Protium Converter Torch x5",
+   "dataName": "AdvancedAntimatterPlasmaCoreTorchx5",
+   "friendlyName": "Advanced Antimatter Plasma Core Torch x5",
    "thrusters": 5,
-   "notes": "PP Inertial Confinement Fusion",
-   "driveClassification": "Fusion_Thermal",
-   "thrust_N": 500000000,
-   "EV_kps": 10000,
-   "specificPower_kgMW": 0.02,
-   "efficiency": 0.98,
+   "driveClassification": "Antimatter",
+   "requiredProjectName": "Project_AdvancedAntimatterPlasmaCoreTorch",
+   "thrust_N": 24500000,
+   "EV_kps": 2800,
+   "specificPower_kgMW": 0,
+   "efficiency": 0.998,
+   "thrustRating_GW": "34,300.000",
+   "req power": "34,368.737",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Inertial_Confinement_Fusion",
+   "requiredPowerPlant": "Antimatter_Plasma_Core",
    "thrustCap": 60,
    "cooling": "Calc",
-   "requiredProjectName": "Project_ProtiumConverterTorch",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "ReactionProducts",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.9999,
+      "antimatter": 0.0001
    },
-   "interstellar": true,
-   "iconResource": "shipbuildericons/ICO_ProtiumConverterTorch"
+   "iconResource": "shipbuildericons/ICO_AdvancedAntimatterPlasmaCoreTorch"
 },
  {
-   "dataName": "ProtiumConverterTorchx6",
-   "friendlyName": "Protium Converter Torch x6",
+   "dataName": "AdvancedAntimatterPlasmaCoreTorchx6",
+   "friendlyName": "Advanced Antimatter Plasma Core Torch x6",
    "thrusters": 6,
-   "notes": "PP Inertial Confinement Fusion",
-   "driveClassification": "Fusion_Thermal",
-   "thrust_N": 600000000,
-   "EV_kps": 10000,
-   "specificPower_kgMW": 0.02,
-   "efficiency": 0.98,
+   "driveClassification": "Antimatter",
+   "requiredProjectName": "Project_AdvancedAntimatterPlasmaCoreTorch",
+   "thrust_N": 29400000,
+   "EV_kps": 2800,
+   "specificPower_kgMW": 0,
+   "efficiency": 0.998,
+   "thrustRating_GW": "41,160.000",
+   "req power": "41,242.485",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Inertial_Confinement_Fusion",
+   "requiredPowerPlant": "Antimatter_Plasma_Core",
    "thrustCap": 60,
    "cooling": "Calc",
-   "requiredProjectName": "Project_ProtiumConverterTorch",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "ReactionProducts",
+   "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 1
+      "water": 0.9999,
+      "antimatter": 0.0001
    },
-   "interstellar": true,
-   "iconResource": "shipbuildericons/ICO_ProtiumConverterTorch"
+   "iconResource": "shipbuildericons/ICO_AdvancedAntimatterPlasmaCoreTorch"
 },
  {
-   "dataName": "AntimatterPulsedPlasmaCoreDrivex1",
-   "friendlyName": "Antimatter Pulsed Plasma Core Drive x1",
+   "dataName": "PionTorchx1",
+   "friendlyName": "Pion Torch x1",
    "thrusters": 1,
    "driveClassification": "Antimatter",
-   "thrust_N": 1600000,
-   "EV_kps": 240,
+   "requiredProjectName": "Project_AntimatterBeamCoreTorch",
+   "thrust_N": 10000000,
+   "EV_kps": 14720,
    "specificPower_kgMW": 0,
    "efficiency": 0.998,
+   "thrustRating_GW": "73,600.000",
+   "req power": "73,747.495",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Antimatter_Plasma_Core",
+   "requiredPowerPlant": "Antimatter_Beam_Core",
    "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_AntimatterPulsedPlasmaCoreDrive",
+   "cooling": "Open",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Hydrogen",
+   "propellant": "ReactionProducts",
    "perTankPropellantMaterials": {
-      "water": 0.999968059,
-      "antimatter": 0.000031941
+      "water": 0.5,
+      "antimatter": 0.5
    },
-   "iconResource": "shipbuildericons/ICO_AntimatterPulsedPlasmaCoreDrive"
+   "iconResource": "shipbuildericons/ICO_PionTorch"
 },
  {
-   "dataName": "AntimatterPulsedPlasmaCoreDrivex2",
-   "friendlyName": "Antimatter Pulsed Plasma Core Drive x2",
+   "dataName": "PionTorchx2",
+   "friendlyName": "Pion Torch x2",
    "thrusters": 2,
    "driveClassification": "Antimatter",
-   "thrust_N": 3200000,
-   "EV_kps": 240,
+   "requiredProjectName": "Project_AntimatterBeamCoreTorch",
+   "thrust_N": 20000000,
+   "EV_kps": 14720,
    "specificPower_kgMW": 0,
    "efficiency": 0.998,
+   "thrustRating_GW": "147,200.000",
+   "req power": "147,494.990",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Antimatter_Plasma_Core",
+   "requiredPowerPlant": "Antimatter_Beam_Core",
    "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_AntimatterPulsedPlasmaCoreDrive",
+   "cooling": "Open",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Hydrogen",
+   "propellant": "ReactionProducts",
    "perTankPropellantMaterials": {
-      "water": 0.999968059,
-      "antimatter": 0.000031941
+      "water": 0.5,
+      "antimatter": 0.5
    },
-   "iconResource": "shipbuildericons/ICO_AntimatterPulsedPlasmaCoreDrive"
+   "iconResource": "shipbuildericons/ICO_PionTorch"
 },
  {
-   "dataName": "AntimatterPulsedPlasmaCoreDrivex3",
-   "friendlyName": "Antimatter Pulsed Plasma Core Drive x3",
+   "dataName": "PionTorchx3",
+   "friendlyName": "Pion Torch x3",
    "thrusters": 3,
    "driveClassification": "Antimatter",
-   "thrust_N": 4800000,
-   "EV_kps": 240,
+   "requiredProjectName": "Project_AntimatterBeamCoreTorch",
+   "thrust_N": 30000000,
+   "EV_kps": 14720,
    "specificPower_kgMW": 0,
    "efficiency": 0.998,
+   "thrustRating_GW": "220,800.000",
+   "req power": "221,242.485",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Antimatter_Plasma_Core",
+   "requiredPowerPlant": "Antimatter_Beam_Core",
    "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_AntimatterPulsedPlasmaCoreDrive",
+   "cooling": "Open",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Hydrogen",
+   "propellant": "ReactionProducts",
    "perTankPropellantMaterials": {
-      "water": 0.999968059,
-      "antimatter": 0.000031941
+      "water": 0.5,
+      "antimatter": 0.5
    },
-   "iconResource": "shipbuildericons/ICO_AntimatterPulsedPlasmaCoreDrive"
+   "iconResource": "shipbuildericons/ICO_PionTorch"
 },
  {
-   "dataName": "AntimatterPulsedPlasmaCoreDrivex4",
-   "friendlyName": "Antimatter Pulsed Plasma Core Drive x4",
+   "dataName": "PionTorchx4",
+   "friendlyName": "Pion Torch x4",
    "thrusters": 4,
    "driveClassification": "Antimatter",
-   "thrust_N": 6400000,
-   "EV_kps": 240,
+   "requiredProjectName": "Project_AntimatterBeamCoreTorch",
+   "thrust_N": 40000000,
+   "EV_kps": 14720,
    "specificPower_kgMW": 0,
    "efficiency": 0.998,
+   "thrustRating_GW": "294,400.000",
+   "req power": "294,989.980",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Antimatter_Plasma_Core",
+   "requiredPowerPlant": "Antimatter_Beam_Core",
    "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_AntimatterPulsedPlasmaCoreDrive",
+   "cooling": "Open",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Hydrogen",
+   "propellant": "ReactionProducts",
    "perTankPropellantMaterials": {
-      "water": 0.999968059,
-      "antimatter": 0.000031941
+      "water": 0.5,
+      "antimatter": 0.5
    },
-   "iconResource": "shipbuildericons/ICO_AntimatterPulsedPlasmaCoreDrive"
+   "iconResource": "shipbuildericons/ICO_PionTorch"
 },
  {
-   "dataName": "AntimatterPulsedPlasmaCoreDrivex5",
-   "friendlyName": "Antimatter Pulsed Plasma Core Drive x5",
+   "dataName": "PionTorchx5",
+   "friendlyName": "Pion Torch x5",
    "thrusters": 5,
    "driveClassification": "Antimatter",
-   "thrust_N": 8000000,
-   "EV_kps": 240,
+   "requiredProjectName": "Project_AntimatterBeamCoreTorch",
+   "thrust_N": 50000000,
+   "EV_kps": 14720,
    "specificPower_kgMW": 0,
    "efficiency": 0.998,
+   "thrustRating_GW": "368,000.000",
+   "req power": "368,737.475",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Antimatter_Plasma_Core",
+   "requiredPowerPlant": "Antimatter_Beam_Core",
    "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_AntimatterPulsedPlasmaCoreDrive",
+   "cooling": "Open",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Hydrogen",
+   "propellant": "ReactionProducts",
    "perTankPropellantMaterials": {
-      "water": 0.999968059,
-      "antimatter": 0.000031941
+      "water": 0.5,
+      "antimatter": 0.5
    },
-   "iconResource": "shipbuildericons/ICO_AntimatterPulsedPlasmaCoreDrive"
+   "iconResource": "shipbuildericons/ICO_PionTorch"
 },
  {
-   "dataName": "AntimatterPulsedPlasmaCoreDrivex6",
-   "friendlyName": "Antimatter Pulsed Plasma Core Drive x6",
+   "dataName": "PionTorchx6",
+   "friendlyName": "Pion Torch x6",
    "thrusters": 6,
    "driveClassification": "Antimatter",
-   "thrust_N": 9600000,
-   "EV_kps": 240,
+   "requiredProjectName": "Project_AntimatterBeamCoreTorch",
+   "thrust_N": 60000000,
+   "EV_kps": 14720,
    "specificPower_kgMW": 0,
    "efficiency": 0.998,
+   "thrustRating_GW": "441,600.000",
+   "req power": "442,484.970",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Antimatter_Plasma_Core",
+   "requiredPowerPlant": "Antimatter_Beam_Core",
    "thrustCap": 60,
-   "cooling": "Calc",
-   "requiredProjectName": "Project_AntimatterPulsedPlasmaCoreDrive",
+   "cooling": "Open",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "Hydrogen",
+   "propellant": "ReactionProducts",
    "perTankPropellantMaterials": {
-      "water": 0.999968059,
-      "antimatter": 0.000031941
+      "water": 0.5,
+      "antimatter": 0.5
    },
-   "iconResource": "shipbuildericons/ICO_AntimatterPulsedPlasmaCoreDrive"
+   "iconResource": "shipbuildericons/ICO_PionTorch"
 },
  {
-   "dataName": "AntimatterPlasmaCoreDrivex1",
-   "friendlyName": "Antimatter Plasma Core Drive x1",
+   "dataName": "Resistojetx1",
+   "friendlyName": "Resistojet x1",
    "thrusters": 1,
-   "driveClassification": "Antimatter",
-   "thrust_N": 3500000,
-   "EV_kps": 595,
+   "disable": true,
+   "driveClassification": "Electrothermal",
+   "requiredProjectName": "Project_Resistojet",
+   "thrust_N": 1000,
+   "EV_kps": 2.9,
    "specificPower_kgMW": 0,
-   "efficiency": 0.998,
+   "efficiency": 0.8,
+   "thrustRating_GW": "0.001",
+   "req power": "0.002",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Antimatter_Plasma_Core",
-   "thrustCap": 60,
+   "requiredPowerPlant": "Any_General",
+   "thrustCap": 1,
    "cooling": "Calc",
-   "requiredProjectName": "Project_AntimatterPlasmaCoreDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
    "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 0.999909,
-      "antimatter": 0.000091
+      "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_AntimatterPlasmaCoreDrive"
+   "iconResource": "shipbuildericons/ICO_Resistojet"
 },
  {
-   "dataName": "AntimatterPlasmaCoreDrivex2",
-   "friendlyName": "Antimatter Plasma Core Drive x2",
+   "dataName": "Resistojetx2",
+   "friendlyName": "Resistojet x2",
    "thrusters": 2,
-   "driveClassification": "Antimatter",
-   "thrust_N": 7000000,
-   "EV_kps": 595,
+   "disable": true,
+   "driveClassification": "Electrothermal",
+   "requiredProjectName": "Project_Resistojet",
+   "thrust_N": 2000,
+   "EV_kps": 2.9,
    "specificPower_kgMW": 0,
-   "efficiency": 0.998,
+   "efficiency": 0.8,
+   "thrustRating_GW": "0.003",
+   "req power": "0.004",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Antimatter_Plasma_Core",
-   "thrustCap": 60,
+   "requiredPowerPlant": "Any_General",
+   "thrustCap": 1,
    "cooling": "Calc",
-   "requiredProjectName": "Project_AntimatterPlasmaCoreDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
    "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 0.999909,
-      "antimatter": 0.000091
+      "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_AntimatterPlasmaCoreDrive"
+   "iconResource": "shipbuildericons/ICO_Resistojet"
 },
  {
-   "dataName": "AntimatterPlasmaCoreDrivex3",
-   "friendlyName": "Antimatter Plasma Core Drive x3",
+   "dataName": "Resistojetx3",
+   "friendlyName": "Resistojet x3",
    "thrusters": 3,
-   "driveClassification": "Antimatter",
-   "thrust_N": 10500000,
-   "EV_kps": 595,
+   "disable": true,
+   "driveClassification": "Electrothermal",
+   "requiredProjectName": "Project_Resistojet",
+   "thrust_N": 3000,
+   "EV_kps": 2.9,
    "specificPower_kgMW": 0,
-   "efficiency": 0.998,
+   "efficiency": 0.8,
+   "thrustRating_GW": "0.004",
+   "req power": "0.005",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Antimatter_Plasma_Core",
-   "thrustCap": 60,
+   "requiredPowerPlant": "Any_General",
+   "thrustCap": 1,
    "cooling": "Calc",
-   "requiredProjectName": "Project_AntimatterPlasmaCoreDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
    "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 0.999909,
-      "antimatter": 0.000091
+      "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_AntimatterPlasmaCoreDrive"
+   "iconResource": "shipbuildericons/ICO_Resistojet"
 },
  {
-   "dataName": "AntimatterPlasmaCoreDrivex4",
-   "friendlyName": "Antimatter Plasma Core Drive x4",
+   "dataName": "Resistojetx4",
+   "friendlyName": "Resistojet x4",
    "thrusters": 4,
-   "driveClassification": "Antimatter",
-   "thrust_N": 14000000,
-   "EV_kps": 595,
+   "disable": true,
+   "driveClassification": "Electrothermal",
+   "requiredProjectName": "Project_Resistojet",
+   "thrust_N": 4000,
+   "EV_kps": 2.9,
    "specificPower_kgMW": 0,
-   "efficiency": 0.998,
+   "efficiency": 0.8,
+   "thrustRating_GW": "0.006",
+   "req power": "0.007",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Antimatter_Plasma_Core",
-   "thrustCap": 60,
+   "requiredPowerPlant": "Any_General",
+   "thrustCap": 1,
    "cooling": "Calc",
-   "requiredProjectName": "Project_AntimatterPlasmaCoreDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
    "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 0.999909,
-      "antimatter": 0.000091
+      "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_AntimatterPlasmaCoreDrive"
+   "iconResource": "shipbuildericons/ICO_Resistojet"
 },
  {
-   "dataName": "AntimatterPlasmaCoreDrivex5",
-   "friendlyName": "Antimatter Plasma Core Drive x5",
+   "dataName": "Resistojetx5",
+   "friendlyName": "Resistojet x5",
    "thrusters": 5,
-   "driveClassification": "Antimatter",
-   "thrust_N": 17500000,
-   "EV_kps": 595,
+   "disable": true,
+   "driveClassification": "Electrothermal",
+   "requiredProjectName": "Project_Resistojet",
+   "thrust_N": 5000,
+   "EV_kps": 2.9,
    "specificPower_kgMW": 0,
-   "efficiency": 0.998,
+   "efficiency": 0.8,
+   "thrustRating_GW": "0.007",
+   "req power": "0.009",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Antimatter_Plasma_Core",
-   "thrustCap": 60,
+   "requiredPowerPlant": "Any_General",
+   "thrustCap": 1,
    "cooling": "Calc",
-   "requiredProjectName": "Project_AntimatterPlasmaCoreDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
    "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 0.999909,
-      "antimatter": 0.000091
+      "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_AntimatterPlasmaCoreDrive"
+   "iconResource": "shipbuildericons/ICO_Resistojet"
 },
  {
-   "dataName": "AntimatterPlasmaCoreDrivex6",
-   "friendlyName": "Antimatter Plasma Core Drive x6",
+   "dataName": "Resistojetx6",
+   "friendlyName": "Resistojet x6",
    "thrusters": 6,
-   "driveClassification": "Antimatter",
-   "thrust_N": 21000000,
-   "EV_kps": 595,
+   "disable": true,
+   "driveClassification": "Electrothermal",
+   "requiredProjectName": "Project_Resistojet",
+   "thrust_N": 6000,
+   "EV_kps": 2.9,
    "specificPower_kgMW": 0,
-   "efficiency": 0.998,
+   "efficiency": 0.8,
+   "thrustRating_GW": "0.009",
+   "req power": "0.011",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Antimatter_Plasma_Core",
-   "thrustCap": 60,
+   "requiredPowerPlant": "Any_General",
+   "thrustCap": 1,
    "cooling": "Calc",
-   "requiredProjectName": "Project_AntimatterPlasmaCoreDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
    "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 0.999909,
-      "antimatter": 0.000091
+      "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_AntimatterPlasmaCoreDrive"
+   "iconResource": "shipbuildericons/ICO_Resistojet"
 },
  {
-   "dataName": "AdvancedAntimatterPlasmaCoreDrivex1",
-   "friendlyName": "Advanced Antimatter Plasma Core Drive x1",
+   "dataName": "ArcjetDrivex1",
+   "friendlyName": "Arcjet Drive x1",
    "thrusters": 1,
-   "notes": "600,000,000.00",
-   "driveClassification": "Antimatter",
-   "thrust_N": 4900000,
-   "EV_kps": 2800,
+   "disable": true,
+   "driveClassification": "Electrothermal",
+   "requiredProjectName": "Project_ArcjetDrive",
+   "thrust_N": 1000,
+   "EV_kps": 19.6,
    "specificPower_kgMW": 0,
-   "efficiency": 0.998,
+   "efficiency": 0.52,
+   "thrustRating_GW": "0.010",
+   "req power": "0.019",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Antimatter_Plasma_Core",
-   "thrustCap": 60,
+   "requiredPowerPlant": "Any_General",
+   "thrustCap": 20,
    "cooling": "Calc",
-   "requiredProjectName": "Project_AdvancedAntimatterPlasmaCoreDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
    "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 0.9999,
-      "antimatter": 0.0001
+      "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_AdvancedAntimatterPlasmaCoreDrive"
+   "iconResource": "shipbuildericons/ICO_ArcjetDrive"
 },
  {
-   "dataName": "AdvancedAntimatterPlasmaCoreDrivex2",
-   "friendlyName": "Advanced Antimatter Plasma Core Drive x2",
+   "dataName": "ArcjetDrivex2",
+   "friendlyName": "Arcjet Drive x2",
    "thrusters": 2,
-   "notes": "98,000.00",
-   "driveClassification": "Antimatter",
-   "thrust_N": 9800000,
-   "EV_kps": 2800,
+   "disable": true,
+   "driveClassification": "Electrothermal",
+   "requiredProjectName": "Project_ArcjetDrive",
+   "thrust_N": 2000,
+   "EV_kps": 19.6,
    "specificPower_kgMW": 0,
-   "efficiency": 0.998,
+   "efficiency": 0.52,
+   "thrustRating_GW": "0.020",
+   "req power": "0.038",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Antimatter_Plasma_Core",
-   "thrustCap": 60,
+   "requiredPowerPlant": "Any_General",
+   "thrustCap": 20,
    "cooling": "Calc",
-   "requiredProjectName": "Project_AdvancedAntimatterPlasmaCoreDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
    "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 0.9999,
-      "antimatter": 0.0001
+      "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_AdvancedAntimatterPlasmaCoreDrive"
+   "iconResource": "shipbuildericons/ICO_ArcjetDrive"
 },
  {
-   "dataName": "AdvancedAntimatterPlasmaCoreDrivex3",
-   "friendlyName": "Advanced Antimatter Plasma Core Drive x3",
+   "dataName": "ArcjetDrivex3",
+   "friendlyName": "Arcjet Drive x3",
    "thrusters": 3,
-   "notes": "2.6",
-   "driveClassification": "Antimatter",
-   "thrust_N": 14700000,
-   "EV_kps": 2800,
+   "disable": true,
+   "driveClassification": "Electrothermal",
+   "requiredProjectName": "Project_ArcjetDrive",
+   "thrust_N": 3000,
+   "EV_kps": 19.6,
    "specificPower_kgMW": 0,
-   "efficiency": 0.998,
+   "efficiency": 0.52,
+   "thrustRating_GW": "0.029",
+   "req power": "0.057",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Antimatter_Plasma_Core",
-   "thrustCap": 60,
+   "requiredPowerPlant": "Any_General",
+   "thrustCap": 20,
    "cooling": "Calc",
-   "requiredProjectName": "Project_AdvancedAntimatterPlasmaCoreDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
    "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 0.9999,
-      "antimatter": 0.0001
+      "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_AdvancedAntimatterPlasmaCoreDrive"
+   "iconResource": "shipbuildericons/ICO_ArcjetDrive"
 },
  {
-   "dataName": "AdvancedAntimatterPlasmaCoreDrivex4",
-   "friendlyName": "Advanced Antimatter Plasma Core Drive x4",
+   "dataName": "ArcjetDrivex4",
+   "friendlyName": "Arcjet Drive x4",
    "thrusters": 4,
-   "driveClassification": "Antimatter",
-   "thrust_N": 19600000,
-   "EV_kps": 2800,
+   "disable": true,
+   "driveClassification": "Electrothermal",
+   "requiredProjectName": "Project_ArcjetDrive",
+   "thrust_N": 4000,
+   "EV_kps": 19.6,
    "specificPower_kgMW": 0,
-   "efficiency": 0.998,
+   "efficiency": 0.52,
+   "thrustRating_GW": "0.039",
+   "req power": "0.075",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Antimatter_Plasma_Core",
-   "thrustCap": 60,
+   "requiredPowerPlant": "Any_General",
+   "thrustCap": 20,
    "cooling": "Calc",
-   "requiredProjectName": "Project_AdvancedAntimatterPlasmaCoreDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
    "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 0.9999,
-      "antimatter": 0.0001
+      "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_AdvancedAntimatterPlasmaCoreDrive"
+   "iconResource": "shipbuildericons/ICO_ArcjetDrive"
 },
  {
-   "dataName": "AdvancedAntimatterPlasmaCoreDrivex5",
-   "friendlyName": "Advanced Antimatter Plasma Core Drive x5",
+   "dataName": "ArcjetDrivex5",
+   "friendlyName": "Arcjet Drive x5",
    "thrusters": 5,
-   "driveClassification": "Antimatter",
-   "thrust_N": 24500000,
-   "EV_kps": 2800,
+   "disable": true,
+   "driveClassification": "Electrothermal",
+   "requiredProjectName": "Project_ArcjetDrive",
+   "thrust_N": 5000,
+   "EV_kps": 19.6,
    "specificPower_kgMW": 0,
-   "efficiency": 0.998,
+   "efficiency": 0.52,
+   "thrustRating_GW": "0.049",
+   "req power": "0.094",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Antimatter_Plasma_Core",
-   "thrustCap": 60,
+   "requiredPowerPlant": "Any_General",
+   "thrustCap": 20,
    "cooling": "Calc",
-   "requiredProjectName": "Project_AdvancedAntimatterPlasmaCoreDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
    "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 0.9999,
-      "antimatter": 0.0001
+      "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_AdvancedAntimatterPlasmaCoreDrive"
+   "iconResource": "shipbuildericons/ICO_ArcjetDrive"
 },
  {
-   "dataName": "AdvancedAntimatterPlasmaCoreDrivex6",
-   "friendlyName": "Advanced Antimatter Plasma Core Drive x6",
+   "dataName": "ArcjetDrivex6",
+   "friendlyName": "Arcjet Drive x6",
    "thrusters": 6,
-   "driveClassification": "Antimatter",
-   "thrust_N": 29400000,
-   "EV_kps": 2800,
+   "disable": true,
+   "driveClassification": "Electrothermal",
+   "requiredProjectName": "Project_ArcjetDrive",
+   "thrust_N": 6000,
+   "EV_kps": 19.6,
    "specificPower_kgMW": 0,
-   "efficiency": 0.998,
+   "efficiency": 0.52,
+   "thrustRating_GW": "0.059",
+   "req power": "0.113",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Antimatter_Plasma_Core",
-   "thrustCap": 60,
+   "requiredPowerPlant": "Any_General",
+   "thrustCap": 20,
    "cooling": "Calc",
-   "requiredProjectName": "Project_AdvancedAntimatterPlasmaCoreDrive",
    "weightedBuildMaterials": {
       "metals": 1
    },
    "propellant": "Hydrogen",
    "perTankPropellantMaterials": {
-      "water": 0.9999,
-      "antimatter": 0.0001
+      "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_AdvancedAntimatterPlasmaCoreDrive"
+   "iconResource": "shipbuildericons/ICO_ArcjetDrive"
 },
  {
-   "dataName": "PionTorchx1",
-   "friendlyName": "Pion Torch x1",
+   "dataName": "HallDrivex1",
+   "friendlyName": "Hall Drive x1",
    "thrusters": 1,
-   "driveClassification": "Antimatter",
-   "thrust_N": 10000000,
-   "EV_kps": 14720,
+   "notes": "Hall Effect Thruster",
+   "disable": true,
+   "driveClassification": "Electrostatic",
+   "requiredProjectName": "Project_HallDrive",
+   "thrust_N": 3300,
+   "EV_kps": 19.62,
    "specificPower_kgMW": 0,
-   "efficiency": 0.998,
+   "efficiency": 0.53,
+   "thrustRating_GW": "0.032",
+   "req power": "0.061",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Antimatter_Beam_Core",
-   "thrustCap": 60,
-   "cooling": "Open",
-   "requiredProjectName": "Project_AntimatterBeamCoreTorch",
+   "requiredPowerPlant": "Any_General",
+   "thrustCap": 1,
+   "cooling": "Calc",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "ReactionProducts",
+   "propellant": "Metals",
    "perTankPropellantMaterials": {
-      "water": 0.5,
-      "antimatter": 0.5
+      "metals": 1
    },
-   "interstellar": true,
-   "iconResource": "shipbuildericons/ICO_PionTorch"
+   "iconResource": "shipbuildericons/ICO_HallDrive"
 },
  {
-   "dataName": "PionTorchx2",
-   "friendlyName": "Pion Torch x2",
+   "dataName": "HallDrivex2",
+   "friendlyName": "Hall Drive x2",
    "thrusters": 2,
-   "driveClassification": "Antimatter",
-   "thrust_N": 20000000,
-   "EV_kps": 14720,
+   "disable": true,
+   "driveClassification": "Electrostatic",
+   "requiredProjectName": "Project_HallDrive",
+   "thrust_N": 6600,
+   "EV_kps": 19.62,
    "specificPower_kgMW": 0,
-   "efficiency": 0.998,
+   "efficiency": 0.53,
+   "thrustRating_GW": "0.065",
+   "req power": "0.122",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Antimatter_Beam_Core",
-   "thrustCap": 60,
-   "cooling": "Open",
-   "requiredProjectName": "Project_AntimatterBeamCoreTorch",
+   "requiredPowerPlant": "Any_General",
+   "thrustCap": 1,
+   "cooling": "Calc",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "ReactionProducts",
+   "propellant": "Metals",
    "perTankPropellantMaterials": {
-      "water": 0.5,
-      "antimatter": 0.5
+      "metals": 1
    },
-   "interstellar": true,
-   "iconResource": "shipbuildericons/ICO_PionTorch"
+   "iconResource": "shipbuildericons/ICO_HallDrive"
 },
  {
-   "dataName": "PionTorchx3",
-   "friendlyName": "Pion Torch x3",
+   "dataName": "HallDrivex3",
+   "friendlyName": "Hall Drive x3",
    "thrusters": 3,
-   "driveClassification": "Antimatter",
-   "thrust_N": 30000000,
-   "EV_kps": 14720,
+   "disable": true,
+   "driveClassification": "Electrostatic",
+   "requiredProjectName": "Project_HallDrive",
+   "thrust_N": 9900,
+   "EV_kps": 19.62,
    "specificPower_kgMW": 0,
-   "efficiency": 0.998,
+   "efficiency": 0.53,
+   "thrustRating_GW": "0.097",
+   "req power": "0.183",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Antimatter_Beam_Core",
-   "thrustCap": 60,
-   "cooling": "Open",
-   "requiredProjectName": "Project_AntimatterBeamCoreTorch",
+   "requiredPowerPlant": "Any_General",
+   "thrustCap": 1,
+   "cooling": "Calc",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "ReactionProducts",
+   "propellant": "Metals",
    "perTankPropellantMaterials": {
-      "water": 0.5,
-      "antimatter": 0.5
+      "metals": 1
    },
-   "interstellar": true,
-   "iconResource": "shipbuildericons/ICO_PionTorch"
+   "iconResource": "shipbuildericons/ICO_HallDrive"
 },
  {
-   "dataName": "PionTorchx4",
-   "friendlyName": "Pion Torch x4",
+   "dataName": "HallDrivex4",
+   "friendlyName": "Hall Drive x4",
    "thrusters": 4,
-   "driveClassification": "Antimatter",
-   "thrust_N": 40000000,
-   "EV_kps": 14720,
+   "disable": true,
+   "driveClassification": "Electrostatic",
+   "requiredProjectName": "Project_HallDrive",
+   "thrust_N": 13200,
+   "EV_kps": 19.62,
    "specificPower_kgMW": 0,
-   "efficiency": 0.998,
+   "efficiency": 0.53,
+   "thrustRating_GW": "0.129",
+   "req power": "0.244",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Antimatter_Beam_Core",
-   "thrustCap": 60,
-   "cooling": "Open",
-   "requiredProjectName": "Project_AntimatterBeamCoreTorch",
+   "requiredPowerPlant": "Any_General",
+   "thrustCap": 1,
+   "cooling": "Calc",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "ReactionProducts",
+   "propellant": "Metals",
    "perTankPropellantMaterials": {
-      "water": 0.5,
-      "antimatter": 0.5
+      "metals": 1
    },
-   "interstellar": true,
-   "iconResource": "shipbuildericons/ICO_PionTorch"
+   "iconResource": "shipbuildericons/ICO_HallDrive"
 },
  {
-   "dataName": "PionTorchx5",
-   "friendlyName": "Pion Torch x5",
+   "dataName": "HallDrivex5",
+   "friendlyName": "Hall Drive x5",
    "thrusters": 5,
-   "driveClassification": "Antimatter",
-   "thrust_N": 50000000,
-   "EV_kps": 14720,
+   "disable": true,
+   "driveClassification": "Electrostatic",
+   "requiredProjectName": "Project_HallDrive",
+   "thrust_N": 16500,
+   "EV_kps": 19.62,
    "specificPower_kgMW": 0,
-   "efficiency": 0.998,
+   "efficiency": 0.53,
+   "thrustRating_GW": "0.162",
+   "req power": "0.305",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Antimatter_Beam_Core",
-   "thrustCap": 60,
-   "cooling": "Open",
-   "requiredProjectName": "Project_AntimatterBeamCoreTorch",
+   "requiredPowerPlant": "Any_General",
+   "thrustCap": 1,
+   "cooling": "Calc",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "ReactionProducts",
+   "propellant": "Metals",
    "perTankPropellantMaterials": {
-      "water": 0.5,
-      "antimatter": 0.5
+      "metals": 1
    },
-   "interstellar": true,
-   "iconResource": "shipbuildericons/ICO_PionTorch"
+   "iconResource": "shipbuildericons/ICO_HallDrive"
 },
  {
-   "dataName": "PionTorchx6",
-   "friendlyName": "Pion Torch x6",
+   "dataName": "HallDrivex6",
+   "friendlyName": "Hall Drive x6",
    "thrusters": 6,
-   "driveClassification": "Antimatter",
-   "thrust_N": 60000000,
-   "EV_kps": 14720,
+   "disable": true,
+   "driveClassification": "Electrostatic",
+   "requiredProjectName": "Project_HallDrive",
+   "thrust_N": 19800,
+   "EV_kps": 19.62,
    "specificPower_kgMW": 0,
-   "efficiency": 0.998,
+   "efficiency": 0.53,
+   "thrustRating_GW": "0.194",
+   "req power": "0.366",
    "flatMass_tons": 0,
-   "requiredPowerPlant": "Antimatter_Beam_Core",
-   "thrustCap": 60,
-   "cooling": "Open",
-   "requiredProjectName": "Project_AntimatterBeamCoreTorch",
+   "requiredPowerPlant": "Any_General",
+   "thrustCap": 1,
+   "cooling": "Calc",
    "weightedBuildMaterials": {
       "metals": 1
    },
-   "propellant": "ReactionProducts",
+   "propellant": "Metals",
    "perTankPropellantMaterials": {
-      "water": 0.5,
-      "antimatter": 0.5
+      "metals": 1
    },
-   "interstellar": true,
-   "iconResource": "shipbuildericons/ICO_PionTorch"
+   "iconResource": "shipbuildericons/ICO_HallDrive"
 }
 ]
\ No newline at end of file
diff --git a/app/game/templates/TIEffectTemplate.json b/app/game/templates/TIEffectTemplate.json
index 80d2173..4e195eb 100644
--- a/app/game/templates/TIEffectTemplate.json
+++ b/app/game/templates/TIEffectTemplate.json
@@ -1,769 +1,526 @@
 [
  {
    "dataName": "Effect_DetectAbductions",
-   "instantEffect": "",
    "operation": "Additive",
    "value": 1,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": false,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "DetectAlienActivity",
-      ""
+      "DetectAlienActivity"
    ]
 },
  {
    "dataName": "Effect_DetectEnthralls",
-   "instantEffect": "",
    "operation": "Additive",
    "value": 1,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": false,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "DetectAlienActivity",
-      ""
+      "DetectAlienActivity"
    ]
 },
  {
    "dataName": "Effect_DetectAllOperations",
-   "instantEffect": "",
    "operation": "Additive",
    "value": 1,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": false,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "DetectAlienActivity",
-      ""
+      "DetectAlienActivity"
    ]
 },
  {
    "dataName": "Effect_DetectAlienMovements",
-   "instantEffect": "",
    "operation": "Additive",
    "value": 1,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": false,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "DetectAlienActivity",
-      ""
+      "DetectAlienActivity"
    ]
 },
  {
    "dataName": "Effect_CanCaptureHydra",
-   "instantEffect": "",
    "operation": "SetToFixedValue",
    "value": 1,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": false,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "CanCaptureHydra",
-      ""
+      "CanCaptureHydra"
    ]
 },
  {
    "dataName": "Effect_AlienRelationsEstablished",
-   "instantEffect": "",
    "operation": "SetToFixedValue",
    "value": 1,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": false,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "AlienRelationsEstablished",
-      ""
+      "AlienRelationsEstablished"
    ]
 },
  {
    "dataName": "Effect_CooperateTransferTerritorytoAliens",
-   "instantEffect": "",
    "operation": "SetToFixedValue",
    "value": 1,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": false,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "CanTransferTerritoryToAliens",
-      ""
+      "CanTransferTerritoryToAliens"
    ]
 },
  {
    "dataName": "Effect_AppeaseTransferTerritoryToAliens",
-   "instantEffect": "",
    "operation": "SetToFixedValue",
    "value": 2,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": false,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "CanTransferTerritoryToAliens",
-      ""
+      "CanTransferTerritoryToAliens"
    ]
 },
  {
    "dataName": "Effect_SubmitTransferTerritoryToAliens",
-   "instantEffect": "",
    "operation": "SetToFixedValue",
    "value": 6,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": false,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "CanTransferTerritoryToAliens",
-      ""
+      "CanTransferTerritoryToAliens"
    ]
 },
  {
    "dataName": "Effect_Skywatch",
-   "instantEffect": "",
    "operation": "IncreaseToValue",
    "value": 10,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "AllHumanFactions",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": false,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "DetectAlienSpaceAssetsRange",
-      ""
+      "DetectAlienSpaceAssetsRange"
    ]
 },
  {
    "dataName": "Effect_DeepSkywatch",
-   "instantEffect": "",
    "operation": "IncreaseToValue",
    "value": 60,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "AllHumanFactions",
-   "effectSecondaryTarget": "",
+   "effectDuration": "permanent",
+   "stackable": false,
+   "duration_months": -1,
+   "contexts": [
+      "DetectAlienSpaceAssetsRange"
+   ]
+},
+ {
+   "dataName": "Effect_ExploreVenus",
+   "operation": "DecreaseToValue",
+   "value": 0.65,
+   "effectTarget": "AllHumanFactions",
    "effectDuration": "permanent",
    "stackable": false,
    "duration_months": -1,
    "initialFactionsStr": [
-      "",
-      ""
+      "AlienCouncil"
    ],
    "contexts": [
-      "DetectAlienSpaceAssetsRange",
-      ""
+      "InnerExplorationRange_AU"
    ]
 },
  {
    "dataName": "Effect_ExploreInnerPlanets",
-   "instantEffect": "",
    "operation": "DecreaseToValue",
    "value": 0.1,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "AllHumanFactions",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": false,
    "duration_months": -1,
    "initialFactionsStr": [
-      "AlienCouncil",
-      ""
+      "AlienCouncil"
    ],
    "contexts": [
-      "InnerExplorationRange_AU",
-      ""
+      "InnerExplorationRange_AU"
    ]
 },
  {
    "dataName": "Effect_ExploreLuna",
-   "instantEffect": "",
    "operation": "SetToFixedValue",
    "value": 1,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "AllHumanFactions",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": false,
    "duration_months": -1,
    "initialFactionsStr": [
-      "AlienCouncil",
-      ""
+      "AlienCouncil"
    ],
    "contexts": [
-      "ExploreLuna",
-      ""
+      "ExploreLuna"
    ]
 },
  {
    "dataName": "Effect_ExploreMars",
-   "instantEffect": "",
    "operation": "IncreaseToValue",
    "value": 2,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "AllHumanFactions",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": false,
    "duration_months": -1,
    "initialFactionsStr": [
-      "AlienCouncil",
-      ""
+      "AlienCouncil"
    ],
    "contexts": [
-      "OuterExplorationRange_AU",
-      ""
+      "OuterExplorationRange_AU"
    ]
 },
  {
    "dataName": "Effect_ExploreEarthLagrangePoints",
-   "instantEffect": "",
    "operation": "IncreaseToValue",
    "value": 1,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "AllHumanFactions",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": false,
    "duration_months": -1,
    "initialFactionsStr": [
-      "AlienCouncil",
-      ""
+      "AlienCouncil"
    ],
    "contexts": [
-      "ExploreEarthLagrangePoints",
-      ""
+      "ExploreEarthLagrangePoints"
    ]
 },
  {
    "dataName": "Effect_ExploreAsteroids",
-   "instantEffect": "",
    "operation": "IncreaseToValue",
    "value": 4.5,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "AllHumanFactions",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": false,
    "duration_months": -1,
    "initialFactionsStr": [
-      "AlienCouncil",
-      ""
+      "AlienCouncil"
    ],
    "contexts": [
-      "OuterExplorationRange_AU",
-      ""
+      "OuterExplorationRange_AU"
    ]
 },
  {
    "dataName": "Effect_ExploreJupiter",
-   "instantEffect": "",
    "operation": "IncreaseToValue",
    "value": 6,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "AllHumanFactions",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": false,
    "duration_months": -1,
    "initialFactionsStr": [
-      "AlienCouncil",
-      ""
+      "AlienCouncil"
    ],
    "contexts": [
-      "OuterExplorationRange_AU",
-      ""
+      "OuterExplorationRange_AU"
    ]
 },
  {
    "dataName": "Effect_ExploreSaturn",
-   "instantEffect": "",
    "operation": "IncreaseToValue",
    "value": 12,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "AllHumanFactions",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": false,
    "duration_months": -1,
    "initialFactionsStr": [
-      "AlienCouncil",
-      ""
+      "AlienCouncil"
    ],
    "contexts": [
-      "OuterExplorationRange_AU",
-      ""
+      "OuterExplorationRange_AU"
    ]
 },
  {
    "dataName": "Effect_ExploreOuterPlanets",
-   "instantEffect": "",
    "operation": "IncreaseToValue",
    "value": 31,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "AllHumanFactions",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": false,
    "duration_months": -1,
    "initialFactionsStr": [
-      "AlienCouncil",
-      ""
+      "AlienCouncil"
    ],
    "contexts": [
-      "OuterExplorationRange_AU",
-      ""
+      "OuterExplorationRange_AU"
    ]
 },
  {
    "dataName": "Effect_ExploreKuiperBelt",
-   "instantEffect": "",
    "operation": "IncreaseToValue",
    "value": 60,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "AllHumanFactions",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": false,
    "duration_months": -1,
    "initialFactionsStr": [
-      "AlienCouncil",
-      ""
+      "AlienCouncil"
    ],
    "contexts": [
-      "OuterExplorationRange_AU",
-      ""
+      "OuterExplorationRange_AU"
    ]
+},
+ {
+   "dataName": "Effect_TechProbeSpeed",
+   "instantEffect": "DummyInstantEffect",
+   "effectTarget": "SourceFaction",
+   "effectDuration": "instant",
+   "duration_months": -1
 },
  {
    "dataName": "Effect_CanFoundTier1Station",
-   "instantEffect": "",
    "operation": "SetToFixedValue",
    "value": 1,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": false,
    "duration_months": -1,
    "initialFactionsStr": [
-      "AlienCouncil",
-      ""
+      "AlienCouncil"
    ],
    "contexts": [
-      "CanFoundTier1Station",
-      ""
+      "CanFoundTier1Station"
    ]
 },
  {
    "dataName": "Effect_CanFoundTier2Station",
-   "instantEffect": "",
    "operation": "SetToFixedValue",
    "value": 1,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": false,
    "duration_months": -1,
    "initialFactionsStr": [
-      "AlienCouncil",
-      ""
+      "AlienCouncil"
    ],
    "contexts": [
-      "CanFoundTier2Station",
-      ""
+      "CanFoundTier2Station"
    ]
 },
  {
    "dataName": "Effect_CanFoundTier3Station",
-   "instantEffect": "",
    "operation": "SetToFixedValue",
    "value": 1,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": false,
    "duration_months": -1,
    "initialFactionsStr": [
-      "AlienCouncil",
-      ""
+      "AlienCouncil"
    ],
    "contexts": [
-      "CanFoundTier3Station",
-      ""
+      "CanFoundTier3Station"
    ]
 },
  {
    "dataName": "Effect_CanFoundTier1Base",
-   "instantEffect": "",
    "operation": "SetToFixedValue",
    "value": 1,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": false,
    "duration_months": -1,
    "initialFactionsStr": [
-      "AlienCouncil",
-      ""
+      "AlienCouncil"
    ],
    "contexts": [
-      "CanFoundTier1Base",
-      ""
+      "CanFoundTier1Base"
    ]
 },
  {
    "dataName": "Effect_CanFoundTier2Base",
-   "instantEffect": "",
    "operation": "SetToFixedValue",
    "value": 1,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": false,
    "duration_months": -1,
    "initialFactionsStr": [
-      "AlienCouncil",
-      ""
+      "AlienCouncil"
    ],
    "contexts": [
-      "CanFoundTier2Base",
-      ""
+      "CanFoundTier2Base"
    ]
 },
  {
    "dataName": "Effect_CanFoundTier3Base",
-   "instantEffect": "",
    "operation": "SetToFixedValue",
    "value": 1,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": false,
    "duration_months": -1,
    "initialFactionsStr": [
-      "AlienCouncil",
-      ""
+      "AlienCouncil"
    ],
    "contexts": [
-      "CanFoundTier3Base",
-      ""
+      "CanFoundTier3Base"
    ]
 },
  {
    "dataName": "Effect_CanFoundAutomatedT1Station",
-   "instantEffect": "",
    "operation": "SetToFixedValue",
    "value": 1,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": false,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "CanFoundAutomatedT1Station",
-      ""
+      "CanFoundAutomatedT1Station"
    ]
 },
  {
    "dataName": "Effect_CanFoundAutomatedT1Base",
-   "instantEffect": "",
    "operation": "SetToFixedValue",
    "value": 1,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": false,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "CanFoundAutomatedT1Base",
-      ""
+      "CanFoundAutomatedT1Base"
    ]
 },
  {
    "dataName": "Effect_CanAmassAntimatter",
-   "instantEffect": "",
    "operation": "SetToFixedValue",
    "value": 1,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "AllHumanFactions",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": false,
    "duration_months": -1,
    "initialFactionsStr": [
-      "AlienCouncil",
-      ""
+      "AlienCouncil"
    ],
    "contexts": [
-      "CanAmassAntimatter",
-      ""
+      "CanAmassAntimatter"
    ]
 },
  {
    "dataName": "Effect_CanAmassExotics",
-   "instantEffect": "",
    "operation": "SetToFixedValue",
    "value": 1,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": false,
    "duration_months": -1,
    "initialFactionsStr": [
-      "AlienCouncil",
-      ""
+      "AlienCouncil"
    ],
    "contexts": [
-      "CanAmassExotics",
-      ""
+      "CanAmassExotics"
    ]
 },
  {
    "dataName": "Effect_GlobalListeningNetwork",
-   "instantEffect": "",
    "operation": "Additive",
    "value": 1,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": false,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "DetectAliensOnEarth",
-      ""
+      "DetectAliensOnEarth"
    ]
 },
  {
    "dataName": "Effect_SpaceTugs",
-   "instantEffect": "",
    "operation": "Multiplicative",
    "value": 0.9,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": false,
    "duration_months": -1,
    "initialFactionsStr": [
-      "AlienCouncil",
-      ""
+      "AlienCouncil"
    ],
    "contexts": [
-      "GenericModuleTransferTime",
-      ""
+      "GenericModuleTransferTime"
    ]
 },
  {
    "dataName": "Effect_SolarSteamers",
-   "instantEffect": "",
    "operation": "Multiplicative",
    "value": 0.75,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": false,
    "duration_months": -1,
    "initialFactionsStr": [
-      "AlienCouncil",
-      ""
+      "AlienCouncil"
    ],
    "contexts": [
-      "GenericTransfer_OffDate_PCT",
-      ""
+      "GenericTransfer_OffDate_PCT"
    ]
 },
  {
    "dataName": "Effect_NuclearFreighters",
-   "instantEffect": "",
    "operation": "Multiplicative",
    "value": 0.85,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": false,
    "duration_months": -1,
    "initialFactionsStr": [
-      "AlienCouncil",
-      ""
+      "AlienCouncil"
    ],
    "contexts": [
-      "GenericModuleTransferTime",
-      ""
+      "GenericModuleTransferTime"
    ]
 },
  {
    "dataName": "Effect_FusionFreighters",
-   "instantEffect": "",
    "operation": "Multiplicative",
    "value": 0.6,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": false,
    "duration_months": -1,
    "initialFactionsStr": [
-      "AlienCouncil",
-      ""
+      "AlienCouncil"
    ],
    "contexts": [
-      "GenericModuleTransferTime",
-      ""
+      "GenericModuleTransferTime"
    ]
 },
  {
    "dataName": "Effect_FastProbes",
-   "instantEffect": "",
    "operation": "Multiplicative",
    "value": 0.5,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": false,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "ProbeTransferTime",
-      ""
+      "ProbeTransferTime"
    ]
 },
  {
    "dataName": "Effect_IncreaseCouncilSize",
-   "instantEffect": "",
    "operation": "Additive",
    "value": 1,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
@@ -772,82 +529,50 @@
       "AlienCouncil"
    ],
    "contexts": [
-      "CouncilSize",
-      ""
+      "CouncilSize"
    ]
 },
  {
    "dataName": "Effect_SpaceMarketEfficiency1",
-   "instantEffect": "",
    "operation": "Additive",
    "value": 1,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "ResourceMarketSales",
-      ""
+      "ResourceMarketSales"
    ]
 },
  {
    "dataName": "Effect_SpaceMarketEfficiency2",
-   "instantEffect": "",
    "operation": "Additive",
    "value": 2,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "ResourceMarketSales",
-      ""
+      "ResourceMarketSales"
    ]
 },
  {
    "dataName": "Effect_AdvancedAircraft",
-   "instantEffect": "",
    "operation": "SetToFixedValue",
    "value": 1,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "AllFactions",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": false,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "AdvancedAircraft",
-      ""
+      "AdvancedAircraft"
    ]
 },
  {
    "dataName": "Effect_IncreaseMaxAvailableOrgs5",
-   "instantEffect": "",
    "operation": "Additive",
    "value": 5,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
@@ -856,4145 +581,1874 @@
       "AlienCouncil"
    ],
    "contexts": [
-      "MaxAvailableOrgs",
-      ""
+      "MaxAvailableOrgs"
    ]
 },
  {
    "dataName": "Effect_IncreaseMaxArmyTechLevel",
    "instantEffect": "NationMaxMiltechChange",
-   "operation": "",
    "value": 0.5,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "AllNations",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
+   "duration_months": -1
+},
+ {
+   "dataName": "Effect_AllowSpaceDefensesConstruction",
+   "instantEffect": "NationSetCanBuildSpaceDefenses",
+   "effectTarget": "AllNations",
+   "effectDuration": "instant",
    "duration_months": -1,
    "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
+      "AlienCouncil"
    ]
 },
  {
-   "dataName": "Effect_AllowSpaceDefensesConstruction",
-   "instantEffect": "NationSetCanBuildSpaceDefenses",
-   "operation": "",
-   "value": null,
-   "instantRnd": null,
-   "strValue": "",
+   "dataName": "Effect_AllowBuildSTOFighters",
+   "instantEffect": "NationSetCanBuildSTOFighters",
    "effectTarget": "AllNations",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
    "duration_months": -1,
    "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
+      "AlienCouncil"
    ]
 },
  {
-   "dataName": "Effect_SpaceScan",
-   "instantEffect": "SpaceScan",
-   "operation": "",
-   "value": null,
-   "instantRnd": null,
-   "strValue": "",
-   "effectTarget": "AllHumanFactions",
-   "effectSecondaryTarget": "",
+   "dataName": "Effect_AllowDecontaminateRegion",
+   "instantEffect": "NationSetCanDecontaminateRegion",
+   "effectTarget": "AllNations",
    "effectDuration": "instant",
-   "stackable": null,
    "duration_months": -1,
    "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
+      "AlienCouncil"
    ]
+},
+ {
+   "dataName": "Effect_SpaceScan",
+   "instantEffect": "SpaceScan",
+   "effectTarget": "AllHumanFactions",
+   "effectDuration": "instant",
+   "duration_months": -1
 },
  {
    "dataName": "Effect_MajorGlobalPropaganda",
    "instantEffect": "Propaganda",
-   "operation": "",
    "value": 15,
    "instantRnd": 0.1,
-   "strValue": "",
    "effectTarget": "AllExtantNations",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_GlobalPropaganda",
    "instantEffect": "Propaganda",
-   "operation": "",
    "value": 10,
    "instantRnd": 0.1,
-   "strValue": "",
    "effectTarget": "AllExtantNations",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_GlobalPropagandaForSecondary10",
    "instantEffect": "Propaganda",
-   "operation": "",
    "value": 10,
    "instantRnd": 0.1,
-   "strValue": "",
    "effectTarget": "AllExtantNations",
    "effectSecondaryTarget": "InputState",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_MinorGlobalPropaganda",
    "instantEffect": "Propaganda",
-   "operation": "",
    "value": 5,
    "instantRnd": 0.05,
-   "strValue": "",
    "effectTarget": "AllExtantNations",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_NegativeGlobalPropaganda5",
    "instantEffect": "Propaganda",
-   "operation": "",
    "value": -5,
    "instantRnd": 0.05,
-   "strValue": "",
    "effectTarget": "AllExtantNations",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_NegativeGlobalPropaganda10",
    "instantEffect": "Propaganda",
-   "operation": "",
    "value": -10,
    "instantRnd": 0.05,
-   "strValue": "",
    "effectTarget": "AllExtantNations",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_NegativeGlobalPropaganda25",
    "instantEffect": "Propaganda",
-   "operation": "",
    "value": -25,
    "instantRnd": 0.1,
-   "strValue": "",
    "effectTarget": "AllExtantNations",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_NegativeGlobalPropaganda_Secondary50",
    "instantEffect": "Propaganda",
-   "operation": "",
    "value": -50,
    "instantRnd": 0.1,
-   "strValue": "",
    "effectTarget": "AllExtantNations",
    "effectSecondaryTarget": "InputState",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_NegativeGlobalPropaganda_Secondary75",
    "instantEffect": "Propaganda",
-   "operation": "",
    "value": -75,
    "instantRnd": 0,
-   "strValue": "",
    "effectTarget": "AllExtantNations",
    "effectSecondaryTarget": "InputState",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_NationPropaganda",
    "instantEffect": "Propaganda",
-   "operation": "",
    "value": 10,
    "instantRnd": 0.1,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_MajorNationPropaganda",
    "instantEffect": "Propaganda",
-   "operation": "",
    "value": 25,
    "instantRnd": 1,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_NegativeNationPropaganda",
    "instantEffect": "Propaganda",
-   "operation": "",
    "value": -10,
    "instantRnd": 0.1,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_NegativeNationPropaganda25",
    "instantEffect": "Propaganda",
-   "operation": "",
    "value": -25,
    "instantRnd": 1,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_NegativeNationPropaganda5_PerCP",
    "instantEffect": "Propaganda_PerOwnedCP",
-   "operation": "",
    "value": -5,
    "instantRnd": 0.05,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_NegativeNationPropaganda10_PerCP",
    "instantEffect": "Propaganda_PerOwnedCP",
-   "operation": "",
    "value": -10,
    "instantRnd": 0.1,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_MinusculeSingleRegionDamage",
    "instantEffect": "DamageRegions",
-   "operation": "",
    "value": 0.01,
    "instantRnd": 0.05,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_MinorSingleRegionDamage",
    "instantEffect": "DamageRegions",
-   "operation": "",
    "value": 0.05,
    "instantRnd": 0.05,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_MajorSingleRegionDamage",
    "instantEffect": "DamageRegions",
-   "operation": "",
    "value": 0.1,
    "instantRnd": 0.1,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_MassiveSingleRegionDamage",
    "instantEffect": "DamageRegions",
-   "operation": "",
    "value": 0.25,
    "instantRnd": 0.25,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_TotalSingleRegionDamage",
    "instantEffect": "DamageRegions",
-   "operation": "",
    "value": 0.75,
    "instantRnd": 0.1,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_SecondaryMinusculeSingleRegionDamage",
    "instantEffect": "DamageRegions",
-   "operation": "",
    "value": 0.01,
    "instantRnd": 0.05,
-   "strValue": "",
    "effectTarget": "InputState",
    "effectSecondaryTarget": "InputState",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_SecondaryMinorSingleRegionDamage",
    "instantEffect": "DamageRegions",
-   "operation": "",
    "value": 0.05,
    "instantRnd": 0.05,
-   "strValue": "",
    "effectTarget": "InputState",
    "effectSecondaryTarget": "InputState",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_SecondaryMajorSingleRegionDamage",
    "instantEffect": "DamageRegions",
-   "operation": "",
    "value": 0.1,
    "instantRnd": 0.1,
-   "strValue": "",
    "effectTarget": "InputState",
    "effectSecondaryTarget": "InputState",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_SecondaryMassiveSingleRegionDamage",
    "instantEffect": "DamageRegions",
-   "operation": "",
    "value": 0.25,
    "instantRnd": 0.25,
-   "strValue": "",
    "effectTarget": "InputState",
    "effectSecondaryTarget": "InputState",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_MajorRegionBoostDamage",
    "instantEffect": "DamageRegionBoost",
-   "operation": "",
    "value": 0.35,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_MinorRegionBoostDamage",
    "instantEffect": "DamageRegionBoost",
-   "operation": "",
    "value": 0.1,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_NuclearDetonation025",
    "instantEffect": "DamageRegions_Nuclear",
-   "operation": "",
    "value": 0.25,
    "instantRnd": 0.1,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_NuclearDetonation05",
    "instantEffect": "DamageRegions_Nuclear",
-   "operation": "",
    "value": 0.5,
    "instantRnd": 0.1,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_SecondaryNuclearDetonation025",
    "instantEffect": "DamageRegions_Nuclear",
-   "operation": "",
    "value": 0.25,
    "instantRnd": 0.1,
-   "strValue": "",
    "effectTarget": "InputState",
    "effectSecondaryTarget": "InputState",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_SecondaryNuclearDetonation05",
    "instantEffect": "DamageRegions_Nuclear",
-   "operation": "",
    "value": 0.5,
    "instantRnd": 0.1,
-   "strValue": "",
    "effectTarget": "InputState",
    "effectSecondaryTarget": "InputState",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_LocalProsperity",
    "instantEffect": "NationProsperity",
-   "operation": "",
    "value": 10,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_MajorLocalProsperity",
    "instantEffect": "NationProsperity",
-   "operation": "",
    "value": 20,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_LocalProsperity50",
    "instantEffect": "NationProsperity",
-   "operation": "",
    "value": 50,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_LocalProsperity200",
    "instantEffect": "NationProsperity",
-   "operation": "",
    "value": 200,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_SecondaryProsperity1",
    "instantEffect": "NationProsperity",
-   "operation": "",
    "value": 1,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
    "effectSecondaryTarget": "InputState",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_SecondaryProsperity2",
    "instantEffect": "NationProsperity",
-   "operation": "",
    "value": 2,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
    "effectSecondaryTarget": "InputState",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_SecondaryProsperity3",
    "instantEffect": "NationProsperity",
-   "operation": "",
    "value": 3,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
    "effectSecondaryTarget": "InputState",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_LocalRecession",
    "instantEffect": "NationRecession",
-   "operation": "",
    "value": 10,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_MajorLocalRecession",
    "instantEffect": "NationRecession",
-   "operation": "",
    "value": 20,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_LocalRecession50",
    "instantEffect": "NationRecession",
-   "operation": "",
    "value": 50,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_FreePriorityWelfare10",
    "instantEffect": "FreePriorityWelfare",
-   "operation": "",
    "value": 10,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_FreePriorityWelfare50",
    "instantEffect": "FreePriorityWelfare",
-   "operation": "",
    "value": 50,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_FreePriorityWelfare200",
    "instantEffect": "FreePriorityWelfare",
-   "operation": "",
    "value": 200,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_SecondaryTargetFreePriorityWelfare200",
    "instantEffect": "FreePriorityWelfare",
-   "operation": "",
    "value": 200,
-   "instantRnd": null,
-   "strValue": "",
-   "effectTarget": "",
+   "effectTarget": "InputState",
    "effectSecondaryTarget": "InputState",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_FreePriorityKnowledge10",
    "instantEffect": "FreePriorityKnowledge",
-   "operation": "",
    "value": 10,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_FreePriorityKnowledge20",
    "instantEffect": "FreePriorityKnowledge",
-   "operation": "",
    "value": 20,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_FreePriorityMilitary20",
    "instantEffect": "FreePriorityMilitary",
-   "operation": "",
    "value": 20,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_FreePriorityMilitary200",
    "instantEffect": "FreePriorityMilitary",
-   "operation": "",
    "value": 200,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_SecondaryFreePriorityMilitary20",
    "instantEffect": "FreePriorityMilitary",
-   "operation": "",
    "value": 20,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
    "effectSecondaryTarget": "InputState",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_FreePriorityBoost1",
    "instantEffect": "FreePriorityBoost",
-   "operation": "",
    "value": 1,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_FreePriorityBoost2",
    "instantEffect": "FreePriorityBoost",
-   "operation": "",
    "value": 2,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_FreePriorityFunding1",
    "instantEffect": "FreePriorityFunding",
-   "operation": "",
    "value": 1,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_XenoformingReduction",
    "instantEffect": "XenoformingChange",
-   "operation": "",
    "value": -25,
    "instantRnd": 0.05,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_XenoformingReduction100",
    "instantEffect": "XenoformingChange",
-   "operation": "",
    "value": -100,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_XenoformingIncrease25",
    "instantEffect": "XenoformingChange",
-   "operation": "",
    "value": 25,
    "instantRnd": 0.05,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_XenoformingIncrease50",
    "instantEffect": "XenoformingChange",
-   "operation": "",
    "value": 50,
    "instantRnd": 0.05,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_XenoformingIncrease75",
    "instantEffect": "XenoformingChange",
-   "operation": "",
    "value": 75,
    "instantRnd": 0.05,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_XenoformingIncrease100",
    "instantEffect": "XenoformingChange",
-   "operation": "",
    "value": 100,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_MinorExposure",
    "instantEffect": "Exposure",
-   "operation": "",
    "value": 0.25,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_MajorExposure",
    "instantEffect": "Exposure",
-   "operation": "",
    "value": 0.5,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_CouncilorExposure",
    "instantEffect": "Exposure_SingleCouncilor",
-   "operation": "",
    "value": 0.5,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_SecondaryTargetNegativePropaganda_Faction10",
    "instantEffect": "Propaganda_Faction",
-   "operation": "",
    "value": -10,
    "instantRnd": 0.05,
-   "strValue": "",
    "effectTarget": "SourceFaction",
    "effectSecondaryTarget": "InputState",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_SecondaryTargetNegativePropaganda_Faction25",
    "instantEffect": "Propaganda_Faction",
-   "operation": "",
    "value": -25,
    "instantRnd": 0.05,
-   "strValue": "",
    "effectTarget": "SourceFaction",
    "effectSecondaryTarget": "InputState",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_SecondaryTargetPropaganda_Faction10",
    "instantEffect": "Propaganda_Faction",
-   "operation": "",
    "value": 10,
    "instantRnd": 0.05,
-   "strValue": "",
    "effectTarget": "SourceFaction",
    "effectSecondaryTarget": "InputState",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_SecondaryTargetPropaganda_Faction25",
    "instantEffect": "Propaganda_Faction",
-   "operation": "",
    "value": 25,
    "instantRnd": 0.05,
-   "strValue": "",
    "effectTarget": "SourceFaction",
    "effectSecondaryTarget": "InputState",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_SecondaryTargetPropaganda",
    "instantEffect": "Propaganda",
-   "operation": "",
    "value": 25,
    "instantRnd": 0.05,
-   "strValue": "",
    "effectTarget": "InputState",
    "effectSecondaryTarget": "InputState",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_SecondaryTargetNegativePropaganda10",
    "instantEffect": "Propaganda",
-   "operation": "",
    "value": -10,
    "instantRnd": 0.05,
-   "strValue": "",
    "effectTarget": "InputState",
    "effectSecondaryTarget": "InputState",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_SecondaryTargetPropagandaGlobal10",
    "instantEffect": "Propaganda",
-   "operation": "",
    "value": 10,
    "instantRnd": 0.05,
-   "strValue": "",
    "effectTarget": "AllExtantNations",
    "effectSecondaryTarget": "InputState",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_SecondaryTargetRegionPropaganda15",
    "instantEffect": "Propaganda_Region",
-   "operation": "",
    "value": 15,
    "instantRnd": 0.1,
-   "strValue": "",
    "effectTarget": "InputState",
    "effectSecondaryTarget": "InputState",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_SmallDemocracyLoss",
    "instantEffect": "NationDemocracyChange",
-   "operation": "",
    "value": -0.01,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_DemocracyLoss02",
    "instantEffect": "NationDemocracyChange",
-   "operation": "",
    "value": -0.2,
    "instantRnd": 0.01,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_DemocracyLoss05",
    "instantEffect": "NationDemocracyChange",
-   "operation": "",
    "value": -0.5,
    "instantRnd": 0.02,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_DemocracyLoss1",
    "instantEffect": "NationDemocracyChange",
-   "operation": "",
    "value": -1,
    "instantRnd": 0.25,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_DemocracyLoss5",
    "instantEffect": "NationDemocracyChange",
-   "operation": "",
    "value": -5,
    "instantRnd": 0.5,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_DemocracyLoss7",
    "instantEffect": "NationDemocracyChange",
-   "operation": "",
    "value": -7,
    "instantRnd": 0.5,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_DemocracyLossSecondary1",
    "instantEffect": "NationDemocracyChange",
-   "operation": "",
    "value": -1,
    "instantRnd": 0.25,
-   "strValue": "",
    "effectTarget": "InputState",
    "effectSecondaryTarget": "InputState",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_SmallDemocracyGain",
    "instantEffect": "NationDemocracyChange",
-   "operation": "",
    "value": 0.25,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_SecondaryMiltechLoss",
    "instantEffect": "NationMiltechChange",
-   "operation": "",
    "value": -0.1,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
    "effectSecondaryTarget": "InputState",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_SecondaryMiltechLoss02",
    "instantEffect": "NationMiltechChange",
-   "operation": "",
    "value": -0.2,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
    "effectSecondaryTarget": "InputState",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_MiltechLoss005",
    "instantEffect": "NationMiltechChange",
-   "operation": "",
    "value": -0.05,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_MiltechLoss01",
    "instantEffect": "NationMiltechChange",
-   "operation": "",
    "value": -0.1,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_MiltechLoss02",
    "instantEffect": "NationMiltechChange",
-   "operation": "",
    "value": -0.2,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_MiltechGain005",
    "instantEffect": "NationMiltechChange",
-   "operation": "",
    "value": 0.05,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_MiltechGain01",
    "instantEffect": "NationMiltechChange",
-   "operation": "",
    "value": 0.1,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_MiltechGain02",
    "instantEffect": "NationMiltechChange",
-   "operation": "",
    "value": 0.2,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_MiltechGain03",
    "instantEffect": "NationMiltechChange",
-   "operation": "",
    "value": 0.3,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_MassiveCohesionLoss",
-   "instantEffect": "NationCohesionChange",
-   "operation": "",
+   "instantEffect": "NationCohesionChange_PopScaled",
    "value": -8,
    "instantRnd": 0.5,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_MajorCohesionGain",
-   "instantEffect": "NationCohesionChange",
-   "operation": "",
+   "instantEffect": "NationCohesionChange_PopScaled",
    "value": 2,
    "instantRnd": 0.05,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_MajorCohesionLoss",
-   "instantEffect": "NationCohesionChange",
-   "operation": "",
+   "instantEffect": "NationCohesionChange_PopScaled",
    "value": -2,
    "instantRnd": 0.05,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_MinorCohesionGain",
-   "instantEffect": "NationCohesionChange",
-   "operation": "",
+   "instantEffect": "NationCohesionChange_PopScaled",
    "value": 1,
    "instantRnd": 0.02,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_MinorCohesionLoss",
-   "instantEffect": "NationCohesionChange",
-   "operation": "",
+   "instantEffect": "NationCohesionChange_PopScaled",
    "value": -1,
    "instantRnd": 0.02,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_SecondaryCohesionGain",
-   "instantEffect": "NationCohesionChange",
-   "operation": "",
+   "instantEffect": "NationCohesionChange_PopScaled",
    "value": 1,
    "instantRnd": 0.02,
-   "strValue": "",
    "effectTarget": "InputState",
    "effectSecondaryTarget": "InputState",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_SecondaryCohesionLoss",
-   "instantEffect": "NationCohesionChange",
-   "operation": "",
+   "instantEffect": "NationCohesionChange_PopScaled",
    "value": -1,
    "instantRnd": 0.02,
-   "strValue": "",
    "effectTarget": "InputState",
    "effectSecondaryTarget": "InputState",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_GlobalCohesionGain",
    "instantEffect": "NationCohesionChange",
-   "operation": "",
    "value": 1,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "AllExtantNations",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_MinorGlobalCohesionGain",
    "instantEffect": "NationCohesionChange",
-   "operation": "",
    "value": 0.5,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "AllExtantNations",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_GlobalCohesionLoss",
    "instantEffect": "NationCohesionChange",
-   "operation": "",
    "value": -1,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "AllExtantNations",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_MajorGlobalCohesionLoss",
    "instantEffect": "NationCohesionChange",
-   "operation": "",
    "value": -2,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "AllExtantNations",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_TotalGlobalCohesionLoss",
    "instantEffect": "NationCohesionChange",
-   "operation": "",
    "value": -6,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "AllExtantNations",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_MajorCohesionOutward",
-   "instantEffect": "NationCohesionChange_ToExtreme",
-   "operation": "",
+   "instantEffect": "NationCohesionChange_ToExtreme_PopScaled",
    "value": 2,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_MinorCohesionOutward",
-   "instantEffect": "NationCohesionChange_ToExtreme",
-   "operation": "",
+   "instantEffect": "NationCohesionChange_ToExtreme_PopScaled",
    "value": 1,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_MajorGlobalCohesionOutward",
    "instantEffect": "NationCohesionChange_ToExtreme",
-   "operation": "",
    "value": 2,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "AllExtantNations",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_MinorGlobalCohesionOutward",
    "instantEffect": "NationCohesionChange_ToExtreme",
-   "operation": "",
    "value": 1,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "AllExtantNations",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_MaximumUnrestGain",
    "instantEffect": "NationUnrestChange",
-   "operation": "",
    "value": 10,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_MassiveUnrestGain",
    "instantEffect": "NationUnrestChange",
-   "operation": "",
    "value": 6,
    "instantRnd": 0.1,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_MajorUnrestGain",
    "instantEffect": "NationUnrestChange",
-   "operation": "",
    "value": 3,
    "instantRnd": 0.05,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_MajorUnrestLoss",
    "instantEffect": "NationUnrestChange",
-   "operation": "",
    "value": -3,
    "instantRnd": 0.05,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_MinorUnrestGain",
    "instantEffect": "NationUnrestChange",
-   "operation": "",
    "value": 1,
    "instantRnd": 0.02,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_MinorUnrestLoss",
    "instantEffect": "NationUnrestChange",
-   "operation": "",
    "value": -1,
    "instantRnd": 0.02,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_MajorInequalityGain",
-   "instantEffect": "NationInequalityChange",
-   "operation": "",
+   "instantEffect": "NationInequalityChange_PopScaled",
    "value": 2.5,
    "instantRnd": 0.25,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_ModerateInequalityGain",
-   "instantEffect": "NationInequalityChange",
-   "operation": "",
+   "instantEffect": "NationInequalityChange_PopScaled",
    "value": 1,
    "instantRnd": 0.1,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_MinorInequalityGain",
-   "instantEffect": "NationInequalityChange",
-   "operation": "",
+   "instantEffect": "NationInequalityChange_PopScaled",
    "value": 0.3,
    "instantRnd": 0.05,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_MinorInequalityLoss",
-   "instantEffect": "NationInequalityChange",
-   "operation": "",
+   "instantEffect": "NationInequalityChange_PopScaled",
    "value": -0.3,
    "instantRnd": 0.05,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_MajorUnrestGain_ByFaction",
    "instantEffect": "NationUnrestChange_FactionCredit",
-   "operation": "",
    "value": 3,
    "instantRnd": 0.05,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_MajorUnrestLoss_ByFaction",
    "instantEffect": "NationUnrestChange_FactionCredit",
-   "operation": "",
    "value": -3,
    "instantRnd": 0.05,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_MinorUnrestGain_ByFaction",
    "instantEffect": "NationUnrestChange_FactionCredit",
-   "operation": "",
    "value": 1,
    "instantRnd": 0.02,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_MinorUnrestLoss_ByFaction",
    "instantEffect": "NationUnrestChange_FactionCredit",
-   "operation": "",
    "value": -1,
    "instantRnd": 0.02,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_SecondaryMassiveUnrestGain_ByFaction",
    "instantEffect": "NationUnrestChange_FactionCredit",
-   "operation": "",
    "value": 6,
    "instantRnd": 0.1,
-   "strValue": "",
    "effectTarget": "SourceFaction",
    "effectSecondaryTarget": "InputState",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_SecondaryMajorUnrestGain_ByFaction",
    "instantEffect": "NationUnrestChange_FactionCredit",
-   "operation": "",
    "value": 3,
    "instantRnd": 0.05,
-   "strValue": "",
    "effectTarget": "SourceFaction",
    "effectSecondaryTarget": "InputState",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_SecondaryMajorUnrestLoss_ByFaction",
    "instantEffect": "NationUnrestChange_FactionCredit",
-   "operation": "",
    "value": -3,
    "instantRnd": 0.05,
-   "strValue": "",
    "effectTarget": "SourceFaction",
    "effectSecondaryTarget": "InputState",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_SecondaryMinorUnrestGain_ByFaction",
    "instantEffect": "NationUnrestChange_FactionCredit",
-   "operation": "",
    "value": 1,
    "instantRnd": 0.02,
-   "strValue": "",
    "effectTarget": "SourceFaction",
    "effectSecondaryTarget": "InputState",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_SecondaryMinorUnrestLoss_ByFaction",
    "instantEffect": "NationUnrestChange_FactionCredit",
-   "operation": "",
    "value": -1,
    "instantRnd": 0.02,
-   "strValue": "",
    "effectTarget": "SourceFaction",
    "effectSecondaryTarget": "InputState",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_EducationLoss",
-   "instantEffect": "NationEducationChange",
-   "operation": "",
+   "instantEffect": "NationEducationChange_PopScaled",
    "value": -1,
    "instantRnd": 0.05,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_EducationGain01",
    "instantEffect": "NationEducationChange",
-   "operation": "",
    "value": 0.1,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_GDPGain01",
    "instantEffect": "NationGDPPctChange",
-   "operation": "",
    "value": 0.01,
    "instantRnd": 0.01,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_GDPGain02",
    "instantEffect": "NationGDPPctChange",
-   "operation": "",
    "value": 0.02,
    "instantRnd": 0.01,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_GDPLoss02",
    "instantEffect": "NationGDPPctChange",
-   "operation": "",
    "value": -0.02,
    "instantRnd": 0.01,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_GDPLoss04",
    "instantEffect": "NationGDPPctChange",
-   "operation": "",
    "value": -0.04,
    "instantRnd": 0.01,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_GDPLoss20",
    "instantEffect": "NationGDPPctChange",
-   "operation": "",
    "value": -0.2,
    "instantRnd": 0.1,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_GDPLoss50",
    "instantEffect": "NationGDPPctChange",
-   "operation": "",
    "value": -0.5,
    "instantRnd": 0.1,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_GlobalGDPLoss1",
    "instantEffect": "NationGDPPctChange",
-   "operation": "",
    "value": -0.01,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "AllExtantNations",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_GlobalGDPLoss2",
    "instantEffect": "NationGDPPctChange",
-   "operation": "",
    "value": -0.02,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "AllExtantNations",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_GlobalGDPLoss3",
    "instantEffect": "NationGDPPctChange",
-   "operation": "",
    "value": -0.03,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "AllExtantNations",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_GlobalGDPLoss10",
    "instantEffect": "NationGDPPctChange",
-   "operation": "",
    "value": -0.1,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "AllExtantNations",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_GlobalGDPLoss50",
    "instantEffect": "NationGDPPctChange",
-   "operation": "",
    "value": -0.5,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "AllExtantNations",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_GlobalGDPLossByCPTrigger",
    "instantEffect": "CPVariableNationGDPPctChange",
-   "operation": "",
    "value": -0.01,
    "instantRnd": 0.005,
-   "strValue": "",
    "effectTarget": "AllExtantNations",
    "effectSecondaryTarget": "InputState",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_SecondaryGDPLoss",
    "instantEffect": "NationGDPPctChange",
-   "operation": "",
    "value": -0.01,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
    "effectSecondaryTarget": "InputState",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_SecondaryGDPLoss02",
    "instantEffect": "NationGDPPctChange",
-   "operation": "",
    "value": -0.02,
    "instantRnd": 0.01,
-   "strValue": "",
    "effectTarget": "InputState",
    "effectSecondaryTarget": "InputState",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_SecondaryGDPLoss04",
    "instantEffect": "NationGDPPctChange",
-   "operation": "",
    "value": -0.04,
    "instantRnd": 0.01,
-   "strValue": "",
    "effectTarget": "InputState",
    "effectSecondaryTarget": "InputState",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_SecondaryInequalityIncrease",
    "instantEffect": "NationInequalityChange",
-   "operation": "",
    "value": 0.3,
    "instantRnd": 0.02,
-   "strValue": "",
    "effectTarget": "InputState",
    "effectSecondaryTarget": "InputState",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_SecondaryGDPGain",
    "instantEffect": "NationGDPPctChange",
-   "operation": "",
    "value": 0.005,
    "instantRnd": 0.05,
-   "strValue": "",
    "effectTarget": "InputState",
    "effectSecondaryTarget": "InputState",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_SecondaryMiltechGain",
    "instantEffect": "NationMiltechChange",
-   "operation": "",
    "value": 0.1,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
    "effectSecondaryTarget": "InputState",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_NukeAdd1",
    "instantEffect": "NationNukesChange",
-   "operation": "",
    "value": 1,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_NukeRemove1",
    "instantEffect": "NationNukesChange",
-   "operation": "",
    "value": -1,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_NukeRemoveSecondary1",
    "instantEffect": "NationNukesChange",
-   "operation": "",
    "value": -1,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
    "effectSecondaryTarget": "InputState",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_LooseNukeAdd1",
    "instantEffect": "GlobalLooseNukesChange",
-   "operation": "",
    "value": 1,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_LooseNukeAdd3",
    "instantEffect": "GlobalLooseNukesChange",
-   "operation": "",
    "value": 3,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_LooseNukeRemove1",
    "instantEffect": "GlobalLooseNukesChange",
-   "operation": "",
    "value": -1,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_ShipNukeAdd1",
    "instantEffect": "ShipNuclearTorpedoMagazineChange",
-   "operation": "",
    "value": 1,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_ShipNukeRemove1",
    "instantEffect": "ShipNuclearTorpedoMagazineChange",
-   "operation": "",
    "value": -1,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_UpgradeRelations",
    "instantEffect": "UpgradeRelations",
-   "operation": "",
-   "value": null,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
    "effectSecondaryTarget": "InputState",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_DowngradeRelations",
    "instantEffect": "DowngradeRelations",
-   "operation": "",
-   "value": null,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
    "effectSecondaryTarget": "InputState",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_DeclareLimitedWar",
    "instantEffect": "DeclareLimitedWar",
-   "operation": "",
-   "value": null,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
    "effectSecondaryTarget": "InputState",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_DeclareFullWar",
    "instantEffect": "DeclareFullWar",
-   "operation": "",
-   "value": null,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
    "effectSecondaryTarget": "InputState",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_RevealRegionAlienActivities",
    "instantEffect": "RegionRevealAlienActivities",
-   "operation": "",
-   "value": null,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
    "effectSecondaryTarget": "InputState",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_Atrocity",
    "instantEffect": "Atrocity",
-   "operation": "",
    "value": 1,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_EconomyPriorityBonus02",
-   "instantEffect": "",
    "operation": "Additive",
    "value": 0.02,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "EconomyPriority",
-      ""
+      "EconomyPriority"
    ]
 },
  {
    "dataName": "Effect_EconomyPriorityBonus05",
-   "instantEffect": "",
    "operation": "Additive",
    "value": 0.05,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "EconomyPriority",
-      ""
+      "EconomyPriority"
    ]
 },
  {
    "dataName": "Effect_EconomyPriorityBonus1",
-   "instantEffect": "",
    "operation": "Additive",
    "value": 0.1,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "EconomyPriority",
-      ""
+      "EconomyPriority"
    ]
 },
  {
    "dataName": "Effect_WelfarePriorityBonus05",
-   "instantEffect": "",
    "operation": "Additive",
    "value": 0.05,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "WelfarePriority",
-      ""
+      "WelfarePriority"
    ]
 },
  {
    "dataName": "Effect_KnowledgePriorityBonus02",
-   "instantEffect": "",
    "operation": "Additive",
    "value": 0.02,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "KnowledgePriority",
-      ""
+      "KnowledgePriority"
    ]
 },
  {
    "dataName": "Effect_KnowledgePriorityBonus05",
-   "instantEffect": "",
    "operation": "Additive",
    "value": 0.05,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "KnowledgePriority",
-      ""
+      "KnowledgePriority"
    ]
 },
  {
    "dataName": "Effect_KnowledgePriorityBonus1",
-   "instantEffect": "",
    "operation": "Additive",
    "value": 0.1,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "KnowledgePriority",
-      ""
+      "KnowledgePriority"
    ]
 },
  {
    "dataName": "Effect_MilitaryPriorityBonus02",
-   "instantEffect": "",
    "operation": "Additive",
    "value": 0.02,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "MilitaryPriority",
-      ""
+      "MilitaryPriority"
    ]
 },
  {
    "dataName": "Effect_MilitaryPriorityBonus05",
-   "instantEffect": "",
    "operation": "Additive",
    "value": 0.05,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "MilitaryPriority",
-      ""
+      "MilitaryPriority"
    ]
 },
  {
    "dataName": "Effect_BuildArmyPriorityBonus05",
-   "instantEffect": "",
    "operation": "Additive",
    "value": 0.05,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "BuildArmyPriority",
-      ""
+      "BuildArmyPriority"
    ]
 },
  {
    "dataName": "Effect_UpgradeArmyPriorityBonus05",
-   "instantEffect": "",
    "operation": "Additive",
    "value": 0.05,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "UpgradeArmyPriority",
-      ""
+      "UpgradeArmyPriority"
    ]
 },
  {
    "dataName": "Effect_LaunchFacilitiesPriorityBonus05",
-   "instantEffect": "",
    "operation": "Additive",
    "value": 0.05,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "LaunchFacilitiesPriority",
-      ""
+      "LaunchFacilitiesPriority"
    ]
 },
  {
    "dataName": "Effect_LaunchFacilitiesPriorityBonus1",
-   "instantEffect": "",
    "operation": "Additive",
    "value": 0.1,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "LaunchFacilitiesPriority",
-      ""
+      "LaunchFacilitiesPriority"
    ]
 },
  {
    "dataName": "Effect_LaunchFacilitiesPriorityBonus15",
-   "instantEffect": "",
    "operation": "Additive",
    "value": 0.15,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "LaunchFacilitiesPriority",
-      ""
+      "LaunchFacilitiesPriority"
    ]
 },
  {
    "dataName": "Effect_LaunchFacilitiesPriorityBonus2",
-   "instantEffect": "",
    "operation": "Additive",
    "value": 0.2,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "LaunchFacilitiesPriority",
-      ""
+      "LaunchFacilitiesPriority"
    ]
 },
  {
    "dataName": "Effect_LaunchFacilitiesPriorityBonus25",
-   "instantEffect": "",
    "operation": "Additive",
    "value": 0.25,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "LaunchFacilitiesPriority",
-      ""
+      "LaunchFacilitiesPriority"
    ]
 },
  {
    "dataName": "Effect_SpaceflightProgramPriorityBonus05",
-   "instantEffect": "",
    "operation": "Additive",
    "value": 0.05,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "SpaceflightPriority",
-      ""
+      "SpaceflightPriority"
    ]
 },
  {
    "dataName": "Effect_SpaceflightProgramPriorityBonus50",
-   "instantEffect": "",
    "operation": "Additive",
    "value": 0.5,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "SpaceflightPriority",
-      ""
+      "SpaceflightPriority"
    ]
 },
  {
    "dataName": "Effect_MissionControlPriorityBonus05",
-   "instantEffect": "",
    "operation": "Additive",
    "value": 0.05,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "MissionControlPriority",
-      ""
+      "MissionControlPriority"
    ]
 },
  {
    "dataName": "Effect_MissionControlPriorityBonus25",
-   "instantEffect": "",
    "operation": "Additive",
    "value": 0.25,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "MissionControlPriority",
-      ""
+      "MissionControlPriority"
    ]
 },
  {
    "dataName": "Effect_UnityPriorityBonus05",
-   "instantEffect": "",
    "operation": "Additive",
    "value": 0.05,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "UnityPriority",
-      ""
+      "UnityPriority"
    ]
 },
  {
    "dataName": "Effect_DirectInvestMoneyReduction15",
-   "instantEffect": "",
    "operation": "Additive",
    "value": 0.15,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "DirectInvestGlobalDiscount_Money_PCT",
-      ""
+      "DirectInvestGlobalDiscount_Money_PCT"
    ]
 },
  {
    "dataName": "Effect_DirectInvestInfluenceReduction25",
-   "instantEffect": "",
    "operation": "Additive",
    "value": 0.25,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "DirectInvestGlobalDiscount_Influence_PCT",
-      ""
+      "DirectInvestGlobalDiscount_Influence_PCT"
    ]
 },
  {
    "dataName": "Effect_ArcticMethaneRelease",
    "instantEffect": "GlobalCH4Change_ppm",
-   "operation": "",
    "value": 0.05,
    "instantRnd": 0.2,
-   "strValue": "",
    "effectTarget": "GlobalEffectSet",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_CO2Fires",
    "instantEffect": "GlobalCO2Change_ppm",
-   "operation": "",
    "value": 0.0002,
    "instantRnd": 0.2,
-   "strValue": "",
    "effectTarget": "GlobalEffectSet",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_AerosolsFires",
    "instantEffect": "GlobalStratosphericAerosolsChange_ppm",
-   "operation": "",
    "value": 0.00005,
    "instantRnd": 0.2,
-   "strValue": "",
    "effectTarget": "GlobalEffectSet",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_AerosolsVolcano",
    "instantEffect": "GlobalStratosphericAerosolsChange_ppm",
-   "operation": "",
    "value": 0.01,
    "instantRnd": 0.2,
-   "strValue": "",
    "effectTarget": "GlobalEffectSet",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_AerosolsMajorVolcano",
    "instantEffect": "GlobalStratosphericAerosolsChange_ppm",
-   "operation": "",
    "value": 0.02,
    "instantRnd": 0.2,
-   "strValue": "",
-   "effectTarget": "GlobalEffectSet",
-   "effectSecondaryTarget": "",
-   "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "effectTarget": "GlobalEffectSet",
+   "effectDuration": "instant",
+   "duration_months": -1
 },
  {
    "dataName": "Effect_AerosolsColossalVolcano",
    "instantEffect": "GlobalStratosphericAerosolsChange_ppm",
-   "operation": "",
    "value": 0.05,
    "instantRnd": 0.2,
-   "strValue": "",
    "effectTarget": "GlobalEffectSet",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_SpaceMiningBonus5",
-   "instantEffect": "",
    "operation": "Additive",
    "value": 0.05,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "SpaceMiningBonus",
-      ""
+      "SpaceMiningBonus"
    ]
 },
  {
    "dataName": "Effect_SpaceMiningBonus10",
-   "instantEffect": "",
    "operation": "Additive",
    "value": 0.1,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "SpaceMiningBonus",
-      ""
+      "SpaceMiningBonus"
    ]
 },
  {
    "dataName": "Effect_SolidFuelRockets",
-   "instantEffect": "",
    "operation": "IncreaseToValue",
    "value": 2.6,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
-   "stackable": null,
    "duration_months": -1,
    "initialFactionsStr": [
-      "AlienCouncil",
-      ""
+      "AlienCouncil"
    ],
    "contexts": [
-      "GenericTransferEV_kps",
-      ""
+      "GenericTransferEV_kps"
    ]
 },
  {
    "dataName": "Effect_LiquidFuelRockets",
-   "instantEffect": "",
    "operation": "IncreaseToValue",
    "value": 3.3,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
-   "stackable": null,
    "duration_months": -1,
    "initialFactionsStr": [
-      "AlienCouncil",
-      ""
+      "AlienCouncil"
    ],
    "contexts": [
-      "GenericTransferEV_kps",
-      ""
+      "GenericTransferEV_kps"
    ]
 },
  {
    "dataName": "Effect_CryogenicFuelRockets",
-   "instantEffect": "",
    "operation": "IncreaseToValue",
    "value": 4.44,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
-   "stackable": null,
    "duration_months": -1,
    "initialFactionsStr": [
-      "AlienCouncil",
-      ""
+      "AlienCouncil"
    ],
    "contexts": [
-      "GenericTransferEV_kps",
-      ""
+      "GenericTransferEV_kps"
    ]
 },
  {
    "dataName": "Effect_ImprovedRockets",
-   "instantEffect": "",
    "operation": "IncreaseToValue",
    "value": 5.6,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
-   "stackable": null,
    "duration_months": -1,
    "initialFactionsStr": [
-      "AlienCouncil",
-      ""
+      "AlienCouncil"
    ],
    "contexts": [
-      "GenericTransferEV_kps",
-      ""
+      "GenericTransferEV_kps"
    ]
 },
  {
    "dataName": "Effect_NuclearRockets",
-   "instantEffect": "",
    "operation": "IncreaseToValue",
    "value": 10,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
-   "stackable": null,
    "duration_months": -1,
    "initialFactionsStr": [
-      "AlienCouncil",
-      ""
+      "AlienCouncil"
    ],
    "contexts": [
-      "GenericTransferEV_kps",
-      ""
+      "GenericTransferEV_kps"
    ]
 },
  {
    "dataName": "Effect_AdvancedRockets",
-   "instantEffect": "",
    "operation": "IncreaseToValue",
    "value": 21.6,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
-   "stackable": null,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "GenericTransferEV_kps",
-      ""
+      "GenericTransferEV_kps"
    ]
 },
  {
    "dataName": "Effect_ManyAliensOnEarth",
-   "instantEffect": "",
    "operation": "SetToFixedValue",
    "value": 1,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "AlienFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": false,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "ManyAliensOnEarth",
-      ""
+      "ManyAliensOnEarth"
    ]
 },
  {
    "dataName": "Effect_PherocyteResistance",
-   "instantEffect": "",
    "operation": "Additive",
    "value": 2,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "PheroctyeResistance",
-      ""
+      "PherocyteResistance"
    ]
 },
  {
@@ -5002,1130 +2456,506 @@
    "instantEffect": "NationGDPPctChange",
    "operation": "Multiplicative",
    "value": -0.01,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "AllExtantNations",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_ModerateFloodingRiskIncrease",
    "instantEffect": "NationGDPPctChange",
    "operation": "Multiplicative",
    "value": -0.05,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "AllExtantNations",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_MajorFloodingRiskIncrease",
    "instantEffect": "NationGDPPctChange",
    "operation": "Multiplicative",
    "value": -0.15,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "AllExtantNations",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_ArcticOceanBlue",
    "instantEffect": "GlobalSeasonalOceansToPermanent",
-   "operation": "",
-   "value": null,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_GainOpenControlPoint",
    "instantEffect": "GainOpenControlPoint",
-   "operation": "",
-   "value": null,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
    "effectSecondaryTarget": "InputState",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_LoseUndefendedControlPoint",
    "instantEffect": "LoseUndefendedControlPoint",
-   "operation": "",
-   "value": null,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
    "effectSecondaryTarget": "InputState",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_LoseUndefendedControlPoint_Plus",
    "instantEffect": "LoseUndefendedControlPoint_Plus",
-   "operation": "",
    "value": 12,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
    "effectSecondaryTarget": "InputState",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_GainAnyControlPoint",
    "instantEffect": "GainAnyControlPoint",
-   "operation": "",
-   "value": null,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
    "effectSecondaryTarget": "InputState",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_GainAnyControlPoint_Plus",
    "instantEffect": "GainAnyControlPoint_Plus",
-   "operation": "",
    "value": 12,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
    "effectSecondaryTarget": "InputState",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_CrackdownArmyControlPoint",
    "instantEffect": "CrackdownArmyControlPoint",
-   "operation": "",
    "value": 12,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_IncreaseMaxMissionSliderSteps",
-   "instantEffect": "",
    "operation": "Additive",
    "value": 1,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
    "initialFactionsStr": [
-      "AlienCouncil",
-      ""
+      "AlienCouncil"
    ],
    "contexts": [
-      "MaxMissionSliderSteps",
-      ""
+      "MaxMissionSliderSteps"
    ]
 },
  {
    "dataName": "Effect_ShipConstructionTimeReduction5",
-   "instantEffect": "",
    "operation": "Multiplicative",
    "value": 0.95,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "ShipConstructionTime",
-      ""
+      "ShipConstructionTime"
    ]
 },
  {
    "dataName": "Effect_ShipConstructionTimeReduction10",
-   "instantEffect": "",
    "operation": "Multiplicative",
    "value": 0.9,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "ShipConstructionTime",
-      ""
+      "ShipConstructionTime"
    ]
 },
  {
    "dataName": "Effect_ShipConstructionTimeReduction",
-   "instantEffect": "",
    "operation": "Multiplicative",
    "value": 0.8,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "ShipConstructionTime",
-      ""
+      "ShipConstructionTime"
    ]
 },
  {
    "dataName": "Effect_FactionSoftPower",
-   "instantEffect": "",
    "operation": "Additive",
    "value": 1,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "Mission_GainControlPoint",
-      ""
+      "Mission_GainControlPoint"
    ]
 },
  {
    "dataName": "Effect_IncreaseMonthlyMoneyIncome2",
    "instantEffect": "GainMoneyIncome",
-   "operation": "",
    "value": 2,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_IncreaseMonthlyMoneyIncome10",
    "instantEffect": "GainMoneyIncome",
-   "operation": "",
    "value": 10,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_IncreaseMonthlyMoneyIncome200",
    "instantEffect": "GainMoneyIncome",
-   "operation": "",
    "value": 200,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_DecreaseMonthlyMoneyIncome5",
    "instantEffect": "GainMoneyIncome",
-   "operation": "",
    "value": -5,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_DecreaseMonthlyMoneyIncome10",
    "instantEffect": "GainMoneyIncome",
-   "operation": "",
    "value": -10,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_DecreaseMonthlyMoneyIncome25",
    "instantEffect": "GainMoneyIncome",
-   "operation": "",
    "value": -25,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_DecreaseMonthlyMoneyIncome50",
    "instantEffect": "GainMoneyIncome",
-   "operation": "",
    "value": -50,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_DecreaseMonthlyMoneyIncome100",
    "instantEffect": "GainMoneyIncome",
-   "operation": "",
    "value": -100,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_DecreaseMonthlyMoneyIncome200",
    "instantEffect": "GainMoneyIncome",
-   "operation": "",
    "value": -200,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_IncreaseMonthlyInfluenceIncome1",
    "instantEffect": "GainInfluenceIncome",
-   "operation": "",
    "value": 1,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_IncreaseMonthlyInfluenceIncome3",
    "instantEffect": "GainInfluenceIncome",
-   "operation": "",
    "value": 3,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_IncreaseMonthlyBoostIncome025",
    "instantEffect": "GainBoostIncome",
-   "operation": "",
    "value": 0.25,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_IncreaseMonthlyOpsIncome5",
    "instantEffect": "GainOpsIncome",
-   "operation": "",
    "value": 5,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_IncreaseMonthlyOpsIncome3",
    "instantEffect": "GainOpsIncome",
-   "operation": "",
    "value": 3,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_IncreaseMonthlyOpsIncome05",
    "instantEffect": "GainOpsIncome",
-   "operation": "",
    "value": 0.5,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_IncreaseMonthlyResearchIncome15",
    "instantEffect": "GainResearchIncome",
-   "operation": "",
    "value": 15,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_IncreaseMonthlyNoblesIncome10",
    "instantEffect": "GainNoblesIncome",
-   "operation": "",
    "value": 10,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_DecreaseMonthlyNoblesIncome10",
    "instantEffect": "GainNoblesIncome",
-   "operation": "",
    "value": -10,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_RapidResponseTeams",
-   "instantEffect": "",
    "operation": "Additive",
    "value": 3,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "Mission_Terrorize_Def",
-      ""
+      "Mission_Terrorize_Def"
    ]
 },
  {
    "dataName": "Effect_RapidDiplomacy",
-   "instantEffect": "",
    "operation": "Multiplicative",
    "value": 0.8,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "BilateralRelationsCooldownMultiplier",
-      ""
+      "BilateralRelationsCooldownMultiplier"
    ]
 },
  {
    "dataName": "Effect_AlienDiplomacy",
-   "instantEffect": "",
    "operation": "Multiplicative",
    "value": 0.25,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
    "initialFactionsStr": [
-      "AlienCouncil",
-      ""
+      "AlienCouncil"
    ],
    "contexts": [
-      "BilateralRelationsCooldownMultiplier",
-      ""
+      "BilateralRelationsCooldownMultiplier"
    ]
 },
  {
    "dataName": "Effect_EnthrallElitesDefense",
-   "instantEffect": "",
    "operation": "Additive",
    "value": 2,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "Mission_EnthrallElites_Def",
-      ""
+      "Mission_EnthrallElites_Def"
    ]
 },
  {
    "dataName": "Effect_DestroyNationalSpaceAssets",
    "instantEffect": "DamageNationalSpaceAssets",
-   "operation": "",
    "value": 1,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_DamageNationalSpaceAssets",
    "instantEffect": "DamageNationalSpaceAssets",
-   "operation": "",
    "value": 0.5,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_DamageNationalSpaceAssetsSecondary025",
    "instantEffect": "DamageNationalSpaceAssets",
-   "operation": "",
    "value": 0.25,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
    "effectSecondaryTarget": "InputState",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_GlobalFamine",
    "instantEffect": "RegionPopulationPctChange_WealthMitigation",
-   "operation": "",
    "value": -0.33,
    "instantRnd": 0.05,
-   "strValue": "",
    "effectTarget": "AllRegions",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_WetBulb",
    "instantEffect": "RegionPopulationPctChange_WealthMitigation",
-   "operation": "",
    "value": -0.005,
    "instantRnd": 0.001,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_MitigatedWetBulb",
    "instantEffect": "RegionPopulationPctChange_WealthMitigation",
-   "operation": "",
    "value": -0.0025,
    "instantRnd": 0.001,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_Apparatchiks",
-   "instantEffect": "",
    "operation": "Additive",
    "value": 2,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "Mission_Purge_Att",
-      ""
+      "Mission_Purge_Att"
    ]
 },
  {
    "dataName": "Effect_IncreasePurgeAttack_10",
-   "instantEffect": "",
    "operation": "Additive",
    "value": 10,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "Mission_Purge_Att",
-      ""
+      "Mission_Purge_Att"
    ]
 },
  {
    "dataName": "Effect_GainFactionSpaceOrg",
    "instantEffect": "GainFactionSpaceOrg",
-   "operation": "",
-   "value": null,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_FreeAbductions1",
    "instantEffect": "RegionAbductionsChange",
-   "operation": "",
    "value": 1,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
    "effectSecondaryTarget": "InputState",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_FreeAbductions2",
    "instantEffect": "RegionAbductionsChange",
-   "operation": "",
    "value": 2,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
    "effectSecondaryTarget": "InputState",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_FreeAbductions4",
    "instantEffect": "RegionAbductionsChange",
-   "operation": "",
    "value": 4,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
    "effectSecondaryTarget": "InputState",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_FreeAbductions6",
    "instantEffect": "RegionAbductionsChange",
-   "operation": "",
    "value": 6,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
    "effectSecondaryTarget": "InputState",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_AtrocityMitigation50",
-   "instantEffect": "",
    "operation": "Multiplicative",
    "value": 0.5,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "AtrocityMitigation",
-      ""
+      "AtrocityMitigation"
    ]
 },
  {
    "dataName": "Effect_HostileTakeoverDefense",
-   "instantEffect": "",
    "operation": "Additive",
    "value": 2,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "Mission_HostileTakeover_Def",
-      ""
+      "Mission_HostileTakeover_Def"
    ]
 },
  {
    "dataName": "Effect_HostileTakeoverAttack",
-   "instantEffect": "",
    "operation": "Additive",
    "value": 2,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "Mission_HostileTakeover_Att",
-      ""
+      "Mission_HostileTakeover_Att"
    ]
 },
  {
    "dataName": "Effect_FactionResearchEncryption",
-   "instantEffect": "",
    "operation": "Additive",
    "value": 2,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
       "Mission_StealProject_Def",
       "Mission_SabotageProject_Def"
@@ -6133,272 +2963,156 @@
 },
  {
    "dataName": "Effect_AssassinationAttack",
-   "instantEffect": "",
    "operation": "Additive",
    "value": 4,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "Mission_Assassination_Att",
-      ""
+      "Mission_Assassination_Att"
    ]
 },
  {
    "dataName": "Effect_ControlAssetDefense",
-   "instantEffect": "",
    "operation": "Additive",
    "value": 4,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "Mission_ControlAsset_Def",
-      ""
+      "Mission_ControlAsset_Def"
    ]
 },
  {
    "dataName": "Effect_GainControlPoint_Debuff2_12",
-   "instantEffect": "",
    "operation": "Additive",
    "value": -2,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "temporary",
    "stackable": true,
    "duration_months": 12,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "Mission_GainControlPoint",
-      ""
+      "Mission_GainControlPoint"
    ]
 },
  {
    "dataName": "Effect_GainControlPoint_Debuff4_12",
-   "instantEffect": "",
    "operation": "Additive",
    "value": -4,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "temporary",
    "stackable": true,
    "duration_months": 12,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "Mission_GainControlPoint",
-      ""
+      "Mission_GainControlPoint"
    ]
 },
  {
    "dataName": "Effect_ControlAssetDefense_Debuff4_12",
-   "instantEffect": "",
    "operation": "Additive",
    "value": -4,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "temporary",
    "stackable": true,
    "duration_months": 12,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "Mission_ControlAsset_Def",
-      ""
+      "Mission_ControlAsset_Def"
    ]
 },
  {
    "dataName": "Effect_ControlAssetDefense_Debuff6_12",
-   "instantEffect": "",
    "operation": "Additive",
    "value": -6,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "temporary",
    "stackable": true,
    "duration_months": 12,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "Mission_ControlAsset_Def",
-      ""
+      "Mission_ControlAsset_Def"
    ]
 },
  {
    "dataName": "Effect_AssassinationAttack_Debuff4_12",
-   "instantEffect": "",
    "operation": "Additive",
    "value": -4,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "temporary",
    "stackable": true,
    "duration_months": 12,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "Mission_Assassination_Att",
-      ""
+      "Mission_Assassination_Att"
    ]
 },
  {
    "dataName": "Effect_AssassinationAttack_Debuff6_12",
-   "instantEffect": "",
    "operation": "Additive",
    "value": -6,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "temporary",
    "stackable": true,
    "duration_months": 12,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "Mission_Assassination_Att",
-      ""
+      "Mission_Assassination_Att"
    ]
 },
  {
    "dataName": "Effect_TerrorizeDefense_Debuff4_12",
-   "instantEffect": "",
    "operation": "Additive",
    "value": -4,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "temporary",
    "stackable": true,
    "duration_months": 12,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "Mission_Terrorize_Def",
-      ""
+      "Mission_Terrorize_Def"
    ]
 },
  {
    "dataName": "Effect_TerrorizeDefense_Debuff6_12",
-   "instantEffect": "",
    "operation": "Additive",
    "value": -6,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "temporary",
    "stackable": true,
    "duration_months": 12,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "Mission_Terrorize_Def",
-      ""
+      "Mission_Terrorize_Def"
    ]
 },
  {
    "dataName": "Effect_EnthrallElitesDefense_Debuff2_12",
-   "instantEffect": "",
    "operation": "Additive",
    "value": -2,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "temporary",
    "stackable": true,
    "duration_months": 12,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "Mission_EnthrallElites_Def",
-      ""
+      "Mission_EnthrallElites_Def"
    ]
 },
  {
    "dataName": "Effect_EnthrallElitesDefense_Debuff4_12",
-   "instantEffect": "",
    "operation": "Additive",
    "value": -4,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "temporary",
    "stackable": true,
    "duration_months": 12,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "Mission_EnthrallElites_Def",
-      ""
+      "Mission_EnthrallElites_Def"
    ]
 },
  {
    "dataName": "Effect_StealSabotageProjectDefense_Debuff4_12",
-   "instantEffect": "",
    "operation": "Additive",
    "value": -4,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "temporary",
    "stackable": true,
    "duration_months": 12,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
       "Mission_StealProject_Def",
       "Mission_SabotageProject_Def"
@@ -6406,20 +3120,12 @@
 },
  {
    "dataName": "Effect_StealSabotageProjectDefense_Debuff6_12",
-   "instantEffect": "",
    "operation": "Additive",
    "value": -6,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "temporary",
    "stackable": true,
    "duration_months": 12,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
       "Mission_StealProject_Def",
       "Mission_SabotageProject_Def"
@@ -6427,1252 +3133,542 @@
 },
  {
    "dataName": "Effect_PublicCampaign_Debuff6_12",
-   "instantEffect": "",
    "operation": "Additive",
    "value": -6,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "temporary",
    "stackable": true,
    "duration_months": 12,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "Mission_Propaganda_Att",
-      ""
+      "Mission_Propaganda_Att"
    ]
 },
  {
    "dataName": "Effect_PrimaryOccupiesSecondary15",
    "instantEffect": "PrimaryOccupiesSecondary",
-   "operation": "",
    "value": 0.15,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
    "effectSecondaryTarget": "InputState",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_PrimaryOccupiesSecondary25",
    "instantEffect": "PrimaryOccupiesSecondary",
-   "operation": "",
    "value": 0.25,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
    "effectSecondaryTarget": "InputState",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_SecondaryOccupiesPrimary15",
    "instantEffect": "SecondaryOccupiesPrimary",
-   "operation": "",
    "value": 0.15,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
    "effectSecondaryTarget": "InputState",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_SecondaryRegimeChangesPrimary",
    "instantEffect": "SecondaryRegimeChangesPrimary",
-   "operation": "",
-   "value": null,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
    "effectSecondaryTarget": "InputState",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_SecondaryAnnexesPrimary",
    "instantEffect": "SecondaryAnnexesPrimary",
-   "operation": "",
-   "value": null,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
    "effectSecondaryTarget": "InputState",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_SnapElection0",
    "instantEffect": "RedistributeControlPointsByPopularity_Individual",
-   "operation": "",
    "value": 0,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_SnapElection15",
    "instantEffect": "RedistributeControlPointsByPopularity_Individual",
-   "operation": "",
    "value": 0.15,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_PopularityContestLegislature0",
    "instantEffect": "ReassignControlPointOfTypeByPopularity",
-   "operation": "",
    "value": 0,
-   "instantRnd": null,
    "strValue": "Legislature",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_PopularityContestLegislature25",
    "instantEffect": "ReassignControlPointOfTypeByPopularity",
-   "operation": "",
    "value": 0.25,
-   "instantRnd": null,
    "strValue": "Legislature",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_RandomSecession",
    "instantEffect": "RandomSecession",
-   "operation": "",
-   "value": null,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_SecondaryRandomSecession",
    "instantEffect": "RandomSecession",
-   "operation": "",
-   "value": null,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
    "effectSecondaryTarget": "InputState",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_CoupNullFaction",
    "instantEffect": "Coup",
-   "operation": "",
    "value": 0,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_IncreaseProjectUnlockChance",
-   "instantEffect": "",
    "operation": "Additive",
    "value": 10,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "ProjectUnlockChance",
-      ""
+      "ProjectUnlockChance"
    ]
 },
  {
    "dataName": "Effect_IncreaseUnrestAttack",
-   "instantEffect": "",
    "operation": "Additive",
    "value": 2,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "Mission_Unrest_Att",
-      ""
+      "Mission_Unrest_Att"
    ]
 },
  {
    "dataName": "Effect_StabilizeAttack",
-   "instantEffect": "",
    "operation": "Additive",
    "value": 2,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "Mission_Stabilize_Att",
-      ""
+      "Mission_Stabilize_Att"
    ]
 },
  {
    "dataName": "Effect_PostRegimeChangeUnrestControl",
-   "instantEffect": "",
    "operation": "Additive",
    "value": 3,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "PostRegimeChangeUnrestReduction",
-      ""
+      "PostRegimeChangeUnrestReduction"
    ]
 },
  {
    "dataName": "Effect_PostRegimeLossUnrestIncrease",
-   "instantEffect": "",
    "operation": "Additive",
    "value": 3,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "PostRegimeLossUnrestIncrease",
-      ""
+      "PostRegimeLossUnrestIncrease"
    ]
 },
  {
    "dataName": "Effect_BreakawayChance",
-   "instantEffect": "",
    "operation": "Multiplicative",
    "value": 1.5,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "BreakawayChance",
-      ""
+      "BreakawayChance"
    ]
 },
  {
    "dataName": "Effect_IncreaseInspireAttack",
-   "instantEffect": "",
    "operation": "Additive",
    "value": 2,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "Mission_Inspire_Att",
-      ""
+      "Mission_Inspire_Att"
    ]
 },
  {
    "dataName": "Effect_GlobalFissionTechIncrease",
-   "instantEffect": "",
    "operation": "Additive",
    "value": 1,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "AllHumanFactions",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "GlobalFissionTechLevel",
-      ""
+      "GlobalFissionTechLevel"
    ]
 },
  {
    "dataName": "Effect_GlobalFusionTechIncrease",
-   "instantEffect": "",
    "operation": "Additive",
    "value": 1,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "AllHumanFactions",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "GlobalFusionTechLevel",
-      ""
+      "GlobalFusionTechLevel"
    ]
 },
  {
    "dataName": "Effect_DestroyRandomModules1",
    "instantEffect": "DestroyRandomModules",
-   "operation": "",
    "value": 1,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_DestroyRandomModules_Marines1",
    "instantEffect": "DestroyRandomModules_Marines",
-   "operation": "",
    "value": 1,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_DestroyRandomModules_Marines2",
    "instantEffect": "DestroyRandomModules_Marines",
-   "operation": "",
    "value": 2,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_DestroyRandomModules_Power2",
    "instantEffect": "DestroyRandomModules_Power",
-   "operation": "",
    "value": 2,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_DestroyRandomModules_Power3",
    "instantEffect": "DestroyRandomModules_Power",
-   "operation": "",
    "value": 3,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_DestroyRandomNumberOfModules1",
    "instantEffect": "DestroyRandomNumberOfModules",
-   "operation": "",
    "value": 1,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_DestroyRandomNumberOfModules2",
    "instantEffect": "DestroyRandomNumberOfModules",
-   "operation": "",
    "value": 2,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_DestroyRandomNumberOfModules3",
    "instantEffect": "DestroyRandomNumberOfModules",
-   "operation": "",
    "value": 3,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_DestroyRandomNumberOfModules4",
    "instantEffect": "DestroyRandomNumberOfModules",
-   "operation": "",
    "value": 4,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_DestroyHabSector",
    "instantEffect": "DestroyHabSector",
-   "operation": "",
-   "value": null,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_DestroyHab",
    "instantEffect": "DestroyHab",
-   "operation": "",
-   "value": null,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_HabDefectsToSecondary",
    "instantEffect": "HabDefectsToSecondary",
-   "operation": "",
-   "value": null,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
    "effectSecondaryTarget": "InputState",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_FreeDailySpaceResources1",
    "instantEffect": "FreeDaysSpaceResourceIncome",
-   "operation": "",
    "value": 1,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_LoseDailySpaceResources1",
    "instantEffect": "LoseDaysSpaceResourceIncome",
-   "operation": "",
    "value": 1,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_IncreaseMineProduction25",
    "instantEffect": "ModifyHabMiningResourceIncomes",
-   "operation": "",
    "value": 0.25,
    "instantRnd": 0.05,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_IncreaseMineProduction50",
    "instantEffect": "ModifyHabMiningResourceIncomes",
-   "operation": "",
    "value": 0.5,
    "instantRnd": 0.05,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_DecreaseMineProduction25",
    "instantEffect": "ModifyHabMiningResourceIncomes",
-   "operation": "",
    "value": -0.25,
    "instantRnd": 0.05,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_DecreaseMineProduction50",
    "instantEffect": "ModifyHabMiningResourceIncomes",
-   "operation": "",
    "value": -0.5,
    "instantRnd": 0.05,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_DecreaseMineProduction75",
    "instantEffect": "ModifyHabMiningResourceIncomes",
-   "operation": "",
    "value": -0.75,
    "instantRnd": 0.05,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_MiningPerformance_LuckyStrike",
-   "instantEffect": "",
    "operation": "Additive",
    "value": 1,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
-   "stackable": null,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "MiningOutputPerformanceRecord",
-      ""
+      "MiningOutputPerformanceRecord"
    ]
 },
  {
    "dataName": "Effect_MiningPerformance_DryHole",
-   "instantEffect": "",
    "operation": "Additive",
    "value": -1,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
-   "stackable": null,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "MiningOutputPerformanceRecord",
-      ""
+      "MiningOutputPerformanceRecord"
    ]
 },
  {
    "dataName": "Effect_IncreaseDebrisInOrbit1",
    "instantEffect": "OrbitDestroyedAssetsChange",
-   "operation": "",
    "value": 1,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_IncreaseDebrisInOrbit3",
    "instantEffect": "OrbitDestroyedAssetsChange",
-   "operation": "",
    "value": 3,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_IncreaseDebrisInOrbit5",
    "instantEffect": "OrbitDestroyedAssetsChange",
-   "operation": "",
    "value": 5,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_DecreaseDebrisInOrbit1",
    "instantEffect": "OrbitDestroyedAssetsChange",
-   "operation": "",
    "value": -1,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_KesslerSyndrome2",
    "instantEffect": "LEODestroyedAssetsChange",
-   "operation": "",
    "value": 2,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_KesslerSyndrome5",
    "instantEffect": "LEODestroyedAssetsChange",
-   "operation": "",
    "value": 5,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_KesslerSyndrome10",
    "instantEffect": "LEODestroyedAssetsChange",
-   "operation": "",
    "value": 10,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_LEOCleanup1",
    "instantEffect": "LEODestroyedAssetsChange",
-   "operation": "",
    "value": -1,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_LEOCleanup3",
    "instantEffect": "LEODestroyedAssetsChange",
-   "operation": "",
    "value": -3,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_LEOCleanup6",
    "instantEffect": "LEODestroyedAssetsChange",
-   "operation": "",
-   "value": -6,
-   "instantRnd": null,
-   "strValue": "",
-   "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
-   "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "value": -6,
+   "effectTarget": "InputState",
+   "effectDuration": "instant",
+   "duration_months": -1
 },
  {
    "dataName": "Effect_GlobalSeaLevelRise_5cm",
    "instantEffect": "GlobalSeaLevelChange_cm",
-   "operation": "",
    "value": 5,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "GlobalEffectSet",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_GlobalSeaLevelRise_10cm",
    "instantEffect": "GlobalSeaLevelChange_cm",
-   "operation": "",
    "value": 10,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "GlobalEffectSet",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_GlobalSeaLevelRise_20cm",
    "instantEffect": "GlobalSeaLevelChange_cm",
-   "operation": "",
    "value": 20,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "GlobalEffectSet",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_GlobalSeaLevelRise_50cm",
    "instantEffect": "GlobalSeaLevelChange_cm",
-   "operation": "",
    "value": 50,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "GlobalEffectSet",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_GlobalSeaLevelRise_120cm",
    "instantEffect": "GlobalSeaLevelChange_cm",
-   "operation": "",
    "value": 120,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "GlobalEffectSet",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_ArmyNuclearHardening25",
-   "instantEffect": "",
    "operation": "Multiplicative",
    "value": 0.75,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
    "initialFactionsStr": [
-      "",
-      ""
+      "AlienCouncil",
+      "AlienCouncil"
    ],
    "contexts": [
-      "ArmyNuclearHardening",
-      ""
+      "ArmyNuclearHardening"
    ]
 },
  {
    "dataName": "Effect_ArmyNuclearHardening50",
-   "instantEffect": "",
    "operation": "Multiplicative",
    "value": 0.5,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
@@ -7681,260 +3677,144 @@
       "AlienCouncil"
    ],
    "contexts": [
-      "ArmyNuclearHardening",
-      ""
+      "ArmyNuclearHardening"
    ]
 },
  {
    "dataName": "Effect_LifeExtension05",
-   "instantEffect": "",
    "operation": "Additive",
    "value": 0.5,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "AllHumanFactions",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "HumanLifespan",
-      ""
+      "HumanLifespan"
    ]
 },
  {
    "dataName": "Effect_LifeExtension10",
-   "instantEffect": "",
    "operation": "Additive",
    "value": 10,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "HumanLifespan",
-      ""
+      "HumanLifespan"
    ]
 },
  {
    "dataName": "Effect_SpawnMegafaunaArmy",
    "instantEffect": "SpawnMegafaunaArmies",
-   "operation": "",
    "value": 1,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_SpawnMegafaunaArmyDamaged25",
    "instantEffect": "SpawnMegafaunaArmyDamaged",
-   "operation": "",
    "value": 0.25,
    "instantRnd": 0.05,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_MissionControlDisruption10_Global",
-   "instantEffect": "",
    "operation": "Multiplicative",
    "value": 0.9,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "AllHumanFactions",
-   "effectSecondaryTarget": "",
    "effectDuration": "temporary",
    "stackable": true,
    "duration_months": 6,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "MissionControlDisruption_PCT",
-      ""
+      "MissionControlDisruption_PCT"
    ]
 },
  {
    "dataName": "Effect_MissionControlDisruption25",
-   "instantEffect": "",
    "operation": "Multiplicative",
    "value": 0.75,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "temporary",
    "stackable": true,
    "duration_months": 6,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "MissionControlDisruption_PCT",
-      ""
+      "MissionControlDisruption_PCT"
    ]
 },
  {
    "dataName": "Effect_MissionControlDisruption50",
-   "instantEffect": "",
    "operation": "Multiplicative",
    "value": 0.5,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "temporary",
    "stackable": true,
    "duration_months": 6,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "MissionControlDisruption_PCT",
-      ""
+      "MissionControlDisruption_PCT"
    ]
 },
  {
    "dataName": "Effect_MissionControlDisruption75",
-   "instantEffect": "",
    "operation": "Multiplicative",
    "value": 0.25,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "temporary",
    "stackable": true,
    "duration_months": 6,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "MissionControlDisruption_PCT",
-      ""
+      "MissionControlDisruption_PCT"
    ]
 },
  {
    "dataName": "Effect_LaunchFacilitiesPriorityDisruption25_6",
-   "instantEffect": "",
    "operation": "Multiplicative",
    "value": 0.75,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "temporary",
    "stackable": true,
    "duration_months": 6,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "LaunchFacilitiesPriority",
-      ""
+      "LaunchFacilitiesPriority"
    ]
 },
  {
    "dataName": "Effect_LaunchFacilitiesPriorityDisruption25_12",
-   "instantEffect": "",
    "operation": "Multiplicative",
    "value": 0.75,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "temporary",
    "stackable": true,
    "duration_months": 12,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "LaunchFacilitiesPriority",
-      ""
+      "LaunchFacilitiesPriority"
    ]
 },
  {
    "dataName": "Effect_PropagandaStrengthMultiplier25",
-   "instantEffect": "",
    "operation": "Multiplicative",
    "value": 1.25,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "PublicCampaignStrength",
-      ""
+      "PublicCampaignStrength"
    ]
 },
  {
    "dataName": "Effect_PropagandaStrengthMultiplier15",
-   "instantEffect": "",
    "operation": "Multiplicative",
    "value": 1.15,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "PublicCampaignStrength",
-      ""
+      "PublicCampaignStrength"
    ]
 },
  {
@@ -7942,52 +3822,26 @@
    "instantEffect": "AlienSpaceResourceSharing",
    "operation": "Multiplicative",
    "value": 10,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
    "effectSecondaryTarget": "AlienFaction",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_AlienSpaceResourceShareMinor",
    "instantEffect": "AlienSpaceResourceSharing",
    "operation": "Multiplicative",
    "value": 3,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
    "effectSecondaryTarget": "AlienFaction",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_ControlPointMaintenanceBonus160",
-   "instantEffect": "",
    "operation": "Additive",
-   "value": -100,
-   "instantRnd": null,
-   "strValue": "",
+   "value": -120,
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
@@ -7996,19 +3850,14 @@
       "AlienCouncil"
    ],
    "contexts": [
-      "ControlPointMaintenance",
-      ""
+      "ControlPointMaintenance"
    ]
 },
  {
    "dataName": "Effect_ControlPointMaintenanceBonus40",
-   "instantEffect": "",
    "operation": "Additive",
-   "value": -25,
-   "instantRnd": null,
-   "strValue": "",
+   "value": -40,
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
@@ -8017,362 +3866,164 @@
       "AlienCouncil"
    ],
    "contexts": [
-      "ControlPointMaintenance",
-      ""
+      "ControlPointMaintenance"
    ]
 },
  {
    "dataName": "Effect_ControlPointMaintenanceBonus20",
-   "instantEffect": "",
    "operation": "Additive",
-   "value": -15,
-   "instantRnd": null,
-   "strValue": "",
+   "value": -20,
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "ControlPointMaintenance",
-      ""
+      "ControlPointMaintenance"
    ]
 },
  {
    "dataName": "Effect_ControlPointMaintenanceBonus10",
-   "instantEffect": "",
    "operation": "Additive",
    "value": -10,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "ControlPointMaintenance",
-      ""
+      "ControlPointMaintenance"
    ]
 },
  {
    "dataName": "Effect_ControlPointMaintenanceBonus3",
-   "instantEffect": "",
    "operation": "Additive",
    "value": -5,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "ControlPointMaintenance",
-      ""
+      "ControlPointMaintenance"
    ]
 },
  {
    "dataName": "Effect_GainXP4",
    "instantEffect": "CouncilorGainsXP",
-   "operation": "",
    "value": 4,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_GainXP10",
    "instantEffect": "CouncilorGainsXP",
-   "operation": "",
    "value": 10,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_GainXP20",
    "instantEffect": "CouncilorGainsXP",
-   "operation": "",
    "value": 20,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_GainXPSecondary20",
    "instantEffect": "CouncilorGainsXP",
-   "operation": "",
    "value": 20,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
    "effectSecondaryTarget": "InputState",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_GainXP60",
    "instantEffect": "CouncilorGainsXP",
-   "operation": "",
    "value": 60,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_GainXPSecondary60",
    "instantEffect": "CouncilorGainsXP",
-   "operation": "",
    "value": 60,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
    "effectSecondaryTarget": "InputState",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_GainTraitIndebted",
    "instantEffect": "CouncilorGainsTrait",
-   "operation": "",
-   "value": null,
-   "instantRnd": null,
    "strValue": "Indebted",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_GainTraitDelinquent",
    "instantEffect": "CouncilorGainsTrait",
-   "operation": "",
-   "value": null,
-   "instantRnd": null,
    "strValue": "Delinquent",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_GainTraitInflexible",
    "instantEffect": "CouncilorGainsTrait",
-   "operation": "",
-   "value": null,
-   "instantRnd": null,
    "strValue": "Inflexible",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_GainTraitAddict",
    "instantEffect": "CouncilorGainsTrait",
-   "operation": "",
-   "value": null,
-   "instantRnd": null,
    "strValue": "Addict",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_GainTraitIndulgent",
    "instantEffect": "CouncilorGainsTrait",
-   "operation": "",
-   "value": null,
-   "instantRnd": null,
    "strValue": "Indulgent",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_CouncilorDetained6",
    "instantEffect": "CouncilorDetained",
-   "operation": "",
    "value": 6,
    "instantRnd": 1,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_SabotageFacilitiesDefense2",
-   "instantEffect": "",
    "operation": "Additive",
    "value": 2,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "Mission_SabotageFacilities_Def",
-      ""
+      "Mission_SabotageFacilities_Def"
    ]
 },
  {
    "dataName": "Effect_SabotageFacilitiesOrHabModulesDefense1",
-   "instantEffect": "",
    "operation": "Additive",
    "value": 1,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
       "Mission_SabotageHabModule_Def",
       "Mission_SabotageFacilities_Def"
@@ -8380,1472 +4031,773 @@
 },
  {
    "dataName": "Effect_StandardLaserDefenses",
-   "instantEffect": "",
    "operation": "IncreaseToValue",
    "value": 1,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "AllHumanFactions",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": false,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "LaserDefenseType",
-      ""
+      "LaserDefenseType"
    ]
 },
  {
    "dataName": "Effect_ArcLaserDefenses",
-   "instantEffect": "",
    "operation": "IncreaseToValue",
    "value": 2,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "AllHumanFactions",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": false,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "LaserDefenseType",
-      ""
+      "LaserDefenseType"
    ]
 },
  {
    "dataName": "Effect_PhaserDefenses",
-   "instantEffect": "",
    "operation": "IncreaseToValue",
    "value": 3,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "AllHumanFactions",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": false,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "LaserDefenseType",
-      ""
+      "LaserDefenseType"
    ]
 },
  {
    "dataName": "Effect_IRLaserDefenses",
-   "instantEffect": "",
    "operation": "IncreaseToValue",
    "value": 0.1,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "AllHumanFactions",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": false,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "LaserDefenseFreq",
-      ""
+      "LaserDefenseFreq"
    ]
 },
  {
    "dataName": "Effect_GreenLaserDefenses",
-   "instantEffect": "",
    "operation": "IncreaseToValue",
    "value": 0.2,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "AllHumanFactions",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": false,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "LaserDefenseFreq",
-      ""
+      "LaserDefenseFreq"
    ]
 },
  {
    "dataName": "Effect_UVLaserDefenses",
-   "instantEffect": "",
    "operation": "IncreaseToValue",
    "value": 0.3,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "AllHumanFactions",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": false,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "LaserDefenseFreq",
-      ""
+      "LaserDefenseFreq"
    ]
 },
  {
    "dataName": "Effect_ArmyHealingRate005",
-   "instantEffect": "",
    "operation": "Additive",
    "value": 0.005,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "ArmyHealRate",
-      ""
+      "ArmyHealRate"
    ]
 },
  {
    "dataName": "Effect_ArmyUrbanWarfare125",
-   "instantEffect": "",
    "operation": "Additive",
    "value": 0.125,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "ArmyUrbanWarfare",
-      ""
+      "ArmyUrbanWarfare"
    ]
 },
  {
    "dataName": "Effect_ArmyRuggedWarfare125",
-   "instantEffect": "",
    "operation": "Additive",
    "value": 0.125,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "ArmyRuggedWarfare",
-      ""
+      "ArmyRuggedWarfare"
    ]
 },
  {
    "dataName": "Effect_BonusDamageToXenoforming",
-   "instantEffect": "",
    "operation": "Multiplicative",
    "value": 1.25,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "XenoformingDestructionStrength",
-      ""
+      "XenoformingDestructionStrength"
    ]
 },
  {
    "dataName": "Effect_ArmyDamageBonustoMegafauna",
-   "instantEffect": "",
    "operation": "Multiplicative",
    "value": 1.25,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "ArmyDamageBonustoMegafauna",
-      ""
+      "ArmyDamageBonustoMegafauna"
    ]
 },
  {
    "dataName": "Effect_ArmyDamageBonustoInvaderArmy",
-   "instantEffect": "",
    "operation": "Multiplicative",
    "value": 1.25,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "ArmyDamageBonustoInvaderArmy",
-      ""
+      "ArmyDamageBonustoInvaderArmy"
    ]
 },
  {
    "dataName": "Effect_ArmyDamageBonustoHumanArmy",
-   "instantEffect": "",
    "operation": "Multiplicative",
    "value": 1.25,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "ArmyDamageBonustoHumanArmy",
-      ""
+      "ArmyDamageBonustoHumanArmy"
    ]
 },
  {
    "dataName": "Effect_ArmyDamageBonustoAllArmies",
-   "instantEffect": "",
    "operation": "Multiplicative",
    "value": 1.1,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "ArmyDamageBonustoAllArmies",
-      ""
+      "ArmyDamageBonustoAllArmies"
    ]
 },
  {
    "dataName": "Effect_MegafaunaDamageMitigation",
-   "instantEffect": "",
    "operation": "Multiplicative",
    "value": 0.5,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "MegafaunaDamageMitigation",
-      ""
+      "MegafaunaDamageMitigation"
    ]
 },
  {
    "dataName": "Effect_MegafaunaDamageElimination",
-   "instantEffect": "",
    "operation": "Multiplicative",
    "value": 0,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "MegafaunaDamageMitigation",
-      ""
+      "MegafaunaDamageMitigation"
    ]
 },
  {
    "dataName": "Effect_MegafaunaRepellent",
-   "instantEffect": "",
    "operation": "SetToFixedValue",
    "value": 1,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": false,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "MegafaunaRepellent",
-      ""
+      "MegafaunaRepellent"
    ]
 },
  {
    "dataName": "Effect_CoupBonus3",
-   "instantEffect": "",
    "operation": "Additive",
    "value": 3,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "Mission_Coup_Att",
-      ""
+      "Mission_Coup_Att"
    ]
 },
  {
    "dataName": "Effect_CrackdownBonus3",
-   "instantEffect": "",
    "operation": "Additive",
    "value": 3,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "Mission_Crackdown_Att",
-      ""
+      "Mission_Crackdown_Att"
    ]
 },
  {
    "dataName": "Effect_CrackdownDefense3",
-   "instantEffect": "",
    "operation": "Additive",
    "value": 3,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "Mission_Crackdown_Def",
-      ""
+      "Mission_Crackdown_Def"
    ]
 },
  {
    "dataName": "Effect_TotalHabMissionControlCost",
-   "instantEffect": "",
    "operation": "Multiplicative",
    "value": 0.85,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "HabMissionControlReduction",
-      ""
+      "HabMissionControlReduction"
    ]
 },
  {
    "dataName": "Effect_TotalShipMissionControlCost",
-   "instantEffect": "",
    "operation": "Multiplicative",
    "value": 0.85,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "ShipMissionControlReduction",
-      ""
+      "ShipMissionControlReduction"
    ]
 },
  {
    "dataName": "Effect_ImprovedSpaceCombatDamageControl5",
-   "instantEffect": "",
    "operation": "Multiplicative",
    "value": 1.05,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "Combat_ShipRepairSpeed",
-      ""
+      "Combat_ShipRepairSpeed"
    ]
 },
  {
    "dataName": "Effect_ImprovedSpaceCombatDamageControl25",
-   "instantEffect": "",
    "operation": "Multiplicative",
    "value": 1.25,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "Combat_ShipRepairSpeed",
-      ""
+      "Combat_ShipRepairSpeed"
    ]
 },
  {
    "dataName": "Effect_ImprovedSpaceCombatDamageControl",
-   "instantEffect": "",
    "operation": "Multiplicative",
    "value": 1.5,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "Combat_ShipRepairSpeed",
-      ""
+      "Combat_ShipRepairSpeed"
    ]
 },
  {
    "dataName": "Effect_ShipLaserDamage",
-   "instantEffect": "",
    "operation": "Multiplicative",
    "value": 1.1,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "ShipLaserDamage",
-      ""
+      "ShipLaserDamage"
    ]
 },
  {
    "dataName": "Effect_ShipMagDamage",
-   "instantEffect": "",
    "operation": "Multiplicative",
    "value": 1.1,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "ShipMagDamage",
-      ""
+      "ShipMagDamage"
    ]
 },
  {
    "dataName": "Effect_ShipConvMissileDamage",
-   "instantEffect": "",
    "operation": "Multiplicative",
    "value": 1.1,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "ShipConvMissileDamage",
-      ""
+      "ShipConvMissileDamage"
    ]
 },
  {
    "dataName": "Effect_MiningWaterBonus",
-   "instantEffect": "",
    "operation": "Multiplicative",
    "value": 1.15,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "MiningWaterBonus",
-      ""
+      "MiningWaterBonus"
    ]
 },
  {
    "dataName": "Effect_MiningVolatilesBonus",
-   "instantEffect": "",
-   "operation": "Multiplicative",
-   "value": 1.15,
-   "instantRnd": null,
-   "strValue": "",
-   "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
-   "effectDuration": "permanent",
-   "stackable": true,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "MiningVolatilesBonus",
-      ""
-   ]
-},
- {
-   "dataName": "Effect_MiningMetalsBonus",
-   "instantEffect": "",
-   "operation": "Multiplicative",
-   "value": 1.15,
-   "instantRnd": null,
-   "strValue": "",
-   "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
-   "effectDuration": "permanent",
-   "stackable": true,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "MiningMetalsBonus",
-      ""
-   ]
-},
- {
-   "dataName": "Effect_MiningNoblesBonus",
-   "instantEffect": "",
-   "operation": "Multiplicative",
-   "value": 1.15,
-   "instantRnd": null,
-   "strValue": "",
-   "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
-   "effectDuration": "permanent",
-   "stackable": true,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "MiningNoblesBonus",
-      ""
-   ]
-},
- {
-   "dataName": "Effect_MiningFissilesBonus",
-   "instantEffect": "",
    "operation": "Multiplicative",
    "value": 1.15,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "MiningFissilesBonus",
-      ""
-   ]
-},
- {
-   "dataName": "Effect_EconomyInequalityReduction",
-   "instantEffect": "",
-   "operation": "Multiplicative",
-   "value": 0.9,
-   "instantRnd": null,
-   "strValue": "",
-   "effectTarget": "AllHumanFactions",
-   "effectSecondaryTarget": "",
-   "effectDuration": "permanent",
-   "stackable": true,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
+   "duration_months": -1,
    "contexts": [
-      "Eco_Inequality",
-      ""
+      "MiningVolatilesBonus"
    ]
 },
  {
-   "dataName": "Effect_WelfareInequalityReductionEffectiveness",
-   "instantEffect": "",
+   "dataName": "Effect_MiningMetalsBonus",
    "operation": "Multiplicative",
-   "value": 1.25,
-   "instantRnd": null,
-   "strValue": "",
-   "effectTarget": "AllHumanFactions",
-   "effectSecondaryTarget": "",
+   "value": 1.15,
+   "effectTarget": "SourceFaction",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "WelfareInequalityReductionBonus",
-      ""
+      "MiningMetalsBonus"
    ]
 },
  {
-   "dataName": "Effect_Economy_CO2_ppm90",
-   "instantEffect": "",
+   "dataName": "Effect_MiningNoblesBonus",
    "operation": "Multiplicative",
-   "value": 0.9,
-   "instantRnd": null,
-   "strValue": "",
-   "effectTarget": "AllHumanFactions",
-   "effectSecondaryTarget": "",
+   "value": 1.15,
+   "effectTarget": "SourceFaction",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "Economy_CO2_ppm",
-      ""
+      "MiningNoblesBonus"
    ]
 },
  {
-   "dataName": "Effect_Economy_CO2_ppm50",
-   "instantEffect": "",
+   "dataName": "Effect_MiningFissilesBonus",
    "operation": "Multiplicative",
-   "value": 0.5,
-   "instantRnd": null,
-   "strValue": "",
-   "effectTarget": "AllHumanFactions",
-   "effectSecondaryTarget": "",
+   "value": 1.15,
+   "effectTarget": "SourceFaction",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "Economy_CO2_ppm",
-      ""
+      "MiningFissilesBonus"
    ]
 },
  {
-   "dataName": "Effect_WelfareReduction_CO2_ppm",
-   "instantEffect": "",
+   "dataName": "Effect_EconomyInequalityReduction",
    "operation": "Multiplicative",
-   "value": 1.1,
-   "instantRnd": null,
-   "strValue": "",
+   "value": 0.9,
    "effectTarget": "AllHumanFactions",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "Welfare_CO2_ppm",
-      ""
+      "Economy_InequalityMultiplier"
    ]
 },
  {
-   "dataName": "Effect_Economy_CH4_ppm",
-   "instantEffect": "",
+   "dataName": "Effect_WelfareInequalityReductionEffectiveness",
    "operation": "Multiplicative",
-   "value": 0.75,
-   "instantRnd": null,
-   "strValue": "",
+   "value": 1.25,
    "effectTarget": "AllHumanFactions",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "Economy_CH4_ppm",
-      ""
+      "WelfareInequalityReductionBonus"
    ]
 },
  {
-   "dataName": "Effect_WelfareReduction_CH4_ppm",
-   "instantEffect": "",
+   "dataName": "Effect_WelfareReduction_CO2_ppm",
    "operation": "Multiplicative",
    "value": 1.1,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "AllHumanFactions",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "Welfare_CH4_ppm",
-      ""
+      "Welfare_CO2_ppm"
    ]
 },
  {
-   "dataName": "Effect_Economy_N2O_ppm",
-   "instantEffect": "",
+   "dataName": "Effect_WelfareReduction_CH4_ppm",
    "operation": "Multiplicative",
-   "value": 0.75,
-   "instantRnd": null,
-   "strValue": "",
+   "value": 1.1,
    "effectTarget": "AllHumanFactions",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "Economy_N2O_ppm",
-      ""
+      "Welfare_CH4_ppm"
    ]
 },
  {
    "dataName": "Effect_WelfareReduction_N2O_ppm",
-   "instantEffect": "",
    "operation": "Multiplicative",
    "value": 1.1,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "AllHumanFactions",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "Welfare_N2O_ppm",
-      ""
+      "Welfare_N2O_ppm"
    ]
 },
  {
    "dataName": "Effect_NuclearStrikeDamageReduction80",
-   "instantEffect": "",
    "operation": "Multiplicative",
    "value": 0.8,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "NuclearStrikeDamageReduction",
-      ""
+      "NuclearStrikeDamageReduction"
    ]
 },
  {
    "dataName": "Effect_RecruitStartingXP",
-   "instantEffect": "",
    "operation": "Additive",
    "value": 40,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "NewCouncilorRecruitXP",
-      ""
+      "NewCouncilorRecruitXP"
    ]
 },
  {
    "dataName": "Effect_Economy_BasePCGDPIncrease02",
-   "instantEffect": "",
    "operation": "Multiplicative",
    "value": 1.02,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "AllHumanFactions",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "Economy_BasePCGDPIncrease",
-      ""
+      "Economy_BasePCGDPIncrease"
    ]
 },
  {
    "dataName": "Effect_Economy_BasePCGDPIncreasePenalty02",
-   "instantEffect": "",
    "operation": "Multiplicative",
    "value": 0.98,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "AllHumanFactions",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "Economy_BasePCGDPIncrease",
-      ""
+      "Economy_BasePCGDPIncrease"
    ]
 },
  {
    "dataName": "Effect_Economy_BasePCGDPIncreaseDisruption08_12",
-   "instantEffect": "",
    "operation": "Multiplicative",
    "value": 0.92,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "AllHumanFactions",
-   "effectSecondaryTarget": "",
    "effectDuration": "temporary",
    "stackable": true,
    "duration_months": 12,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "Economy_BasePCGDPIncrease",
-      ""
+      "Economy_BasePCGDPIncrease"
    ]
 },
  {
    "dataName": "Effect_NuclearWeaponsProgramPenalty50",
-   "instantEffect": "",
    "operation": "Additive",
    "value": -0.5,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "AllHumanFactions",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "BuildNuclearWeaponsPriority",
-      ""
+      "BuildNuclearWeaponsPriority"
    ]
 },
  {
    "dataName": "Effect_MilitaryPriorityPenalty10",
-   "instantEffect": "",
    "operation": "Additive",
    "value": -0.1,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "AllHumanFactions",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "MilitaryPriority",
-      ""
+      "MilitaryPriority"
    ]
 },
  {
    "dataName": "Effect_BuildArmyPriorityPenalty10",
-   "instantEffect": "",
    "operation": "Additive",
    "value": -0.1,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "AllHumanFactions",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "BuildArmyPriority",
-      ""
+      "BuildArmyPriority"
    ]
 },
  {
    "dataName": "Effect_UpgradeArmyPriorityPenalty10",
-   "instantEffect": "",
    "operation": "Additive",
    "value": -0.1,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "AllHumanFactions",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "UpgradeArmyPriority",
-      ""
+      "UpgradeArmyPriority"
    ]
 },
  {
    "dataName": "Effect_ArmyBombardmentDefenses",
-   "instantEffect": "",
    "operation": "Multiplicative",
    "value": 0.75,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "BombardmentArmyDefenseBonus",
-      ""
+      "BombardmentArmyDefenseBonus"
    ]
 },
  {
    "dataName": "Effect_HabBombardmentDefenses",
-   "instantEffect": "",
    "operation": "Multiplicative",
    "value": 0.75,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "BombardmentHabDefenseBonus",
-      ""
+      "BombardmentHabDefenseBonus"
    ]
 },
  {
    "dataName": "Effect_TerrorKnowledge",
-   "instantEffect": "",
    "operation": "Additive",
    "value": 3,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "Mission_Terrorize_Def",
-      ""
+      "Mission_Terrorize_Def"
    ]
 },
  {
    "dataName": "Effect_AssaultAlienAssetKnowledge",
-   "instantEffect": "",
    "operation": "Additive",
    "value": 3,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "Mission_AssaultAlienAsset_Att",
-      ""
+      "Mission_AssaultAlienAsset_Att"
    ]
 },
  {
    "dataName": "Effect_CounterXenoforming",
-   "instantEffect": "",
    "operation": "Additive",
    "value": 2,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "Mission_Xenoform_Def",
-      ""
+      "Mission_Xenoform_Def"
    ]
 },
  {
    "dataName": "Effect_FocusedDefenses",
-   "instantEffect": "",
    "operation": "Multiplicative",
    "value": 0.95,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "DamageReductionAgainstAlienShips",
-      ""
+      "DamageReductionAgainstAlienShips"
    ]
 },
  {
    "dataName": "Effect_SurvivabilityUpgrades",
-   "instantEffect": "",
    "operation": "Multiplicative",
    "value": 0.95,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "DamageReductionAgainstAllShips",
-      ""
+      "DamageReductionAgainstAllShips"
    ]
 },
  {
    "dataName": "Effect_SeizeSpaceAssetAttack_Griffin",
-   "instantEffect": "",
    "operation": "Additive",
    "value": 3,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "Mission_SeizeSpaceAsset_Att",
-      ""
+      "Mission_SeizeSpaceAsset_Att"
    ]
 },
  {
    "dataName": "Effect_SeizeSpaceAssetDefense_Griffin",
-   "instantEffect": "",
    "operation": "Additive",
    "value": 3,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "Mission_SeizeSpaceAsset_Def",
-      ""
+      "Mission_SeizeSpaceAsset_Def"
    ]
 },
  {
    "dataName": "Effect_DamageArmy10",
    "instantEffect": "ArmyStrengthChange",
-   "operation": "",
    "value": 0.1,
    "instantRnd": 0.1,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_DamageArmy15",
    "instantEffect": "ArmyStrengthChange",
-   "operation": "",
    "value": 0.15,
    "instantRnd": 0.1,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_DamageArmy20",
    "instantEffect": "ArmyStrengthChange",
-   "operation": "",
    "value": 0.2,
    "instantRnd": 0.15,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_DamageArmy30",
    "instantEffect": "ArmyStrengthChange",
-   "operation": "",
    "value": 0.3,
    "instantRnd": 0.2,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_DamageArmy40",
    "instantEffect": "ArmyStrengthChange",
-   "operation": "",
    "value": 0.4,
    "instantRnd": 0.25,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_RepairArmy20",
    "instantEffect": "ArmyStrengthChange",
-   "operation": "",
    "value": -0.2,
    "instantRnd": 0.15,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_DamageAllRegionArmies10",
    "instantEffect": "DamageAllRegionArmies",
-   "operation": "",
    "value": 0.1,
    "instantRnd": 0.05,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_MegafaunaMastery",
-   "instantEffect": "",
    "operation": "Additive",
    "value": 0.1,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "MegafaunaMastery",
-      ""
+      "MegafaunaMastery"
    ]
 },
  {
    "dataName": "Effect_SpoilsBonus20",
-   "instantEffect": "",
    "operation": "Multiplicative",
    "value": 1.2,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "SpoilsOutput",
-      ""
+      "SpoilsOutput"
    ]
 },
  {
    "dataName": "Effect_CorruptionReduction20",
-   "instantEffect": "",
    "operation": "Multiplicative",
    "value": 0.8,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "Corruption",
-      ""
+      "Corruption"
    ]
 },
  {
@@ -9853,2015 +4805,934 @@
    "instantEffect": "EndofOil",
    "operation": "SetToFixedValue",
    "value": 1,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "GlobalEffectSet",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_DummyTooltipImprovedMaintenanceProcedures1",
-   "instantEffect": "",
-   "operation": "",
-   "value": null,
-   "instantRnd": null,
-   "strValue": "",
+   "instantEffect": "DummyInstantEffect",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_DummyTooltipImprovedMaintenanceProcedures2",
-   "instantEffect": "",
-   "operation": "",
-   "value": null,
-   "instantRnd": null,
-   "strValue": "",
+   "instantEffect": "DummyInstantEffect",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_DummyTooltipDevolvedSpaceCommand1",
-   "instantEffect": "",
-   "operation": "",
-   "value": null,
-   "instantRnd": null,
-   "strValue": "",
+   "instantEffect": "DummyInstantEffect",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_DummyTooltipDevolvedSpaceCommand2",
-   "instantEffect": "",
-   "operation": "",
-   "value": null,
-   "instantRnd": null,
-   "strValue": "",
+   "instantEffect": "DummyInstantEffect",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_DummyTooltipInSituResourceUtilization1",
-   "instantEffect": "",
-   "operation": "",
-   "value": null,
-   "instantRnd": null,
-   "strValue": "",
+   "instantEffect": "DummyInstantEffect",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_DummyTooltipInSituResourceUtilization2",
-   "instantEffect": "",
-   "operation": "",
-   "value": null,
-   "instantRnd": null,
-   "strValue": "",
+   "instantEffect": "DummyInstantEffect",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_ShipDefectsToSecondary",
    "instantEffect": "ShipDefectsToSecondary",
-   "operation": "",
-   "value": null,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
    "effectSecondaryTarget": "InputState",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_DestroyShip",
    "instantEffect": "DestroyShip",
-   "operation": "",
-   "value": null,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_CouncilorSelfDetained4",
    "instantEffect": "CouncilorDetained",
-   "operation": "",
    "value": 4,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_CouncilorSelfDetainedSecondary6",
    "instantEffect": "CouncilorDetained",
-   "operation": "",
    "value": 6,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
    "effectSecondaryTarget": "InputState",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_CouncilorGoesToGround",
    "instantEffect": "CouncilorInHiding",
-   "operation": "",
-   "value": null,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_LoyaltyGain1",
    "instantEffect": "CouncilorModifyAttribute",
-   "operation": "",
    "value": 1,
-   "instantRnd": null,
    "strValue": "Loyalty",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_LoyaltyGainSecondary1",
    "instantEffect": "CouncilorModifyAttribute",
-   "operation": "",
    "value": 1,
-   "instantRnd": null,
    "strValue": "Loyalty",
    "effectTarget": "InputState",
    "effectSecondaryTarget": "InputState",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_LoyaltyGain3",
    "instantEffect": "CouncilorModifyAttribute",
-   "operation": "",
    "value": 3,
-   "instantRnd": null,
    "strValue": "Loyalty",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_LoyaltyGainSecondary3",
    "instantEffect": "CouncilorModifyAttribute",
-   "operation": "",
    "value": 3,
-   "instantRnd": null,
    "strValue": "Loyalty",
    "effectTarget": "InputState",
    "effectSecondaryTarget": "InputState",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_LoyaltyLoss3",
    "instantEffect": "CouncilorModifyAttribute",
-   "operation": "",
    "value": -3,
-   "instantRnd": null,
    "strValue": "Loyalty",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_LoyaltyLossSecondary3",
    "instantEffect": "CouncilorModifyAttribute",
-   "operation": "",
    "value": -3,
-   "instantRnd": null,
    "strValue": "Loyalty",
    "effectTarget": "InputState",
    "effectSecondaryTarget": "InputState",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_LoyaltyLoss4",
    "instantEffect": "CouncilorModifyAttribute",
-   "operation": "",
    "value": -4,
-   "instantRnd": null,
    "strValue": "Loyalty",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_LoyaltyLossSecondary4",
    "instantEffect": "CouncilorModifyAttribute",
-   "operation": "",
    "value": -4,
-   "instantRnd": null,
    "strValue": "Loyalty",
    "effectTarget": "InputState",
    "effectSecondaryTarget": "InputState",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_LoyaltyLoss6",
    "instantEffect": "CouncilorModifyAttribute",
-   "operation": "",
    "value": -6,
-   "instantRnd": null,
    "strValue": "Loyalty",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_LoyaltyLossSecondary6",
    "instantEffect": "CouncilorModifyAttribute",
-   "operation": "",
    "value": -6,
-   "instantRnd": null,
    "strValue": "Loyalty",
    "effectTarget": "InputState",
    "effectSecondaryTarget": "InputState",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_ApparentLoyaltyGain1",
    "instantEffect": "CouncilorModifyAttribute",
-   "operation": "",
    "value": 1,
-   "instantRnd": null,
    "strValue": "ApparentLoyalty",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_ApparentLoyaltyGainSecondary1",
    "instantEffect": "CouncilorModifyAttribute",
-   "operation": "",
    "value": 1,
-   "instantRnd": null,
    "strValue": "ApparentLoyalty",
    "effectTarget": "InputState",
    "effectSecondaryTarget": "InputState",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_ApparentLoyaltyGain3",
    "instantEffect": "CouncilorModifyAttribute",
-   "operation": "",
    "value": 3,
-   "instantRnd": null,
    "strValue": "ApparentLoyalty",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_ApparentLoyaltyGainSecondary3",
    "instantEffect": "CouncilorModifyAttribute",
-   "operation": "",
    "value": 3,
-   "instantRnd": null,
-   "strValue": "ApparentLoyalty",
-   "effectTarget": "InputState",
-   "effectSecondaryTarget": "InputState",
-   "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "strValue": "ApparentLoyalty",
+   "effectTarget": "InputState",
+   "effectSecondaryTarget": "InputState",
+   "effectDuration": "instant",
+   "duration_months": -1
 },
  {
    "dataName": "Effect_ApparentLoyaltyLoss3",
    "instantEffect": "CouncilorModifyAttribute",
-   "operation": "",
    "value": -3,
-   "instantRnd": null,
    "strValue": "ApparentLoyalty",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_ApparentLoyaltyLossSecondary3",
    "instantEffect": "CouncilorModifyAttribute",
-   "operation": "",
    "value": -3,
-   "instantRnd": null,
    "strValue": "ApparentLoyalty",
    "effectTarget": "InputState",
    "effectSecondaryTarget": "InputState",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_ApparentLoyaltyLoss4",
    "instantEffect": "CouncilorModifyAttribute",
-   "operation": "",
    "value": -4,
-   "instantRnd": null,
    "strValue": "ApparentLoyalty",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_ApparentLoyaltyLossSecondary4",
    "instantEffect": "CouncilorModifyAttribute",
-   "operation": "",
    "value": -4,
-   "instantRnd": null,
    "strValue": "ApparentLoyalty",
    "effectTarget": "InputState",
    "effectSecondaryTarget": "InputState",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_ApparentLoyaltyLoss6",
    "instantEffect": "CouncilorModifyAttribute",
-   "operation": "",
    "value": -6,
-   "instantRnd": null,
    "strValue": "ApparentLoyalty",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_ApparentLoyaltyLossSecondary6",
    "instantEffect": "CouncilorModifyAttribute",
-   "operation": "",
    "value": -6,
-   "instantRnd": null,
    "strValue": "ApparentLoyalty",
    "effectTarget": "InputState",
    "effectSecondaryTarget": "InputState",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_DamageShipParts_Marines05",
    "instantEffect": "DamageShipParts_Marines",
-   "operation": "",
    "value": 0.5,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_AlienECM",
-   "instantEffect": "",
-   "operation": "",
    "value": 1,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
-   "stackable": null,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "HumanECMAgainstAliens",
-      ""
+      "HumanECMAgainstAliens"
    ]
 },
  {
    "dataName": "Effect_GlobalEnergyCrisis1",
    "instantEffect": "EnergyCrisis",
-   "operation": "",
    "value": 1,
    "instantRnd": 0.4,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_GlobalEnergyCrisis075",
    "instantEffect": "EnergyCrisis",
-   "operation": "",
    "value": 0.75,
    "instantRnd": 0.4,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_GlobalEnergyCrisis066",
    "instantEffect": "EnergyCrisis",
-   "operation": "",
    "value": 0.66,
    "instantRnd": 0.4,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_GlobalEnergyCrisis05",
    "instantEffect": "EnergyCrisis",
-   "operation": "",
    "value": 0.5,
    "instantRnd": 0.4,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_GlobalEnergyCrisis025",
    "instantEffect": "EnergyCrisis",
-   "operation": "",
    "value": 0.25,
    "instantRnd": 0.4,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_InterrogationTechniques25",
-   "instantEffect": "",
    "operation": "Multiplicative",
    "value": 1.25,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
-   "stackable": null,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "InterrogationBonus",
-      ""
+      "InterrogationBonus"
    ]
 },
  {
    "dataName": "Effect_InterrogationTechniques100",
-   "instantEffect": "",
    "operation": "Multiplicative",
    "value": 2,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
-   "stackable": null,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "InterrogationBonus",
-      ""
+      "InterrogationBonus"
    ]
 },
  {
    "dataName": "Effect_AddTraitGroup5",
    "instantEffect": "CouncilorGainsTraitGroup",
-   "operation": "",
    "value": 5,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_RemoveTraitGroup5",
    "instantEffect": "CouncilorLosesTraitGroup",
-   "operation": "",
    "value": 5,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_AddTraitGroup9",
    "instantEffect": "CouncilorGainsTraitGroup",
-   "operation": "",
    "value": 9,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_BuddyMovieFlag",
-   "instantEffect": "",
    "operation": "SetToFixedValue",
    "value": 1,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": false,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "BuddyMovie",
-      ""
+      "BuddyMovie"
    ]
 },
  {
    "dataName": "Effect_PropagandaCouncilorHome25",
    "instantEffect": "CouncilorHomeNationPropaganda",
-   "operation": "",
    "value": 25,
    "instantRnd": 0.5,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_NegativePropagandaCouncilorHome10",
    "instantEffect": "CouncilorHomeNationPropaganda",
-   "operation": "",
    "value": -10,
    "instantRnd": 0.5,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_NegativePropagandaCouncilorHome25",
    "instantEffect": "CouncilorHomeNationPropaganda",
-   "operation": "",
    "value": -25,
    "instantRnd": 0.5,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_PropagandaCouncilorHomeSecondary25",
    "instantEffect": "CouncilorHomeNationPropaganda",
-   "operation": "",
    "value": 25,
    "instantRnd": 0.5,
-   "strValue": "",
    "effectTarget": "InputState",
    "effectSecondaryTarget": "InputState",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_NegativePropagandaCouncilorHomeSecondary10",
    "instantEffect": "CouncilorHomeNationPropaganda",
-   "operation": "",
    "value": -10,
    "instantRnd": 0.5,
-   "strValue": "",
    "effectTarget": "InputState",
    "effectSecondaryTarget": "InputState",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_NegativePropagandaCouncilorHomeSecondary25",
    "instantEffect": "CouncilorHomeNationPropaganda",
-   "operation": "",
    "value": -25,
    "instantRnd": 0.5,
-   "strValue": "",
    "effectTarget": "InputState",
    "effectSecondaryTarget": "InputState",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_GlobalCrackdown50_Secondary",
    "instantEffect": "GlobalCrackdown",
-   "operation": "",
    "value": 0.5,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
    "effectSecondaryTarget": "InputState",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_CouncilorHomeNationsImproveRelations",
    "instantEffect": "CouncilorHomeNationsImproveRelations",
-   "operation": "",
-   "value": null,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
    "effectSecondaryTarget": "InputState",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_KillCouncilor",
    "instantEffect": "CouncilorKilled",
-   "operation": "",
-   "value": null,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_KillCouncilorSecondary",
    "instantEffect": "CouncilorKilled",
-   "operation": "",
-   "value": null,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
    "effectSecondaryTarget": "InputState",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_KillCouncilorNoSave",
    "instantEffect": "CouncilorKilled_NoProtection",
-   "operation": "",
-   "value": null,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_RetireCouncilor",
    "instantEffect": "CouncilorKilled_NoProtection_Nonviolent",
-   "operation": "",
-   "value": null,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_LoseRandomNumberOfOrgs3",
    "instantEffect": "CouncilorLosesOrgs",
-   "operation": "",
    "value": 3,
    "instantRnd": 0.5,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_LoseTraitGovernment",
    "instantEffect": "CouncilorLosesTrait",
-   "operation": "",
-   "value": null,
-   "instantRnd": null,
    "strValue": "Government",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_GainTraitEnemyOfTheState",
    "instantEffect": "CouncilorGainsTrait",
-   "operation": "",
-   "value": null,
-   "instantRnd": null,
    "strValue": "EnemyoftheState",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_GainTraitExtorted",
    "instantEffect": "CouncilorGainsTrait",
-   "operation": "",
-   "value": null,
-   "instantRnd": null,
    "strValue": "Extorted",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_RegionGDPGainSpain",
-   "instantEffect": "RegionGDPPctChange_StrValue",
-   "operation": "",
+   "instantEffect": "MapRegionGDPPctChange_StrValue",
    "value": 0.1,
    "instantRnd": 0.1,
-   "strValue": "Spain",
+   "strValue": "map_Spain",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_RegionGDPGainRabat",
-   "instantEffect": "RegionGDPPctChange_StrValue",
-   "operation": "",
+   "instantEffect": "MapRegionGDPPctChange_StrValue",
    "value": 0.1,
    "instantRnd": 0.1,
-   "strValue": "Rabat",
+   "strValue": "map_Morocco",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
-   "dataName": "Effect_RegionGDPGainYemen",
-   "instantEffect": "RegionGDPPctChange_StrValue",
-   "operation": "",
+   "dataName": "Effect_RegionGDPGainAden",
+   "instantEffect": "MapRegionGDPPctChange_StrValue",
    "value": 0.2,
    "instantRnd": 0.1,
-   "strValue": "Yemen",
+   "strValue": "map_Aden",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
-   "dataName": "Effect_RegionGDPGainMekelle",
-   "instantEffect": "RegionGDPPctChange_StrValue",
-   "operation": "",
+   "dataName": "Effect_RegionGDPGainDjibouti",
+   "instantEffect": "MapRegionGDPPctChange_StrValue",
    "value": 0.2,
    "instantRnd": 0.1,
-   "strValue": "Mekelle",
+   "strValue": "map_Djibouti",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_RegionGDPGainJava",
-   "instantEffect": "RegionGDPPctChange_StrValue",
-   "operation": "",
+   "instantEffect": "MapRegionGDPPctChange_StrValue",
    "value": 0.1,
    "instantRnd": 0.1,
-   "strValue": "Java",
+   "strValue": "map_Java",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_RegionGDPGainSumatra",
-   "instantEffect": "RegionGDPPctChange_StrValue",
-   "operation": "",
+   "instantEffect": "MapRegionGDPPctChange_StrValue",
    "value": 0.1,
    "instantRnd": 0.1,
-   "strValue": "Sumatra",
+   "strValue": "map_Sumatra",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_RegionGDPGainHijaz",
-   "instantEffect": "RegionGDPPctChange_StrValue",
-   "operation": "",
+   "instantEffect": "MapRegionGDPPctChange_StrValue",
    "value": 0.1,
    "instantRnd": 0.1,
-   "strValue": "Hijaz",
+   "strValue": "map_Hijaz",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
-   "dataName": "Effect_RegionGDPGainEgypt",
-   "instantEffect": "RegionGDPPctChange_StrValue",
-   "operation": "",
+   "dataName": "Effect_RegionGDPGainCairo",
+   "instantEffect": "MapRegionGDPPctChange_StrValue",
    "value": 0.1,
    "instantRnd": 0.1,
-   "strValue": "Egypt",
+   "strValue": "map_Egypt",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_RegionGDPGainAfghanistan",
-   "instantEffect": "RegionGDPPctChange_StrValue",
-   "operation": "",
+   "instantEffect": "MapRegionGDPPctChange_StrValue",
    "value": 0.1,
    "instantRnd": 0.1,
-   "strValue": "Afghanistan",
+   "strValue": "map_Afghanistan",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_RegionGDPGainXinjiang",
-   "instantEffect": "RegionGDPPctChange_StrValue",
-   "operation": "",
+   "instantEffect": "MapRegionGDPPctChange_StrValue",
    "value": 0.1,
    "instantRnd": 0.1,
-   "strValue": "Xinjiang",
+   "strValue": "map_Xinjiang",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_RegionGDPGainPanama",
-   "instantEffect": "RegionGDPPctChange_StrValue",
-   "operation": "",
+   "instantEffect": "MapRegionGDPPctChange_StrValue",
    "value": 0.1,
    "instantRnd": 0.1,
-   "strValue": "Panama",
+   "strValue": "map_Panama",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_RegionGDPGainColombia",
-   "instantEffect": "RegionGDPPctChange_StrValue",
-   "operation": "",
+   "instantEffect": "MapRegionGDPPctChange_StrValue",
    "value": 0.1,
    "instantRnd": 0.1,
-   "strValue": "Colombia",
+   "strValue": "map_Colombia",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_RegionGDPGainTibet",
-   "instantEffect": "RegionGDPPctChange_StrValue",
-   "operation": "",
+   "instantEffect": "MapRegionGDPPctChange_StrValue",
    "value": 0.1,
    "instantRnd": 0.1,
-   "strValue": "Tibet",
+   "strValue": "map_Tibet",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
+},
+ {
+   "dataName": "Effect_RegionGDPGainUpperMyanmar",
+   "instantEffect": "MapRegionGDPPctChange_StrValue",
+   "value": 0.1,
+   "instantRnd": 0.1,
+   "strValue": "map_UpperMyanmar",
+   "effectTarget": "InputState",
+   "effectDuration": "instant",
+   "duration_months": -1
+},
+ {
+   "dataName": "Effect_RegionGDPGainAlaska",
+   "instantEffect": "MapRegionGDPPctChange_StrValue",
+   "value": 0.1,
+   "instantRnd": 0.1,
+   "strValue": "map_Alaska",
+   "effectTarget": "InputState",
+   "effectDuration": "instant",
+   "duration_months": -1
+},
+ {
+   "dataName": "Effect_RegionGDPGainKamchatka",
+   "instantEffect": "MapRegionGDPPctChange_StrValue",
+   "value": 0.1,
+   "instantRnd": 0.1,
+   "strValue": "map_Kamchatka",
+   "effectTarget": "InputState",
+   "effectDuration": "instant",
+   "duration_months": -1
+},
+ {
+   "dataName": "Effect_RegionGDPGainMalayPeninsula",
+   "instantEffect": "MapRegionGDPPctChange_StrValue",
+   "value": 0.1,
+   "instantRnd": 0.1,
+   "strValue": "map_MalayPeninsula",
+   "effectTarget": "InputState",
+   "effectDuration": "instant",
+   "duration_months": -1
 },
  {
-   "dataName": "Effect_RegionGDPGainMyanmar",
-   "instantEffect": "RegionGDPPctChange_StrValue",
-   "operation": "",
+   "dataName": "Effect_RegionGDPGainSriLanka",
+   "instantEffect": "MapRegionGDPPctChange_StrValue",
    "value": 0.1,
    "instantRnd": 0.1,
-   "strValue": "Myanmar",
+   "strValue": "map_SriLanka",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
-   "dataName": "Effect_RegionGDPGainAlaska",
-   "instantEffect": "RegionGDPPctChange_StrValue",
-   "operation": "",
+   "dataName": "Effect_RegionGDPGainChennai",
+   "instantEffect": "MapRegionGDPPctChange_StrValue",
    "value": 0.1,
    "instantRnd": 0.1,
-   "strValue": "Alaska",
+   "strValue": "map_Chennai",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
-   "dataName": "Effect_RegionGDPGainRussianFarEast",
-   "instantEffect": "RegionGDPPctChange_StrValue",
-   "operation": "",
+   "dataName": "Effect_RegionGDPGainScotland",
+   "instantEffect": "MapRegionGDPPctChange_StrValue",
    "value": 0.1,
    "instantRnd": 0.1,
-   "strValue": "RussianFarEast",
+   "strValue": "map_Scotland",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
-   "dataName": "Effect_RegionGDPGainMalayPeninsula",
-   "instantEffect": "RegionGDPPctChange_StrValue",
-   "operation": "",
+   "dataName": "Effect_RegionGDPGainNorthernIreland",
+   "instantEffect": "MapRegionGDPPctChange_StrValue",
    "value": 0.1,
    "instantRnd": 0.1,
-   "strValue": "MalayPeninsula",
+   "strValue": "map_NorthernIreland",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_RegionMinorGDPGain",
    "instantEffect": "RegionGDPPctChange",
-   "operation": "",
    "value": 0.01,
    "instantRnd": 0.01,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_RegionGDPGain",
    "instantEffect": "RegionGDPPctChange",
-   "operation": "",
    "value": 0.025,
    "instantRnd": 0.025,
-   "strValue": "",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_MCUsageMasking",
-   "instantEffect": "",
    "operation": "Multiplicative",
    "value": 0.8,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "AlienHateFromMCUsage",
-      ""
+      "AlienHateFromMCUsage"
    ]
 },
  {
    "dataName": "Effect_FreeXenoInvestigations10",
    "instantEffect": "FactionInvestigationsChange",
-   "operation": "",
    "value": 10,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_TriggerEventHabRevolt",
    "instantEffect": "TriggerNarrativeEvent_StrValue",
-   "operation": "",
    "value": 0,
-   "instantRnd": null,
    "strValue": "event_HabRevolt",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_EnthrallPublicDefense",
-   "instantEffect": "",
    "operation": "Additive",
    "value": 2,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "Mission_EnthrallPublic_Def",
-      ""
+      "Mission_EnthrallPublic_Def"
    ]
 },
  {
    "dataName": "Effect_AbductionsDefense",
-   "instantEffect": "",
    "operation": "Additive",
    "value": 3,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "Mission_Abductions_Def",
-      ""
+      "Mission_Abductions_Def"
    ]
 },
  {
    "dataName": "Effect_UpdateAlienThreatMeter",
    "instantEffect": "UpdateAlienThreatMeter",
-   "operation": "",
-   "value": null,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_FixAlienThreatMeter",
    "instantEffect": "UpdateAlienThreatMeter_Accurate",
-   "operation": "",
-   "value": null,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_HackProject_Steal",
-   "instantEffect": "",
    "operation": "Additive",
    "value": 3,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
-   "stackable": null,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "Mission_StealProject_Att",
-      ""
+      "Mission_StealProject_Att"
    ]
 },
  {
    "dataName": "Effect_HackProject_Sabotage",
-   "instantEffect": "",
    "operation": "Additive",
    "value": 3,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "Mission_SabotageProject_Att",
-      ""
+      "Mission_SabotageProject_Att"
    ]
 },
  {
    "dataName": "Effect_InspireBonus",
-   "instantEffect": "",
    "operation": "Additive",
    "value": 3,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "Mission_Inspire_Att",
-      ""
+      "Mission_Inspire_Att"
    ]
 },
  {
    "dataName": "Effect_TurnBonus",
-   "instantEffect": "",
    "operation": "Additive",
    "value": 3,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "Mission_Trait_Att",
-      ""
+      "Mission_Turn_Att"
    ]
 },
  {
    "dataName": "Effect_LoseTraitDeclining",
    "instantEffect": "CouncilorLosesTrait",
-   "operation": "",
-   "value": null,
-   "instantRnd": null,
    "strValue": "Declining",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_EaseAbductions",
-   "instantEffect": "",
    "operation": "Additive",
    "value": 5,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "GlobalEffectSet",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "Mission_Abductions_Att ",
-      ""
+      "Mission_Abductions_Att"
    ]
 },
  {
    "dataName": "Effect_SpaceResearchBoost05",
-   "instantEffect": "",
    "operation": "Multiplicative",
    "value": 1.01,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "HabResearchProduction",
-      ""
+      "HabResearchProduction"
    ]
 },
  {
    "dataName": "Effect_SpaceResearchBoost1",
-   "instantEffect": "",
    "operation": "Multiplicative",
    "value": 1.02,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "HabResearchProduction",
-      ""
+      "HabResearchProduction"
    ]
 },
  {
    "dataName": "Effect_BlockAlienContact",
-   "instantEffect": "",
    "operation": "SetToFixedValue",
    "value": 1,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": false,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "CanContactAliens",
-      ""
+      "CanContactAliens"
    ]
 },
  {
@@ -11869,461 +5740,350 @@
    "instantEffect": "SetAlienHate",
    "operation": "SetToFixedValue",
    "value": 0,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_GainTraitLoyaltyMonitor",
    "instantEffect": "CouncilorGainsTrait",
-   "operation": "",
-   "value": null,
-   "instantRnd": null,
    "strValue": "LoyaltyMonitor",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_HabNuclearFreighters",
-   "instantEffect": "",
    "operation": "SetToFixedValue",
    "value": 1,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": false,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "HabNuclearFreighters",
-      ""
+      "HabNuclearFreighters"
    ]
 },
  {
    "dataName": "Effect_VaccineTrackers",
-   "instantEffect": "",
    "operation": "SetToFixedValue",
    "value": 1,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": false,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "VaccineChips",
-      ""
+      "VaccineChips"
    ]
 },
  {
    "dataName": "Effect_LiedAboutInfluence",
-   "instantEffect": "",
    "operation": "SetToFixedValue",
    "value": 1,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": false,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "InfluenceLies",
-      ""
+      "InfluenceLies"
    ]
 },
  {
    "dataName": "Effect_LoseTraitBillionaire",
    "instantEffect": "CouncilorLosesTrait",
-   "operation": "",
-   "value": null,
-   "instantRnd": null,
    "strValue": "Billionaire",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_GainTraitProsperous",
    "instantEffect": "CouncilorGainsTrait",
-   "operation": "",
-   "value": null,
-   "instantRnd": null,
    "strValue": "Prosperous",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_GainTraitBeloved",
    "instantEffect": "CouncilorGainsTrait",
-   "operation": "",
-   "value": null,
-   "instantRnd": null,
    "strValue": "Beloved",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_LoseTraitMarked",
    "instantEffect": "CouncilorLosesTrait",
-   "operation": "",
-   "value": null,
-   "instantRnd": null,
    "strValue": "Marked",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_GainTraitMarked",
    "instantEffect": "CouncilorGainsTrait",
-   "operation": "",
-   "value": null,
-   "instantRnd": null,
    "strValue": "Marked",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_FakedDeath",
-   "instantEffect": "",
    "operation": "SetToFixedValue",
    "value": 1,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": false,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "FakedDeath",
-      ""
+      "FakedDeath"
    ]
 },
  {
    "dataName": "Effect_MarkedChain",
-   "instantEffect": "",
    "operation": "SetToFixedValue",
    "value": 1,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": false,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "MarkedChain",
-      ""
+      "MarkedChain"
    ]
 },
  {
    "dataName": "Effect_MarkedCombatChain",
-   "instantEffect": "",
    "operation": "SetToFixedValue",
    "value": 1,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": false,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "MarkedCombatChain",
-      ""
+      "MarkedCombatChain"
    ]
 },
  {
    "dataName": "Effect_InfiltratedChain",
-   "instantEffect": "",
    "operation": "SetToFixedValue",
    "value": 1,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": false,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "InfiltratedChain",
-      ""
+      "InfiltratedChain"
    ]
 },
  {
    "dataName": "Effect_InfiltratedCombatChain",
-   "instantEffect": "",
    "operation": "SetToFixedValue",
    "value": 1,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": false,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "InfiltratedCombatChain",
-      ""
+      "InfiltratedCombatChain"
    ]
 },
  {
    "dataName": "Effect_InfiltratedMoneyChain",
-   "instantEffect": "",
    "operation": "SetToFixedValue",
    "value": 1,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": false,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "InfiltratedMoneyChain",
-      ""
+      "InfiltratedMoneyChain"
    ]
 },
  {
    "dataName": "Effect_InfiltratedInfluenceChain",
-   "instantEffect": "",
    "operation": "SetToFixedValue",
    "value": 1,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
    "stackable": false,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "InfiltratedInfluenceChain",
-      ""
+      "InfiltratedInfluenceChain"
    ]
 },
  {
    "dataName": "Effect_IncreaseInfiltratedCount",
-   "instantEffect": "",
    "operation": "Additive",
    "value": 1,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "permanent",
-   "stackable": false,
+   "stackable": true,
    "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
    "contexts": [
-      "InfiltratedCount",
-      ""
+      "InfiltratedCount"
    ]
 },
  {
    "dataName": "Effect_EndInfiltratedChain",
    "instantEffect": "RemoveEffectFromFaction",
-   "operation": "",
-   "value": null,
-   "instantRnd": null,
    "strValue": "Effect_InfiltratedChain",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
    "stackable": false,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_GainTraitAce",
    "instantEffect": "CouncilorGainsTrait",
-   "operation": "",
-   "value": null,
-   "instantRnd": null,
    "strValue": "AceAssassin",
    "effectTarget": "InputState",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
-   "stackable": null,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_RemoveLiedAboutInfluence",
    "instantEffect": "RemoveEffectFromFaction",
-   "operation": "",
    "value": 1,
-   "instantRnd": null,
    "strValue": "Effect_LiedAboutInfluence",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
    "effectDuration": "instant",
    "stackable": false,
-   "duration_months": -1,
-   "initialFactionsStr": [
-      "",
-      ""
-   ],
-   "contexts": [
-      "",
-      ""
-   ]
+   "duration_months": -1
 },
  {
    "dataName": "Effect_IncreaseMonthlyProjectTriggerChance01",
-   "instantEffect": "",
    "operation": "Additive",
    "value": 0.01,
-   "instantRnd": null,
-   "strValue": "",
    "effectTarget": "SourceFaction",
-   "effectSecondaryTarget": "",
+   "effectDuration": "permanent",
+   "stackable": false,
+   "duration_months": -1,
+   "contexts": [
+      "MonthlyProjectTriggerChance"
+   ]
+},
+ {
+   "dataName": "Effect_TargetingComputer1",
+   "operation": "SetToFixedValue",
+   "value": 0.1,
+   "effectTarget": "SourceFaction",
+   "effectDuration": "permanent",
+   "stackable": false,
+   "duration_months": -1,
+   "contexts": [
+      "TargetingComputerBonus"
+   ]
+},
+ {
+   "dataName": "Effect_TargetingComputer2",
+   "operation": "SetToFixedValue",
+   "value": 0.3,
+   "effectTarget": "SourceFaction",
+   "effectDuration": "permanent",
+   "stackable": false,
+   "duration_months": -1,
+   "contexts": [
+      "TargetingComputerBonus"
+   ]
+},
+ {
+   "dataName": "Effect_TargetingComputer3",
+   "operation": "SetToFixedValue",
+   "value": 0.5,
+   "effectTarget": "SourceFaction",
+   "effectDuration": "permanent",
+   "stackable": false,
+   "duration_months": -1,
+   "contexts": [
+      "TargetingComputerBonus"
+   ]
+},
+ {
+   "dataName": "Effect_AlienTargetingComputer",
+   "operation": "SetToFixedValue",
+   "value": 0.5,
+   "effectTarget": "SourceFaction",
    "effectDuration": "permanent",
    "stackable": false,
    "duration_months": -1,
    "initialFactionsStr": [
-      "",
-      ""
+      "AlienCouncil"
    ],
    "contexts": [
-      "MonthlyProjectTriggerChance",
-      ""
+      "TargetingComputerBonus"
+   ]
+},
+ {
+   "dataName": "Effect_EnvironmentBestSustainabilityValue05",
+   "operation": "Additive",
+   "value": -0.05,
+   "effectTarget": "AllFactions",
+   "effectDuration": "permanent",
+   "stackable": true,
+   "duration_months": -1,
+   "contexts": [
+      "Environment_BestSustainabilityValue"
+   ]
+},
+ {
+   "dataName": "Effect_EnvironmentBestSustainabilityValue10",
+   "operation": "Additive",
+   "value": -0.1,
+   "effectTarget": "AllFactions",
+   "effectDuration": "permanent",
+   "stackable": true,
+   "duration_months": -1,
+   "contexts": [
+      "Environment_BestSustainabilityValue"
+   ]
+},
+ {
+   "dataName": "Effect_SpaceMineFreebies1",
+   "operation": "Additive",
+   "value": 1,
+   "effectTarget": "AllFactions",
+   "effectDuration": "permanent",
+   "stackable": true,
+   "duration_months": -1,
+   "contexts": [
+      "MCFreeSpaceMineNetwork"
+   ]
+},
+ {
+   "dataName": "Effect_SpaceMineFreebies3",
+   "operation": "Additive",
+   "value": 3,
+   "effectTarget": "AllFactions",
+   "effectDuration": "permanent",
+   "stackable": true,
+   "duration_months": -1,
+   "contexts": [
+      "MCFreeSpaceMineNetwork"
+   ]
+},
+ {
+   "dataName": "Effect_SpaceMineFreebies4",
+   "operation": "Additive",
+   "value": 4,
+   "effectTarget": "AllFactions",
+   "effectDuration": "permanent",
+   "stackable": true,
+   "duration_months": -1,
+   "contexts": [
+      "MCFreeSpaceMineNetwork"
+   ]
+},
+ {
+   "dataName": "Effect_SpaceMineFreebies6",
+   "operation": "Additive",
+   "value": 6,
+   "effectTarget": "AllFactions",
+   "effectDuration": "permanent",
+   "stackable": true,
+   "duration_months": -1,
+   "contexts": [
+      "MCFreeSpaceMineNetwork"
    ]
 }
 ]
\ No newline at end of file
diff --git a/app/game/templates/TIGunTemplate.json b/app/game/templates/TIGunTemplate.json
index 3221685..68f1bc9 100644
--- a/app/game/templates/TIGunTemplate.json
+++ b/app/game/templates/TIGunTemplate.json
@@ -28,11 +28,7 @@
    },
    "ammoMaterials": {
       "volatiles": 0.5,
-      "metals": 0.5,
-      "nobleMetals": "",
-      "fissiles": "",
-      "antimatter": "",
-      "exotics": ""
+      "metals": 0.5
    },
    "iconResource": "shipbuildericons/ICO_30mmAutocannon",
    "modelResource": "shipweapons/30mm_Autocannon",
@@ -41,7 +37,48 @@
    "fireSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_AutoCannon",
    "impactVisualFXResource": "spaceCombat/ImpactOrange",
    "impactSoundFXResource": "event:/SFX/Game_SFX/Ship_Fire_Impacts/trig_SFX_BlasterMediumVeryLoudHighMid020MonoRR",
-   "damage_MJ": null
+   "damage_MJ": 3.189375
+},
+ {
+   "dataName": "40mmAutocannon",
+   "friendlyName": "40mm Autocannon",
+   "mount": "OneHull",
+   "requiredProjectName": "Project_40mmAutocannon",
+   "crew": 1,
+   "attackMode": true,
+   "defenseMode": true,
+   "baseWeaponMass_tons": 25,
+   "cooldown_s": 4,
+   "salvo_shots": 6,
+   "intraSalvoCooldown_s": 0.75,
+   "efficiency": 1,
+   "flatChipping": 0.025,
+   "magazine": 2000,
+   "ammoMass_kg": 10,
+   "muzzleVelocity_kps": 2.6,
+   "bombardmentValue": 0,
+   "warheadMass_kg": 6,
+   "targetingRange_km": 350,
+   "pivotRange_deg": 180,
+   "isPointDefenseTargetable": false,
+   "weightedBuildMaterials": {
+      "volatiles": 0.05,
+      "metals": 0.75,
+      "nobleMetals": 0.2
+   },
+   "ammoMaterials": {
+      "volatiles": 0.5,
+      "metals": 0.495,
+      "nobleMetals": 0.005
+   },
+   "iconResource": "shipbuildericons/ICO_40mmAutocannon",
+   "modelResource": "shipweapons/30mm_Autocannon",
+   "effectResource": "spaceCombat/MuzzleFlashFlame",
+   "shotModelResource": "spaceCombat/BulletAutocannon",
+   "fireSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_AutoCannon",
+   "impactVisualFXResource": "spaceCombat/ImpactOrange",
+   "impactSoundFXResource": "event:/SFX/Game_SFX/Ship_Fire_Impacts/trig_SFX_BlasterMediumVeryLoudHighMid020MonoRR",
+   "damage_MJ": 20.28
 },
  {
    "dataName": "6-inchCannon",
@@ -72,11 +109,7 @@
    },
    "ammoMaterials": {
       "volatiles": 0.5,
-      "metals": 0.5,
-      "nobleMetals": "",
-      "fissiles": "",
-      "antimatter": "",
-      "exotics": ""
+      "metals": 0.5
    },
    "iconResource": "shipbuildericons/ICO_6-InchCannon",
    "modelResource": "shipweapons/8-Inch_Cannon",
@@ -116,11 +149,7 @@
    },
    "ammoMaterials": {
       "volatiles": 0.5,
-      "metals": 0.5,
-      "nobleMetals": "",
-      "fissiles": "",
-      "antimatter": "",
-      "exotics": ""
+      "metals": 0.5
    },
    "iconResource": "shipbuildericons/ICO_8-InchCannon",
    "modelResource": "shipweapons/12-Inch_Cannon",
@@ -160,11 +189,7 @@
    },
    "ammoMaterials": {
       "volatiles": 0.5,
-      "metals": 0.5,
-      "nobleMetals": "",
-      "fissiles": "",
-      "antimatter": "",
-      "exotics": ""
+      "metals": 0.5
    },
    "iconResource": "shipbuildericons/ICO_10-InchCannon",
    "modelResource": "shipweapons/12-Inch_Cannon",
@@ -204,11 +229,7 @@
    },
    "ammoMaterials": {
       "volatiles": 0.5,
-      "metals": 0.5,
-      "nobleMetals": "",
-      "fissiles": "",
-      "antimatter": "",
-      "exotics": ""
+      "metals": 0.5
    },
    "iconResource": "shipbuildericons/ICO_12-InchCannon",
    "modelResource": "shipweapons/16-Inch_Cannon",
diff --git a/app/game/templates/TIHabModuleTemplate.json b/app/game/templates/TIHabModuleTemplate.json
index 7e694c1..9bc52fd 100644
--- a/app/game/templates/TIHabModuleTemplate.json
+++ b/app/game/templates/TIHabModuleTemplate.json
@@ -1,4 +1,65 @@
 [
+ {
+   "dataName": "AdministrationNode",
+   "friendlyName": "Administration Node",
+   "coreModule": false,
+   "habType": "Any",
+   "onePerHab": true,
+   "automated": false,
+   "allowsShipConstruction": false,
+   "allowsResupply": false,
+   "mine": false,
+   "noBuild": false,
+   "destroyed": false,
+   "tier": 1,
+   "requiredProjectName": "Project_AdministrationNode",
+   "crew": 40,
+   "power": -10,
+   "reserved": 0,
+   "baseMass_tons": 30,
+   "buildTime_Days": 45,
+   "incomeMoney_month": 0,
+   "incomeInfluence_month": 0,
+   "incomeOps_month": 0,
+   "incomeResearch_month": 0,
+   "incomeProjects": 0,
+   "missionControl": 0,
+   "incomeVolatiles_month": 0,
+   "incomeMetals_month": 0,
+   "incomeNobles_month": 0,
+   "incomeFissiles_month": 0,
+   "incomeAntimatter_month": 0,
+   "incomeExotics_month": 0,
+   "spaceCombatValue": 0,
+   "constructionTimeModifier": 1,
+   "miningModifier": 0,
+   "controlPointCapacity": 4,
+   "techBonuses": [],
+   "specialRules": [
+      "LEOControlPointCapacity",
+      "Efficiency"
+   ],
+   "specialRulesValue": 0.025,
+   "supportMaterials_month": {
+      "money": 6,
+      "volatiles": 0.03,
+      "metals": 0.03
+   },
+   "weightedBuildMaterials": {
+      "water": 0.08,
+      "volatiles": 0.4,
+      "metals": 0.5,
+      "nobleMetals": 0.02
+   },
+   "baseIconResource": "habmodules/base_T1_AdministrationNode",
+   "stationIconResource": "habmodules/station_T1_AdministrationNode",
+   "stationModelResource": "habmodules/station_T1_AdministrationNode_Module",
+   "stationDestructionResource": "habmodules/stationdestruction_T1_generic",
+   "alertWorthy": false,
+   "alienModule": false,
+   "objectiveModule": false,
+   "disable": false
+},
  {
    "dataName": "AntimatterTrap",
    "friendlyName": "Antimatter Trap",
@@ -14,14 +75,14 @@
    "tier": 1,
    "requiredProjectName": "Project_AntimatterTrap",
    "crew": 3,
-   "power": -30,
+   "power": -15,
    "reserved": 0,
    "baseMass_tons": 20,
    "buildTime_Days": 30,
    "incomeMoney_month": 0,
    "incomeInfluence_month": 0,
    "incomeOps_month": 0,
-   "incomeResearch_month": 0,
+   "incomeResearch_month": 5,
    "incomeProjects": 0,
    "missionControl": 0,
    "incomeVolatiles_month": 0,
@@ -34,9 +95,15 @@
    "constructionTimeModifier": 1,
    "miningModifier": 0,
    "controlPointCapacity": 0,
-   "techBonuses": [],
+   "techBonuses": [
+      {
+         "category": "Energy",
+         "bonus": 0.05
+      }
+   ],
    "specialRules": [
-      "HarvestAntimatter"
+      "HarvestAntimatter",
+      "TechBonusDiminishingReturns"
    ],
    "specialRulesValue": 0.25,
    "supportMaterials_month": {
@@ -55,7 +122,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_T1_generic",
    "alertWorthy": false,
    "alienModule": false,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "AutomatedFissionPile",
@@ -111,7 +179,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_T1_generic",
    "alertWorthy": false,
    "alienModule": false,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "AutomatedMiningComplex",
@@ -166,7 +235,8 @@
    "baseIconResource": "habmodules/base_T1_AutomatedMiningComplex",
    "alertWorthy": false,
    "alienModule": false,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "AutomatedOutpostCore",
@@ -192,7 +262,7 @@
    "incomeOps_month": 0,
    "incomeResearch_month": 0,
    "incomeProjects": 0,
-   "missionControl": -2,
+   "missionControl": -1,
    "incomeVolatiles_month": 0,
    "incomeMetals_month": 0,
    "incomeNobles_month": 0,
@@ -216,7 +286,8 @@
    "baseIconResource": "habmodules/base_T1_AutomatedOutpostCore",
    "alertWorthy": true,
    "alienModule": false,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "AutomatedPlatformCore",
@@ -242,7 +313,7 @@
    "incomeOps_month": 0,
    "incomeResearch_month": 0,
    "incomeProjects": 0,
-   "missionControl": -2,
+   "missionControl": -1,
    "incomeVolatiles_month": 0,
    "incomeMetals_month": 0,
    "incomeNobles_month": 0,
@@ -268,7 +339,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_T1_large",
    "alertWorthy": true,
    "alienModule": false,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "AutomatedSolarCollector",
@@ -324,7 +396,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_T1_solar",
    "alertWorthy": false,
    "alienModule": false,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "AutomatedSupplyDepot",
@@ -380,7 +453,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_T1_large",
    "alertWorthy": false,
    "alienModule": false,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "BroadcastOutlet",
@@ -419,7 +493,7 @@
    "controlPointCapacity": 0,
    "techBonuses": [],
    "specialRules": [
-      "Requires_Inhabited_Body",
+      "Requires_Colonized_Body",
       "NotInIrradiated"
    ],
    "supportMaterials_month": {
@@ -437,7 +511,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_T1_generic",
    "alertWorthy": false,
    "alienModule": false,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "ConstructionModule",
@@ -496,7 +571,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_T1_large",
    "alertWorthy": true,
    "alienModule": false,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "EnergyLab",
@@ -513,7 +589,7 @@
    "tier": 1,
    "requiredProjectName": "Project_EnergyLab",
    "crew": 3,
-   "power": -8,
+   "power": -7,
    "reserved": 0,
    "baseMass_tons": 15,
    "buildTime_Days": 30,
@@ -562,7 +638,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_T1_generic",
    "alertWorthy": false,
    "alienModule": false,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "FissionPile",
@@ -618,7 +695,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_T1_generic",
    "alertWorthy": false,
    "alienModule": false,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "FusionPile",
@@ -674,7 +752,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_T1_generic",
    "alertWorthy": false,
    "alienModule": false,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "HeavyFissionPile",
@@ -718,10 +797,10 @@
       "fissiles": 0.075
    },
    "weightedBuildMaterials": {
-      "water": 0.075,
+      "water": 0.05,
       "volatiles": 0.3,
-      "metals": 0.475,
-      "nobleMetals": 0.2,
+      "metals": 0.5,
+      "nobleMetals": 0.1,
       "fissiles": 0.05
    },
    "baseIconResource": "habmodules/base_T1_HeavyFissionPile",
@@ -730,7 +809,68 @@
    "stationDestructionResource": "habmodules/stationdestruction_T1_large",
    "alertWorthy": false,
    "alienModule": false,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
+},
+ {
+   "dataName": "HeavyFusionPile",
+   "friendlyName": "Heavy Fusion Pile",
+   "coreModule": false,
+   "habType": "Any",
+   "onePerHab": false,
+   "automated": false,
+   "allowsShipConstruction": false,
+   "allowsResupply": false,
+   "mine": false,
+   "noBuild": false,
+   "destroyed": false,
+   "tier": 1,
+   "requiredProjectName": "Project_HeavyFusionPile",
+   "crew": 10,
+   "power": 35,
+   "reserved": 0,
+   "baseMass_tons": 60,
+   "buildTime_Days": 45,
+   "incomeMoney_month": 0,
+   "incomeInfluence_month": 0,
+   "incomeOps_month": 0,
+   "incomeResearch_month": 0,
+   "incomeProjects": 0,
+   "missionControl": 0,
+   "incomeVolatiles_month": 0,
+   "incomeMetals_month": 0,
+   "incomeNobles_month": 0,
+   "incomeFissiles_month": 0,
+   "incomeAntimatter_month": 0,
+   "incomeExotics_month": 0,
+   "spaceCombatValue": 0,
+   "constructionTimeModifier": 1,
+   "miningModifier": 0,
+   "controlPointCapacity": 0,
+   "techBonuses": [],
+   "supportMaterials_month": {
+      "money": 5,
+      "water": 1,
+      "volatiles": 0.5,
+      "metals": 0.1,
+      "nobleMetals": 0.1,
+      "fissiles": 0.02
+   },
+   "weightedBuildMaterials": {
+      "water": 0.03,
+      "volatiles": 0.25,
+      "metals": 0.35,
+      "nobleMetals": 0.35,
+      "fissiles": 0.02
+   },
+   "baseIconResource": "habmodules/base_T1_HeavyFusionPile",
+   "stationIconResource": "habmodules/station_T1_HeavyFusionPile",
+   "stationModelResource": "habmodules/station_T1_HeavyFusionPile_Module",
+   "stationDestructionResource": "habmodules/stationdestruction_T1_large",
+   "alertWorthy": false,
+   "alienModule": false,
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "HydroponicsBay",
@@ -787,7 +927,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_T1_large",
    "alertWorthy": false,
    "alienModule": false,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "InformationScienceLab",
@@ -850,7 +991,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_T1_generic",
    "alertWorthy": false,
    "alienModule": false,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "LifeScienceLab",
@@ -914,7 +1056,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_T1_generic",
    "alertWorthy": false,
    "alienModule": false,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "MarinePlatoonBarracks",
@@ -975,7 +1118,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_T1_large",
    "alertWorthy": true,
    "alienModule": false,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "MaterialsLab",
@@ -992,7 +1136,7 @@
    "tier": 1,
    "requiredProjectName": "Project_MaterialsLab",
    "crew": 3,
-   "power": -5,
+   "power": -6,
    "reserved": 0,
    "baseMass_tons": 15,
    "buildTime_Days": 30,
@@ -1040,7 +1184,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_T1_generic",
    "alertWorthy": false,
    "alienModule": false,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "MilitaryScienceLab",
@@ -1103,7 +1248,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_T1_generic",
    "alertWorthy": false,
    "alienModule": false,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "OutpostCore",
@@ -1129,7 +1275,7 @@
    "incomeOps_month": 0,
    "incomeResearch_month": 0,
    "incomeProjects": 0,
-   "missionControl": -1,
+   "missionControl": -2,
    "incomeVolatiles_month": 0,
    "incomeMetals_month": 0,
    "incomeNobles_month": 0,
@@ -1152,7 +1298,8 @@
    "baseIconResource": "habmodules/base_T1_OutpostCore",
    "alertWorthy": true,
    "alienModule": false,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "OutpostMiningComplex",
@@ -1178,7 +1325,7 @@
    "incomeOps_month": 0,
    "incomeResearch_month": 0,
    "incomeProjects": 0,
-   "missionControl": -1,
+   "missionControl": 0,
    "incomeVolatiles_month": 0,
    "incomeMetals_month": 0,
    "incomeNobles_month": 0,
@@ -1207,7 +1354,75 @@
    "baseIconResource": "habmodules/base_T1_OutpostMiningComplex",
    "alertWorthy": true,
    "alienModule": false,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
+},
+ {
+   "dataName": "ParticleCollider",
+   "friendlyName": "Particle Collider",
+   "coreModule": false,
+   "habType": "Station",
+   "onePerHab": false,
+   "automated": false,
+   "allowsShipConstruction": false,
+   "allowsResupply": false,
+   "mine": false,
+   "noBuild": false,
+   "destroyed": false,
+   "tier": 1,
+   "requiredProjectName": "Project_ParticleCollider",
+   "crew": 10,
+   "power": -85,
+   "reserved": 0,
+   "baseMass_tons": 200,
+   "buildTime_Days": 60,
+   "incomeMoney_month": 0,
+   "incomeInfluence_month": 0,
+   "incomeOps_month": 0,
+   "incomeResearch_month": 2,
+   "incomeProjects": 0,
+   "missionControl": 0,
+   "incomeVolatiles_month": 0,
+   "incomeMetals_month": 0,
+   "incomeNobles_month": 0,
+   "incomeFissiles_month": 0,
+   "incomeAntimatter_month": 0.0001,
+   "incomeExotics_month": 0,
+   "spaceCombatValue": 0,
+   "constructionTimeModifier": 1,
+   "miningModifier": 0,
+   "controlPointCapacity": 0,
+   "techBonuses": [
+      {
+         "category": "Energy",
+         "bonus": 0.01
+      }
+   ],
+   "specialRules": [
+      "TechBonusDiminishingReturns"
+   ],
+   "supportMaterials_month": {
+      "money": 6,
+      "water": 2,
+      "volatiles": 2,
+      "metals": 1,
+      "nobleMetals": 1,
+      "fissiles": 1
+   },
+   "weightedBuildMaterials": {
+      "water": 0.05,
+      "volatiles": 0.2,
+      "metals": 0.35,
+      "nobleMetals": 0.35,
+      "fissiles": 0.05
+   },
+   "stationIconResource": "habmodules/station_T1_ParticleCollider",
+   "stationModelResource": "habmodules/station_T1_ParticleCollider_Module",
+   "stationDestructionResource": "habmodules/stationdestruction_T1_large",
+   "alertWorthy": false,
+   "alienModule": false,
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "PlatformCore",
@@ -1233,7 +1448,7 @@
    "incomeOps_month": 0,
    "incomeResearch_month": 0,
    "incomeProjects": 0,
-   "missionControl": -1,
+   "missionControl": -2,
    "incomeVolatiles_month": 0,
    "incomeMetals_month": 0,
    "incomeNobles_month": 0,
@@ -1258,7 +1473,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_T1_large",
    "alertWorthy": true,
    "alienModule": false,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "PointDefenseArray",
@@ -1316,7 +1532,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_T1_generic",
    "alertWorthy": true,
    "alienModule": false,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "Quarters",
@@ -1332,8 +1549,8 @@
    "destroyed": false,
    "tier": 1,
    "requiredProjectName": "Project_Quarters",
-   "crew": 30,
-   "power": -3,
+   "crew": 50,
+   "power": -2,
    "reserved": 0,
    "baseMass_tons": 60,
    "buildTime_Days": 30,
@@ -1374,7 +1591,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_T1_generic",
    "alertWorthy": false,
    "alienModule": false,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "SocialScienceLab",
@@ -1391,7 +1609,7 @@
    "tier": 1,
    "requiredProjectName": "Project_SocialScienceLab",
    "crew": 3,
-   "power": -3,
+   "power": -4,
    "reserved": 0,
    "baseMass_tons": 15,
    "buildTime_Days": 30,
@@ -1419,12 +1637,12 @@
    ],
    "specialRules": [
       "LEOBonusPropagandaStrength",
-      "Requires_Inhabited_Body",
+      "Requires_Colonized_Body",
       "TechBonusDiminishingReturns"
    ],
    "specialRulesValue": 1,
    "supportMaterials_month": {
-      "money": 2
+      "money": 3
    },
    "weightedBuildMaterials": {
       "water": 0,
@@ -1437,7 +1655,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_T1_generic",
    "alertWorthy": false,
    "alienModule": false,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "SolarCollector",
@@ -1493,7 +1712,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_T1_solar",
    "alertWorthy": false,
    "alienModule": false,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "SpaceDock",
@@ -1532,7 +1752,8 @@
    "controlPointCapacity": 0,
    "techBonuses": [],
    "specialRules": [
-      "PowerFirst"
+      "PowerFirst",
+      "Shipyard"
    ],
    "supportMaterials_month": {
       "money": 0
@@ -1549,7 +1770,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_T1_generic",
    "alertWorthy": true,
    "alienModule": false,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "SpaceScienceLab",
@@ -1611,7 +1833,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_T1_generic",
    "alertWorthy": false,
    "alienModule": false,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "SupplyDepot",
@@ -1669,7 +1892,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_T1_large",
    "alertWorthy": false,
    "alienModule": false,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "TouristBerth",
@@ -1725,7 +1949,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_T1_large",
    "alertWorthy": false,
    "alienModule": false,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "XenologyLab",
@@ -1788,7 +2013,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_T1_generic",
    "alertWorthy": false,
    "alienModule": false,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "AdministrationTower",
@@ -1803,6 +2029,7 @@
    "noBuild": false,
    "destroyed": false,
    "tier": 2,
+   "upgradesFromName": "AdministrationNode",
    "requiredProjectName": "Project_AdministrationTower",
    "crew": 200,
    "power": -30,
@@ -1824,7 +2051,7 @@
    "spaceCombatValue": 0,
    "constructionTimeModifier": 1,
    "miningModifier": 0,
-   "controlPointCapacity": 10,
+   "controlPointCapacity": 12,
    "techBonuses": [],
    "specialRules": [
       "LEOControlPointCapacity",
@@ -1849,7 +2076,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_T1_generic",
    "alertWorthy": false,
    "alienModule": false,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "AntimatterHarvester",
@@ -1867,14 +2095,14 @@
    "upgradesFromName": "AntimatterTrap",
    "requiredProjectName": "Project_AntimatterHarvester",
    "crew": 15,
-   "power": -120,
+   "power": -60,
    "reserved": 0,
    "baseMass_tons": 100,
    "buildTime_Days": 90,
    "incomeMoney_month": 0,
    "incomeInfluence_month": 0,
    "incomeOps_month": 0,
-   "incomeResearch_month": 0,
+   "incomeResearch_month": 10,
    "incomeProjects": 0,
    "missionControl": 0,
    "incomeVolatiles_month": 0,
@@ -1887,9 +2115,15 @@
    "constructionTimeModifier": 1,
    "miningModifier": 0,
    "controlPointCapacity": 0,
-   "techBonuses": [],
+   "techBonuses": [
+      {
+         "category": "Energy",
+         "bonus": 0.2
+      }
+   ],
    "specialRules": [
-      "HarvestAntimatter"
+      "HarvestAntimatter",
+      "TechBonusDiminishingReturns"
    ],
    "specialRulesValue": 0.5,
    "supportMaterials_month": {
@@ -1908,7 +2142,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_T2_generic",
    "alertWorthy": false,
    "alienModule": false,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "Atomsmasher",
@@ -1923,6 +2158,7 @@
    "noBuild": false,
    "destroyed": false,
    "tier": 2,
+   "upgradesFromName": "ParticleCollider",
    "requiredProjectName": "Project_Atomsmasher",
    "crew": 20,
    "power": -250,
@@ -1951,9 +2187,6 @@
          "bonus": 0.025
       }
    ],
-   "specialRules": [
-      "TechBonusDiminishingReturns"
-   ],
    "supportMaterials_month": {
       "money": 20,
       "water": 10,
@@ -1974,7 +2207,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_T2_large",
    "alertWorthy": false,
    "alienModule": false,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "CommunicationsHub",
@@ -2034,7 +2268,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_T2_generic",
    "alertWorthy": false,
    "alienModule": false,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "DeepSpaceTelescope",
@@ -2097,7 +2332,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_T2_generic",
    "alertWorthy": true,
    "alienModule": false,
-   "objectiveModule": true
+   "objectiveModule": true,
+   "disable": false
 },
  {
    "dataName": "EnergyResearchCenter",
@@ -2115,7 +2351,7 @@
    "upgradesFromName": "EnergyLab",
    "requiredProjectName": "Project_EnergyResearchCenter",
    "crew": 20,
-   "power": -32,
+   "power": -28,
    "reserved": 0,
    "baseMass_tons": 75,
    "buildTime_Days": 90,
@@ -2164,7 +2400,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_T2_generic",
    "alertWorthy": false,
    "alienModule": false,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "Farm",
@@ -2222,7 +2459,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_T2_generic",
    "alertWorthy": false,
    "alienModule": false,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "FissionReactorArray",
@@ -2280,7 +2518,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_T2_large",
    "alertWorthy": false,
    "alienModule": false,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "FusionReactorArray",
@@ -2338,7 +2577,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_T2_generic",
    "alertWorthy": false,
    "alienModule": false,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "HeavyFissionReactorArray",
@@ -2396,7 +2636,69 @@
    "stationDestructionResource": "habmodules/stationdestruction_T2_generic",
    "alertWorthy": false,
    "alienModule": false,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
+},
+ {
+   "dataName": "HeavyFusionReactorArray",
+   "friendlyName": "Heavy Fusion Reactor Array",
+   "coreModule": false,
+   "habType": "Any",
+   "onePerHab": false,
+   "automated": false,
+   "allowsShipConstruction": false,
+   "allowsResupply": false,
+   "mine": false,
+   "noBuild": false,
+   "destroyed": false,
+   "tier": 2,
+   "upgradesFromName": "HeavyFusionPile",
+   "requiredProjectName": "Project_HeavyFusionReactorArray",
+   "crew": 50,
+   "power": 150,
+   "reserved": 0,
+   "baseMass_tons": 300,
+   "buildTime_Days": 120,
+   "incomeMoney_month": 0,
+   "incomeInfluence_month": 0,
+   "incomeOps_month": 0,
+   "incomeResearch_month": 0,
+   "incomeProjects": 0,
+   "missionControl": 0,
+   "incomeVolatiles_month": 0,
+   "incomeMetals_month": 0,
+   "incomeNobles_month": 0,
+   "incomeFissiles_month": 0,
+   "incomeAntimatter_month": 0,
+   "incomeExotics_month": 0,
+   "spaceCombatValue": 0,
+   "constructionTimeModifier": 1,
+   "miningModifier": 0,
+   "controlPointCapacity": 0,
+   "techBonuses": [],
+   "supportMaterials_month": {
+      "money": 12,
+      "water": 4,
+      "volatiles": 2,
+      "metals": 0.5,
+      "nobleMetals": 0.5,
+      "fissiles": 0.08
+   },
+   "weightedBuildMaterials": {
+      "water": 0.03,
+      "volatiles": 0.25,
+      "metals": 0.35,
+      "nobleMetals": 0.35,
+      "fissiles": 0.02
+   },
+   "baseIconResource": "habmodules/base_T2_HeavyFusionReactorArray",
+   "stationIconResource": "habmodules/station_T2_HeavyFusionReactorArray",
+   "stationModelResource": "habmodules/station_T2_HeavyFusionReactorArray_Module",
+   "stationDestructionResource": "habmodules/stationdestruction_T2_generic",
+   "alertWorthy": false,
+   "alienModule": false,
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "InformationScienceResearchCenter",
@@ -2460,7 +2762,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_T2_generic",
    "alertWorthy": false,
    "alienModule": false,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "LayeredDefenseArray",
@@ -2520,7 +2823,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_T2_generic",
    "alertWorthy": true,
    "alienModule": false,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "LifeScienceResearchCenter",
@@ -2586,7 +2890,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_T2_generic",
    "alertWorthy": false,
    "alienModule": false,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "MarineCompanyBarracks",
@@ -2648,7 +2953,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_T2_large",
    "alertWorthy": true,
    "alienModule": false,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "MaterialsResearchCenter",
@@ -2666,7 +2972,7 @@
    "upgradesFromName": "MaterialsLab",
    "requiredProjectName": "Project_MaterialsResearchCenter",
    "crew": 25,
-   "power": -20,
+   "power": -24,
    "reserved": 0,
    "baseMass_tons": 75,
    "buildTime_Days": 90,
@@ -2715,7 +3021,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_T2_generic",
    "alertWorthy": false,
    "alienModule": false,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "MilitaryScienceResearchCenter",
@@ -2779,7 +3086,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_T2_large",
    "alertWorthy": false,
    "alienModule": false,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "Nanofactory",
@@ -2850,7 +3158,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_T2_generic",
    "alertWorthy": true,
    "alienModule": false,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "OperationsCenter",
@@ -2890,7 +3199,9 @@
    "techBonuses": [],
    "supportMaterials_month": {
       "money": 15,
-      "nobleMetals": 0.1
+      "volatiles": 0.5,
+      "metals": 0.5,
+      "nobleMetals": 0.25
    },
    "weightedBuildMaterials": {
       "water": 0,
@@ -2904,7 +3215,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_T2_generic",
    "alertWorthy": false,
    "alienModule": false,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "OrbitalHospital",
@@ -2951,7 +3263,7 @@
       "Requires_Inhabited_Body",
       "TechBonusDiminishingReturns",
       "AtrocityToKill",
-	  "NotInIrradiated"
+      "NotInIrradiated"
    ],
    "supportMaterials_month": {
       "money": 0,
@@ -2971,7 +3283,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_T2_generic",
    "alertWorthy": false,
    "alienModule": false,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "ResearchCampus",
@@ -2991,7 +3304,7 @@
    "power": -30,
    "reserved": 0,
    "baseMass_tons": 1000,
-   "buildTime_Days": 120,
+   "buildTime_Days": 180,
    "incomeMoney_month": 0,
    "incomeInfluence_month": 0,
    "incomeOps_month": 0,
@@ -3010,7 +3323,8 @@
    "controlPointCapacity": 0,
    "techBonuses": [],
    "specialRules": [
-      "AtrocityToKill_Populous"
+      "Requires_Colonized_Body",
+      "AtrocityToKill"
    ],
    "supportMaterials_month": {
       "money": 30,
@@ -3029,7 +3343,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_T2_generic",
    "alertWorthy": false,
    "alienModule": false,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "ResidentialModule",
@@ -3091,7 +3406,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_T2_generic",
    "alertWorthy": false,
    "alienModule": false,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "OrbitalCore",
@@ -3143,7 +3459,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_T2_large",
    "alertWorthy": true,
    "alienModule": false,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "SettlementCore",
@@ -3193,7 +3510,8 @@
    "baseIconResource": "habmodules/base_T2_SettlementCore",
    "alertWorthy": true,
    "alienModule": false,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "SettlementMiningComplex",
@@ -3220,7 +3538,7 @@
    "incomeOps_month": 0,
    "incomeResearch_month": 0,
    "incomeProjects": 0,
-   "missionControl": -2,
+   "missionControl": 0,
    "incomeVolatiles_month": 0,
    "incomeMetals_month": 0,
    "incomeNobles_month": 0,
@@ -3249,7 +3567,8 @@
    "baseIconResource": "habmodules/base_T2_SettlementMiningComplex",
    "alertWorthy": true,
    "alienModule": false,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "Shipyard",
@@ -3289,7 +3608,8 @@
    "controlPointCapacity": 0,
    "techBonuses": [],
    "specialRules": [
-      "PowerFirst"
+      "PowerFirst",
+      "Shipyard"
    ],
    "supportMaterials_month": {
       "money": 0
@@ -3306,7 +3626,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_T2_large",
    "alertWorthy": true,
    "alienModule": false,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "SkunkWorks",
@@ -3362,7 +3683,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_T2_large",
    "alertWorthy": false,
    "alienModule": false,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "SocialScienceResearchCenter",
@@ -3380,7 +3702,7 @@
    "upgradesFromName": "SocialScienceLab",
    "requiredProjectName": "Project_SocialScienceResearchCenter",
    "crew": 25,
-   "power": -12,
+   "power": -16,
    "reserved": 0,
    "baseMass_tons": 75,
    "buildTime_Days": 90,
@@ -3413,7 +3735,7 @@
    ],
    "specialRulesValue": 2,
    "supportMaterials_month": {
-      "money": 6
+      "money": 8
    },
    "weightedBuildMaterials": {
       "water": 0,
@@ -3426,7 +3748,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_T2_generic",
    "alertWorthy": false,
    "alienModule": false,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "SolarArray",
@@ -3483,7 +3806,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_T2_generic",
    "alertWorthy": false,
    "alienModule": false,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "SpaceHotel",
@@ -3525,7 +3849,6 @@
    "specialRules": [
       "Requires_Inhabited_Body",
       "NotInIrradiated",
-      "TechBonusDiminishingReturns",
       "AtrocityToKill"
    ],
    "supportMaterials_month": {
@@ -3545,7 +3868,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_T2_generic",
    "alertWorthy": false,
    "alienModule": false,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "SpaceScienceResearchCenter",
@@ -3607,7 +3931,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_T2_generic",
    "alertWorthy": false,
    "alienModule": false,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "XenoscienceResearchCenter",
@@ -3671,7 +3996,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_T2_generic",
    "alertWorthy": false,
    "alienModule": false,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "AdministrationComplex",
@@ -3733,7 +4059,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_T3_generic",
    "alertWorthy": false,
    "alienModule": false,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "AgricultureComplex",
@@ -3791,7 +4118,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_T3_generic",
    "alertWorthy": false,
    "alienModule": false,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "AntimatterFarm",
@@ -3809,14 +4137,14 @@
    "upgradesFromName": "AntimatterHarvester",
    "requiredProjectName": "Project_AntimatterFarm",
    "crew": 75,
-   "power": -480,
+   "power": -240,
    "reserved": 0,
    "baseMass_tons": 800,
    "buildTime_Days": 180,
    "incomeMoney_month": 0,
    "incomeInfluence_month": 0,
    "incomeOps_month": 0,
-   "incomeResearch_month": 0,
+   "incomeResearch_month": 15,
    "incomeProjects": 0,
    "missionControl": 0,
    "incomeVolatiles_month": 0,
@@ -3829,9 +4157,15 @@
    "constructionTimeModifier": 1,
    "miningModifier": 0,
    "controlPointCapacity": 0,
-   "techBonuses": [],
+   "techBonuses": [
+      {
+         "category": "Energy",
+         "bonus": 0.5
+      }
+   ],
    "specialRules": [
-      "HarvestAntimatter"
+      "HarvestAntimatter",
+      "TechBonusDiminishingReturns"
    ],
    "specialRulesValue": 1,
    "supportMaterials_month": {
@@ -3853,7 +4187,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_T3_generic",
    "alertWorthy": false,
    "alienModule": false,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "Battlestations",
@@ -3913,7 +4248,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_T3_generic",
    "alertWorthy": true,
    "alienModule": false,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "CivilianComplex",
@@ -3975,7 +4311,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_T3_generic",
    "alertWorthy": false,
    "alienModule": false,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "ColonyCore",
@@ -4002,7 +4339,7 @@
    "incomeOps_month": 0,
    "incomeResearch_month": 0,
    "incomeProjects": 0,
-   "missionControl": -5,
+   "missionControl": -4,
    "incomeVolatiles_month": 0,
    "incomeMetals_month": 0,
    "incomeNobles_month": 0,
@@ -4025,7 +4362,8 @@
    "baseIconResource": "habmodules/base_T3_ColonyCore",
    "alertWorthy": true,
    "alienModule": false,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "ColonyMiningComplex",
@@ -4052,7 +4390,7 @@
    "incomeOps_month": 0,
    "incomeResearch_month": 0,
    "incomeProjects": 0,
-   "missionControl": -3,
+   "missionControl": 0,
    "incomeVolatiles_month": 0,
    "incomeMetals_month": 0,
    "incomeNobles_month": 0,
@@ -4081,7 +4419,8 @@
    "baseIconResource": "habmodules/base_T3_ColonyMiningComplex",
    "alertWorthy": true,
    "alienModule": false,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "CommandCenter",
@@ -4122,7 +4461,9 @@
    "techBonuses": [],
    "supportMaterials_month": {
       "money": 30,
-      "nobleMetals": 0.2
+      "volatiles": 1,
+      "metals": 1,
+      "nobleMetals": 0.5
    },
    "weightedBuildMaterials": {
       "water": 0,
@@ -4136,7 +4477,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_T3_generic",
    "alertWorthy": false,
    "alienModule": false,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "EnergyInstitute",
@@ -4154,14 +4496,14 @@
    "upgradesFromName": "EnergyResearchCenter",
    "requiredProjectName": "Project_EnergyInstitute",
    "crew": 100,
-   "power": -96,
+   "power": -84,
    "reserved": 0,
    "baseMass_tons": 600,
    "buildTime_Days": 180,
    "incomeMoney_month": 0,
    "incomeInfluence_month": 0,
    "incomeOps_month": 0,
-   "incomeResearch_month": 20,
+   "incomeResearch_month": 15,
    "incomeProjects": 0,
    "missionControl": 0,
    "incomeVolatiles_month": 0,
@@ -4203,7 +4545,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_T3_generic",
    "alertWorthy": false,
    "alienModule": false,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "FissionReactorFarm",
@@ -4261,7 +4604,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_T3_large",
    "alertWorthy": false,
    "alienModule": false,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "Foundry",
@@ -4318,7 +4662,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_T3_generic",
    "alertWorthy": false,
    "alienModule": false,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "FusionReactorFarm",
@@ -4376,7 +4721,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_T3_large",
    "alertWorthy": false,
    "alienModule": false,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "GeriatricsFacility",
@@ -4444,7 +4790,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_T3_generic",
    "alertWorthy": false,
    "alienModule": false,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "HeavyFissionReactorFarm",
@@ -4502,7 +4849,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_T3_generic",
    "alertWorthy": false,
    "alienModule": false,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "HeavyFusionReactorFarm",
@@ -4517,12 +4865,12 @@
    "noBuild": false,
    "destroyed": false,
    "tier": 3,
-   "upgradesFromName": "FusionReactorFarm",
+   "upgradesFromName": "HeavyFusionReactorArray",
    "requiredProjectName": "Project_HeavyFusionReactorFarm",
-   "crew": 250,
+   "crew": 150,
    "power": 450,
    "reserved": 0,
-   "baseMass_tons": 8000,
+   "baseMass_tons": 2400,
    "buildTime_Days": 360,
    "incomeMoney_month": 0,
    "incomeInfluence_month": 0,
@@ -4542,7 +4890,7 @@
    "controlPointCapacity": 0,
    "techBonuses": [],
    "supportMaterials_month": {
-      "money": 60,
+      "money": 36,
       "water": 10,
       "volatiles": 6,
       "metals": 1,
@@ -4556,13 +4904,75 @@
       "nobleMetals": 0.35,
       "fissiles": 0.02
    },
-   "baseIconResource": "habmodules/base_T3_TerawattFusionReactor",
-   "stationIconResource": "habmodules/station_T3_TerawattFusionReactor",
-   "stationModelResource": "habmodules/station_T3_TerawattFusionReactor_Module",
+   "baseIconResource": "habmodules/base_T3_HeavyFusionReactorFarm",
+   "stationIconResource": "habmodules/station_T3_HeavyFusionReactorFarm",
+   "stationModelResource": "habmodules/station_T3_HeavyFusionReactorFarm_Module",
+   "stationDestructionResource": "habmodules/stationdestruction_T3_large",
+   "alertWorthy": false,
+   "alienModule": false,
+   "objectiveModule": false,
+   "disable": false
+},
+ {
+   "dataName": "Helium-3Mine",
+   "friendlyName": "Helium-3 Mine",
+   "coreModule": false,
+   "habType": "Station",
+   "onePerHab": true,
+   "automated": false,
+   "allowsShipConstruction": false,
+   "allowsResupply": false,
+   "mine": false,
+   "noBuild": false,
+   "destroyed": false,
+   "tier": 3,
+   "requiredProjectName": "Project_Helium-3Mine",
+   "crew": 75,
+   "power": -300,
+   "reserved": 0,
+   "baseMass_tons": 2400,
+   "buildTime_Days": 180,
+   "incomeMoney_month": 0,
+   "incomeInfluence_month": 0,
+   "incomeOps_month": 0,
+   "incomeResearch_month": 0,
+   "incomeProjects": 0,
+   "missionControl": -3,
+   "incomeVolatiles_month": 0,
+   "incomeMetals_month": 0,
+   "incomeNobles_month": 0,
+   "incomeFissiles_month": 0,
+   "incomeAntimatter_month": 0,
+   "incomeExotics_month": 0,
+   "spaceCombatValue": 0,
+   "constructionTimeModifier": 1,
+   "miningModifier": 0,
+   "controlPointCapacity": 0,
+   "techBonuses": [],
+   "specialRules": [
+      "HarvestHelium3",
+      "Requires_GasGiant_Orbit",
+      "Requires_Interface_Orbit",
+      "PowerFirst"
+   ],
+   "supportMaterials_month": {
+      "money": 30,
+      "metals": 10,
+      "nobleMetals": 1.5
+   },
+   "weightedBuildMaterials": {
+      "water": 0.05,
+      "volatiles": 0.15,
+      "metals": 0.55,
+      "nobleMetals": 0.25
+   },
+   "stationIconResource": "habmodules/station_T3_Helium-3Mine",
+   "stationModelResource": "habmodules/station_T3_Helium-3Mine_Module",
    "stationDestructionResource": "habmodules/stationdestruction_T3_large",
    "alertWorthy": false,
    "alienModule": false,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "InformationScienceInstitute",
@@ -4587,7 +4997,7 @@
    "incomeMoney_month": 0,
    "incomeInfluence_month": 0,
    "incomeOps_month": 0,
-   "incomeResearch_month": 20,
+   "incomeResearch_month": 15,
    "incomeProjects": 0,
    "missionControl": 0,
    "incomeVolatiles_month": 0,
@@ -4626,7 +5036,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_T3_generic",
    "alertWorthy": false,
    "alienModule": false,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "InterstellarLaunchingLaser",
@@ -4683,7 +5094,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_T3_large",
    "alertWorthy": true,
    "alienModule": false,
-   "objectiveModule": true
+   "objectiveModule": true,
+   "disable": false
 },
  {
    "dataName": "LifeScienceInstitute",
@@ -4708,7 +5120,7 @@
    "incomeMoney_month": 0,
    "incomeInfluence_month": 0,
    "incomeOps_month": 0,
-   "incomeResearch_month": 20,
+   "incomeResearch_month": 15,
    "incomeProjects": 0,
    "missionControl": 0,
    "incomeVolatiles_month": 0,
@@ -4749,7 +5161,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_T3_generic",
    "alertWorthy": false,
    "alienModule": false,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "MarineBattalionBarracks",
@@ -4811,7 +5224,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_T3_generic",
    "alertWorthy": true,
    "alienModule": false,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "MaterialsInstitute",
@@ -4829,14 +5243,14 @@
    "upgradesFromName": "MaterialsResearchCenter",
    "requiredProjectName": "Project_MaterialsInstitute",
    "crew": 125,
-   "power": -60,
+   "power": -72,
    "reserved": 0,
    "baseMass_tons": 600,
    "buildTime_Days": 180,
    "incomeMoney_month": 0,
    "incomeInfluence_month": 0,
    "incomeOps_month": 0,
-   "incomeResearch_month": 20,
+   "incomeResearch_month": 15,
    "incomeProjects": 0,
    "missionControl": 0,
    "incomeVolatiles_month": 0,
@@ -4878,7 +5292,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_T3_generic",
    "alertWorthy": false,
    "alienModule": false,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "MediaCenter",
@@ -4938,7 +5353,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_T3_generic",
    "alertWorthy": false,
    "alienModule": false,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "MilitaryScienceInstitute",
@@ -4963,7 +5379,7 @@
    "incomeMoney_month": 0,
    "incomeInfluence_month": 0,
    "incomeOps_month": 0,
-   "incomeResearch_month": 20,
+   "incomeResearch_month": 15,
    "incomeProjects": 0,
    "missionControl": 0,
    "incomeVolatiles_month": 0,
@@ -5002,7 +5418,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_T3_generic",
    "alertWorthy": false,
    "alienModule": false,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "NanofacturingComplex",
@@ -5074,7 +5491,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_T3_generic",
    "alertWorthy": true,
    "alienModule": false,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "ResearchUniversity",
@@ -5095,13 +5513,13 @@
    "power": -90,
    "reserved": 0,
    "baseMass_tons": 8000,
-   "buildTime_Days": 240,
+   "buildTime_Days": 360,
    "incomeMoney_month": 0,
    "incomeInfluence_month": 0,
    "incomeOps_month": 0,
-   "incomeResearch_month": 180,
+   "incomeResearch_month": 200,
    "incomeProjects": 0,
-   "missionControl": -1,
+   "missionControl": -2,
    "incomeVolatiles_month": 0,
    "incomeMetals_month": 0,
    "incomeNobles_month": 0,
@@ -5114,7 +5532,8 @@
    "controlPointCapacity": 0,
    "techBonuses": [],
    "specialRules": [
-      "AtrocityToKill_Populous"
+      "Requires_Inhabited_Body",
+      "AtrocityToKill"
    ],
    "supportMaterials_month": {
       "money": 100,
@@ -5133,7 +5552,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_T3_generic",
    "alertWorthy": false,
    "alienModule": false,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "SentinelComplex",
@@ -5194,7 +5614,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_T3_generic",
    "alertWorthy": true,
    "alienModule": false,
-   "objectiveModule": true
+   "objectiveModule": true,
+   "disable": false
 },
  {
    "dataName": "SocialScienceInstitute",
@@ -5212,14 +5633,14 @@
    "upgradesFromName": "SocialScienceResearchCenter",
    "requiredProjectName": "Project_SocialScienceInstitute",
    "crew": 125,
-   "power": -36,
+   "power": -48,
    "reserved": 0,
    "baseMass_tons": 600,
    "buildTime_Days": 180,
    "incomeMoney_month": 0,
    "incomeInfluence_month": 0,
    "incomeOps_month": 0,
-   "incomeResearch_month": 20,
+   "incomeResearch_month": 15,
    "incomeProjects": 0,
    "missionControl": 0,
    "incomeVolatiles_month": 0,
@@ -5245,7 +5666,7 @@
    ],
    "specialRulesValue": 3,
    "supportMaterials_month": {
-      "money": 18
+      "money": 24
    },
    "weightedBuildMaterials": {
       "water": 0,
@@ -5258,7 +5679,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_T3_generic",
    "alertWorthy": false,
    "alienModule": false,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "SolarFarm",
@@ -5315,7 +5737,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_T3_generic",
    "alertWorthy": false,
    "alienModule": false,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "SpaceResort",
@@ -5357,7 +5780,7 @@
    "specialRules": [
       "Requires_Inhabited_Body",
       "AtrocityToKill",
-	  "NotInIrradiated"
+      "NotInIrradiated"
    ],
    "supportMaterials_month": {
       "money": 0,
@@ -5375,7 +5798,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_T3_generic",
    "alertWorthy": false,
    "alienModule": false,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "SpaceScienceInstitute",
@@ -5400,7 +5824,7 @@
    "incomeMoney_month": 0,
    "incomeInfluence_month": 0,
    "incomeOps_month": 0,
-   "incomeResearch_month": 20,
+   "incomeResearch_month": 15,
    "incomeProjects": 0,
    "missionControl": 0,
    "incomeVolatiles_month": 0,
@@ -5438,7 +5862,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_T3_generic",
    "alertWorthy": false,
    "alienModule": false,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "Spaceworks",
@@ -5478,7 +5903,8 @@
    "controlPointCapacity": 0,
    "techBonuses": [],
    "specialRules": [
-      "PowerFirst"
+      "PowerFirst",
+      "Shipyard"
    ],
    "supportMaterials_month": {
       "money": 0
@@ -5495,7 +5921,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_T3_large",
    "alertWorthy": true,
    "alienModule": false,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "Supercollider",
@@ -5520,7 +5947,7 @@
    "incomeMoney_month": 0,
    "incomeInfluence_month": 0,
    "incomeOps_month": 0,
-   "incomeResearch_month": 20,
+   "incomeResearch_month": 10,
    "incomeProjects": 0,
    "missionControl": 0,
    "incomeVolatiles_month": 0,
@@ -5562,7 +5989,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_T3_large",
    "alertWorthy": false,
    "alienModule": false,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "RingCore",
@@ -5589,7 +6017,7 @@
    "incomeOps_month": 0,
    "incomeResearch_month": 0,
    "incomeProjects": 0,
-   "missionControl": -5,
+   "missionControl": -4,
    "incomeVolatiles_month": 0,
    "incomeMetals_month": 0,
    "incomeNobles_month": 0,
@@ -5614,7 +6042,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_T3_large",
    "alertWorthy": true,
    "alienModule": false,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "XenoscienceInstitute",
@@ -5639,7 +6068,7 @@
    "incomeMoney_month": 0,
    "incomeInfluence_month": 0,
    "incomeOps_month": 0,
-   "incomeResearch_month": 20,
+   "incomeResearch_month": 15,
    "incomeProjects": 0,
    "missionControl": 0,
    "incomeVolatiles_month": 0,
@@ -5679,7 +6108,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_T3_generic",
    "alertWorthy": false,
    "alienModule": false,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "AlienOutpostCore",
@@ -5732,7 +6162,8 @@
    "baseIconResource": "habmodules/base_T1_AlienOutpostCore",
    "alertWorthy": true,
    "alienModule": true,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "AlienSettlementCore",
@@ -5786,7 +6217,8 @@
    "baseIconResource": "habmodules/base_T2_AlienSettlementCore",
    "alertWorthy": true,
    "alienModule": true,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "AlienColonyCore",
@@ -5840,7 +6272,8 @@
    "baseIconResource": "habmodules/base_T3_AlienColonyCore",
    "alertWorthy": true,
    "alienModule": true,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "AlienPlatformCore",
@@ -5895,7 +6328,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_alien_T1_generic",
    "alertWorthy": true,
    "alienModule": true,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "AlienOrbitalCore",
@@ -5951,7 +6385,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_alien_T2_generic",
    "alertWorthy": true,
    "alienModule": true,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "AlienRingCore",
@@ -6007,7 +6442,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_alien_T3_generic",
    "alertWorthy": true,
    "alienModule": true,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "AlienSpacedock",
@@ -6046,7 +6482,8 @@
    "controlPointCapacity": 0,
    "techBonuses": [],
    "specialRules": [
-      "Griffins"
+      "Griffins",
+      "Shipyard"
    ],
    "specialRulesValue": 1,
    "supportMaterials_month": {
@@ -6064,7 +6501,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_alien_T1_generic",
    "alertWorthy": true,
    "alienModule": true,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "AlienShipyard",
@@ -6104,7 +6542,8 @@
    "controlPointCapacity": 0,
    "techBonuses": [],
    "specialRules": [
-      "Griffins"
+      "Griffins",
+      "Shipyard"
    ],
    "specialRulesValue": 1,
    "supportMaterials_month": {
@@ -6122,7 +6561,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_alien_T2_generic",
    "alertWorthy": true,
    "alienModule": true,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "AlienSpaceworks",
@@ -6162,7 +6602,8 @@
    "controlPointCapacity": 0,
    "techBonuses": [],
    "specialRules": [
-      "Griffins"
+      "Griffins",
+      "Shipyard"
    ],
    "specialRulesValue": 1,
    "supportMaterials_month": {
@@ -6180,7 +6621,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_alien_T3_generic",
    "alertWorthy": true,
    "alienModule": true,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "AlienFusionPile",
@@ -6236,7 +6678,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_alien_T1_generic",
    "alertWorthy": false,
    "alienModule": true,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "AlienFusionReactorArray",
@@ -6293,7 +6736,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_alien_T2_generic",
    "alertWorthy": false,
    "alienModule": true,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "AlienFusionReactorFarm",
@@ -6350,7 +6794,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_alien_T3_generic",
    "alertWorthy": false,
    "alienModule": true,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "AlienAssembler",
@@ -6406,7 +6851,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_alien_T1_generic",
    "alertWorthy": true,
    "alienModule": true,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "AlienNanofactory",
@@ -6464,7 +6910,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_alien_T2_generic",
    "alertWorthy": true,
    "alienModule": true,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "AlienNanofacturingComplex",
@@ -6523,7 +6970,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_alien_T3_generic",
    "alertWorthy": true,
    "alienModule": true,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "AlienWormholeFacility",
@@ -6584,7 +7032,8 @@
    "baseIconResource": "habmodules/base_T3_AlienWormholeFacility",
    "alertWorthy": true,
    "alienModule": true,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "AlienPointDefenseArray",
@@ -6642,7 +7091,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_alien_T1_generic",
    "alertWorthy": false,
    "alienModule": true,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "AlienLayeredDefenseArray",
@@ -6702,7 +7152,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_alien_T2_generic",
    "alertWorthy": false,
    "alienModule": true,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "AlienBattlestations",
@@ -6764,7 +7215,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_alien_T3_generic",
    "alertWorthy": false,
    "alienModule": true,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "AlienOutpostMiningComplex",
@@ -6817,7 +7269,8 @@
    "baseIconResource": "habmodules/base_T1_AlienOutpostMiningComplex",
    "alertWorthy": true,
    "alienModule": true,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "AlienSettlementMiningComplex",
@@ -6871,7 +7324,8 @@
    "baseIconResource": "habmodules/base_T2_AlienSettlementMiningComplex",
    "alertWorthy": true,
    "alienModule": true,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "AlienColonyMiningComplex",
@@ -6925,7 +7379,8 @@
    "baseIconResource": "habmodules/base_T3_AlienColonyMiningComplex",
    "alertWorthy": true,
    "alienModule": true,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "AlienBarracks",
@@ -6985,7 +7440,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_alien_T1_generic",
    "alertWorthy": true,
    "alienModule": true,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "AlienGarrison",
@@ -7046,7 +7502,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_alien_T2_generic",
    "alertWorthy": true,
    "alienModule": true,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "AlienCitadel",
@@ -7107,7 +7564,163 @@
    "stationDestructionResource": "habmodules/stationdestruction_alien_T3_generic",
    "alertWorthy": true,
    "alienModule": true,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
+},
+ {
+   "dataName": "AlienObservationPost",
+   "friendlyName": "Alien Observation Post",
+   "coreModule": false,
+   "habType": "Station",
+   "onePerHab": true,
+   "automated": false,
+   "allowsShipConstruction": false,
+   "allowsResupply": false,
+   "mine": false,
+   "noBuild": false,
+   "destroyed": false,
+   "tier": 1,
+   "requiredProjectName": "Project_AlienMasterProject",
+   "crew": 16,
+   "power": -15,
+   "reserved": 0,
+   "baseMass_tons": 50,
+   "buildTime_Days": 60,
+   "incomeMoney_month": 0,
+   "incomeInfluence_month": 0,
+   "incomeOps_month": 0,
+   "incomeResearch_month": 0,
+   "incomeProjects": 0,
+   "missionControl": 0,
+   "incomeVolatiles_month": 0,
+   "incomeMetals_month": 0,
+   "incomeNobles_month": 0,
+   "incomeFissiles_month": 0,
+   "incomeAntimatter_month": 0,
+   "incomeExotics_month": 0,
+   "spaceCombatValue": 0,
+   "constructionTimeModifier": 1,
+   "miningModifier": 0,
+   "controlPointCapacity": 0,
+   "techBonuses": [],
+   "specialRules": [
+      "AlienSurveillance"
+   ],
+   "specialRulesValue": 1,
+   "supportMaterials_month": {
+      "money": 0
+   },
+   "stationIconResource": "habmodules/station_T1_AlienObservationPost",
+   "stationModelResource": "habmodules/station_T1_AlienObservationPost_Module",
+   "stationDestructionResource": "habmodules/stationdestruction_alien_T1_generic",
+   "alertWorthy": true,
+   "alienModule": true,
+   "objectiveModule": false,
+   "disable": true
+},
+ {
+   "dataName": "AlienSurveillanceArray",
+   "friendlyName": "Alien Surveillance Array",
+   "coreModule": false,
+   "habType": "Station",
+   "onePerHab": true,
+   "automated": false,
+   "allowsShipConstruction": false,
+   "allowsResupply": false,
+   "mine": false,
+   "noBuild": false,
+   "destroyed": false,
+   "tier": 2,
+   "upgradesFromName": "AlienObservationPost",
+   "requiredProjectName": "Project_AlienMasterProject",
+   "crew": 32,
+   "power": -45,
+   "reserved": 0,
+   "baseMass_tons": 250,
+   "buildTime_Days": 90,
+   "incomeMoney_month": 0,
+   "incomeInfluence_month": 0,
+   "incomeOps_month": 0,
+   "incomeResearch_month": 0,
+   "incomeProjects": 0,
+   "missionControl": 0,
+   "incomeVolatiles_month": 0,
+   "incomeMetals_month": 0,
+   "incomeNobles_month": 0,
+   "incomeFissiles_month": 0,
+   "incomeAntimatter_month": 0,
+   "incomeExotics_month": 0,
+   "spaceCombatValue": 0,
+   "constructionTimeModifier": 1,
+   "miningModifier": 0,
+   "controlPointCapacity": 0,
+   "techBonuses": [],
+   "specialRules": [
+      "AlienSurveillance"
+   ],
+   "specialRulesValue": 2,
+   "supportMaterials_month": {
+      "money": 0
+   },
+   "stationIconResource": "habmodules/station_T2_AlienSurveillanceArray",
+   "stationModelResource": "habmodules/station_T2_AlienSurveillanceArray_Module",
+   "stationDestructionResource": "habmodules/stationdestruction_alien_T2_generic",
+   "alertWorthy": true,
+   "alienModule": true,
+   "objectiveModule": false,
+   "disable": true
+},
+ {
+   "dataName": "AlienWatchtower",
+   "friendlyName": "Alien Watchtower",
+   "coreModule": false,
+   "habType": "Station",
+   "onePerHab": true,
+   "automated": false,
+   "allowsShipConstruction": false,
+   "allowsResupply": false,
+   "mine": false,
+   "noBuild": false,
+   "destroyed": false,
+   "tier": 3,
+   "upgradesFromName": "AlienSurveillanceArray",
+   "requiredProjectName": "Project_AlienMasterProject",
+   "crew": 64,
+   "power": -90,
+   "reserved": 0,
+   "baseMass_tons": 1250,
+   "buildTime_Days": 120,
+   "incomeMoney_month": 0,
+   "incomeInfluence_month": 0,
+   "incomeOps_month": 0,
+   "incomeResearch_month": 0,
+   "incomeProjects": 0,
+   "missionControl": 0,
+   "incomeVolatiles_month": 0,
+   "incomeMetals_month": 0,
+   "incomeNobles_month": 0,
+   "incomeFissiles_month": 0,
+   "incomeAntimatter_month": 0,
+   "incomeExotics_month": 0,
+   "spaceCombatValue": 0,
+   "constructionTimeModifier": 1,
+   "miningModifier": 0,
+   "controlPointCapacity": 0,
+   "techBonuses": [],
+   "specialRules": [
+      "AlienSurveillance"
+   ],
+   "specialRulesValue": 3,
+   "supportMaterials_month": {
+      "money": 0
+   },
+   "stationIconResource": "habmodules/station_T3_AlienWatchtower",
+   "stationModelResource": "habmodules/station_T3_AlienWatchtower_Module",
+   "stationDestructionResource": "habmodules/stationdestruction_alien_T3_generic",
+   "alertWorthy": true,
+   "alienModule": true,
+   "objectiveModule": false,
+   "disable": true
 },
  {
    "dataName": "DestroyedModule11",
@@ -7153,7 +7766,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_T1_generic",
    "alertWorthy": false,
    "alienModule": false,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "DestroyedModule12",
@@ -7199,7 +7813,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_T1_generic",
    "alertWorthy": false,
    "alienModule": false,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "DestroyedModule13",
@@ -7245,7 +7860,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_T1_generic",
    "alertWorthy": false,
    "alienModule": false,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "DestroyedModule21",
@@ -7291,7 +7907,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_T2_generic",
    "alertWorthy": false,
    "alienModule": false,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "DestroyedModule22",
@@ -7337,7 +7954,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_T2_generic",
    "alertWorthy": false,
    "alienModule": false,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "DestroyedModule23",
@@ -7383,7 +8001,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_T2_generic",
    "alertWorthy": false,
    "alienModule": false,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "DestroyedModule31",
@@ -7429,7 +8048,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_T3_generic",
    "alertWorthy": false,
    "alienModule": false,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "DestroyedModule32",
@@ -7475,7 +8095,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_T3_generic",
    "alertWorthy": false,
    "alienModule": false,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "DestroyedModule33",
@@ -7521,7 +8142,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_T3_generic",
    "alertWorthy": false,
    "alienModule": false,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "AlienDestroyedModule11",
@@ -7567,7 +8189,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_T1_generic",
    "alertWorthy": false,
    "alienModule": true,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "AlienDestroyedModule12",
@@ -7613,7 +8236,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_T1_generic",
    "alertWorthy": false,
    "alienModule": true,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "AlienDestroyedModule13",
@@ -7659,7 +8283,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_T1_generic",
    "alertWorthy": false,
    "alienModule": true,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "AlienDestroyedModule21",
@@ -7705,7 +8330,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_T2_generic",
    "alertWorthy": false,
    "alienModule": true,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "AlienDestroyedModule22",
@@ -7751,7 +8377,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_T2_generic",
    "alertWorthy": false,
    "alienModule": true,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "AlienDestroyedModule23",
@@ -7797,7 +8424,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_T2_generic",
    "alertWorthy": false,
    "alienModule": true,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "AlienDestroyedModule31",
@@ -7843,7 +8471,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_T3_generic",
    "alertWorthy": false,
    "alienModule": true,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "AlienDestroyedModule32",
@@ -7889,7 +8518,8 @@
    "stationDestructionResource": "habmodules/stationdestruction_T3_generic",
    "alertWorthy": false,
    "alienModule": true,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 },
  {
    "dataName": "AlienDestroyedModule33",
@@ -7935,6 +8565,7 @@
    "stationDestructionResource": "habmodules/stationdestruction_T3_generic",
    "alertWorthy": false,
    "alienModule": true,
-   "objectiveModule": false
+   "objectiveModule": false,
+   "disable": false
 }
 ]
\ No newline at end of file
diff --git a/app/game/templates/TIHeatSinkTemplate.json b/app/game/templates/TIHeatSinkTemplate.json
index afd2779..0574513 100644
--- a/app/game/templates/TIHeatSinkTemplate.json
+++ b/app/game/templates/TIHeatSinkTemplate.json
@@ -4,28 +4,12 @@
    "displayName": "Water Heat Sink",
    "heatCapacity_GJ": 100,
    "mass_tons": 250,
-   "requiredProjectName": "",
+   "requiredProjectName": "Project_Warships",
    "crew": 1,
    "weightedBuildMaterials": {
-      "water": 1,
-      "volatiles": null,
-      "metals": null,
-      "nobleMetals": "",
-      "exotics": null
+      "water": 1
    },
-   "iconResource": "shipbuildericons/ICO_WaterHeatSink",
-   "density_tonsm3": 1,
-   "specificHeatCapacity_J": {
-      "molK": 75.37
-   },
-   "molarWeight g": {
-      "mol": 18.01
-   },
-   "liquidRange_K": 100,
-   "1 gram - J": {
-      "K absorbtion": 4.18
-   },
-   "calc_capacity": 104.62
+   "iconResource": "shipbuildericons/ICO_WaterHeatSink"
 },
  {
    "dataName": "PotassiumHeatSink",
@@ -35,25 +19,9 @@
    "requiredProjectName": "Project_PotassiumHeatSink",
    "crew": 1,
    "weightedBuildMaterials": {
-      "water": null,
-      "volatiles": null,
-      "metals": 1,
-      "nobleMetals": "",
-      "exotics": null
-   },
-   "iconResource": "shipbuildericons/ICO_PotassiumHeatSink",
-   "density_tonsm3": 0.83,
-   "specificHeatCapacity_J": {
-      "molK": 29.6
-   },
-   "molarWeight g": {
-      "mol": 39.1
-   },
-   "liquidRange_K": 696,
-   "1 gram - J": {
-      "K absorbtion": 0.76
+      "metals": 1
    },
-   "calc_capacity": 108.01
+   "iconResource": "shipbuildericons/ICO_PotassiumHeatSink"
 },
  {
    "dataName": "SodiumHeatSink",
@@ -63,25 +31,9 @@
    "requiredProjectName": "Project_SodiumHeatSink",
    "crew": 1,
    "weightedBuildMaterials": {
-      "water": null,
-      "volatiles": null,
-      "metals": 1,
-      "nobleMetals": "",
-      "exotics": null
+      "metals": 1
    },
-   "iconResource": "shipbuildericons/ICO_SodiumHeatSink",
-   "density_tonsm3": 0.93,
-   "specificHeatCapacity_J": {
-      "molK": 28.2
-   },
-   "molarWeight g": {
-      "mol": 22.98
-   },
-   "liquidRange_K": 1300,
-   "1 gram - J": {
-      "K absorbtion": 1.23
-   },
-   "calc_capacity": 366.92
+   "iconResource": "shipbuildericons/ICO_SodiumHeatSink"
 },
  {
    "dataName": "LithiumHeatSink",
@@ -91,25 +43,9 @@
    "requiredProjectName": "Project_LithiumHeatSink",
    "crew": 1,
    "weightedBuildMaterials": {
-      "water": null,
-      "volatiles": null,
-      "metals": 1,
-      "nobleMetals": "",
-      "exotics": null
-   },
-   "iconResource": "shipbuildericons/ICO_LithiumHeatSink",
-   "density_tonsm3": 0.51,
-   "specificHeatCapacity_J": {
-      "molK": 24.8
-   },
-   "molarWeight g": {
-      "mol": 6.94
-   },
-   "liquidRange_K": 1150,
-   "1 gram - J": {
-      "K absorbtion": 3.57
+      "metals": 1
    },
-   "calc_capacity": 525.94
+   "iconResource": "shipbuildericons/ICO_LithiumHeatSink"
 },
  {
    "dataName": "MoltenSaltHeatSink",
@@ -119,25 +55,10 @@
    "requiredProjectName": "Project_MoltenSaltHeatSink",
    "crew": 1,
    "weightedBuildMaterials": {
-      "water": null,
       "volatiles": 0.25,
-      "metals": 0.75,
-      "nobleMetals": "",
-      "exotics": null
+      "metals": 0.75
    },
-   "iconResource": "shipbuildericons/ICO_MoltenSaltHeatSink",
-   "density_tonsm3": 1.94,
-   "specificHeatCapacity_J": {
-      "molK": 68.09
-   },
-   "molarWeight g": {
-      "mol": 34.95
-   },
-   "liquidRange_K": 960,
-   "1 gram - J": {
-      "K absorbtion": 1.95
-   },
-   "calc_capacity": 907.09
+   "iconResource": "shipbuildericons/ICO_MoltenSaltHeatSink"
 },
  {
    "dataName": "ExoticHeatSink",
@@ -147,53 +68,22 @@
    "requiredProjectName": "Project_ExoticHeatSink",
    "crew": 1,
    "weightedBuildMaterials": {
-      "water": null,
-      "volatiles": null,
-      "metals": 0.8,
-      "nobleMetals": "",
-      "exotics": 0.2
-   },
-   "iconResource": "shipbuildericons/ICO_ExoticHeatSink",
-   "density_tonsm3": 1,
-   "specificHeatCapacity_J": {
-      "molK": 120
-   },
-   "molarWeight g": {
-      "mol": 32
-   },
-   "liquidRange_K": 1900,
-   "1 gram - J": {
-      "K absorbtion": 3.75
+      "metals": 0.95,
+      "exotics": 0.05
    },
-   "calc_capacity": 1781.25
+   "iconResource": "shipbuildericons/ICO_ExoticHeatSink"
 },
  {
    "dataName": "HeavyWaterHeatSink",
    "displayName": "Heavy Water Heat Sink",
    "heatCapacity_GJ": 200,
    "mass_tons": 500,
-   "requiredProjectName": "",
-   "crew": 2,
+   "requiredProjectName": "Project_Warships",
+   "crew": 1,
    "weightedBuildMaterials": {
-      "water": 1,
-      "volatiles": null,
-      "metals": null,
-      "nobleMetals": "",
-      "exotics": null
-   },
-   "iconResource": "shipbuildericons/ICO_HeavyWaterHeatSink",
-   "density_tonsm3": 1,
-   "specificHeatCapacity_J": {
-      "molK": 75.37
-   },
-   "molarWeight g": {
-      "mol": 18.01
+      "water": 1
    },
-   "liquidRange_K": 85,
-   "1 gram - J": {
-      "K absorbtion": 4.18
-   },
-   "calc_capacity": 177.86
+   "iconResource": "shipbuildericons/ICO_HeavyWaterHeatSink"
 },
  {
    "dataName": "HeavyPotassiumHeatSink",
@@ -201,27 +91,11 @@
    "heatCapacity_GJ": 220,
    "mass_tons": 410,
    "requiredProjectName": "Project_PotassiumHeatSink",
-   "crew": 2,
+   "crew": 1,
    "weightedBuildMaterials": {
-      "water": null,
-      "volatiles": null,
-      "metals": 1,
-      "nobleMetals": "",
-      "exotics": null
-   },
-   "iconResource": "shipbuildericons/ICO_HeavyPotassiumHeatSink",
-   "density_tonsm3": 0.83,
-   "specificHeatCapacity_J": {
-      "molK": 29.6
+      "metals": 1
    },
-   "molarWeight g": {
-      "mol": 39.1
-   },
-   "liquidRange_K": 696,
-   "1 gram - J": {
-      "K absorbtion": 0.76
-   },
-   "calc_capacity": 216.03
+   "iconResource": "shipbuildericons/ICO_HeavyPotassiumHeatSink"
 },
  {
    "dataName": "HeavySodiumHeatSink",
@@ -229,27 +103,11 @@
    "heatCapacity_GJ": 740,
    "mass_tons": 460,
    "requiredProjectName": "Project_SodiumHeatSink",
-   "crew": 2,
+   "crew": 1,
    "weightedBuildMaterials": {
-      "water": null,
-      "volatiles": null,
-      "metals": 1,
-      "nobleMetals": "",
-      "exotics": null
-   },
-   "iconResource": "shipbuildericons/ICO_HeavySodiumHeatSink",
-   "density_tonsm3": 0.93,
-   "specificHeatCapacity_J": {
-      "molK": 28.2
-   },
-   "molarWeight g": {
-      "mol": 22.98
-   },
-   "liquidRange_K": 1300,
-   "1 gram - J": {
-      "K absorbtion": 1.23
+      "metals": 1
    },
-   "calc_capacity": 733.84
+   "iconResource": "shipbuildericons/ICO_HeavySodiumHeatSink"
 },
  {
    "dataName": "HeavyLithiumHeatSink",
@@ -257,27 +115,11 @@
    "heatCapacity_GJ": 1050,
    "mass_tons": 256,
    "requiredProjectName": "Project_LithiumHeatSink",
-   "crew": 2,
+   "crew": 1,
    "weightedBuildMaterials": {
-      "water": null,
-      "volatiles": null,
-      "metals": 1,
-      "nobleMetals": "",
-      "exotics": null
-   },
-   "iconResource": "shipbuildericons/ICO_HeavyLithiumHeatSink",
-   "density_tonsm3": 0.51,
-   "specificHeatCapacity_J": {
-      "molK": 24.8
-   },
-   "molarWeight g": {
-      "mol": 6.94
+      "metals": 1
    },
-   "liquidRange_K": 1150,
-   "1 gram - J": {
-      "K absorbtion": 3.57
-   },
-   "calc_capacity": 1051.88
+   "iconResource": "shipbuildericons/ICO_HeavyLithiumHeatSink"
 },
  {
    "dataName": "HeavyMoltenSaltHeatSink",
@@ -285,27 +127,12 @@
    "heatCapacity_GJ": 1800,
    "mass_tons": 970,
    "requiredProjectName": "Project_MoltenSaltHeatSink",
-   "crew": 2,
+   "crew": 1,
    "weightedBuildMaterials": {
-      "water": null,
       "volatiles": 0.25,
-      "metals": 0.75,
-      "nobleMetals": "",
-      "exotics": null
-   },
-   "iconResource": "shipbuildericons/ICO_HeavyMoltenSaltHeatSink",
-   "density_tonsm3": 1.94,
-   "specificHeatCapacity_J": {
-      "molK": 68.09
+      "metals": 0.75
    },
-   "molarWeight g": {
-      "mol": 34.95
-   },
-   "liquidRange_K": 960,
-   "1 gram - J": {
-      "K absorbtion": 1.95
-   },
-   "calc_capacity": 1814.17
+   "iconResource": "shipbuildericons/ICO_HeavyMoltenSaltHeatSink"
 },
  {
    "dataName": "HeavyExoticHeatSink",
@@ -313,27 +140,12 @@
    "heatCapacity_GJ": 3600,
    "mass_tons": 500,
    "requiredProjectName": "Project_ExoticHeatSink",
-   "crew": 2,
+   "crew": 1,
    "weightedBuildMaterials": {
-      "water": null,
-      "volatiles": null,
-      "metals": 0.8,
-      "nobleMetals": "",
-      "exotics": 0.2
-   },
-   "iconResource": "shipbuildericons/ICO_HeavyExoticHeatSink",
-   "density_tonsm3": 1,
-   "specificHeatCapacity_J": {
-      "molK": 120
-   },
-   "molarWeight g": {
-      "mol": 32
-   },
-   "liquidRange_K": 1900,
-   "1 gram - J": {
-      "K absorbtion": 3.75
+      "metals": 0.95,
+      "exotics": 0.05
    },
-   "calc_capacity": 3562.5
+   "iconResource": "shipbuildericons/ICO_HeavyExoticHeatSink"
 },
  {
    "dataName": "AlienLithiumHeatSink",
@@ -343,25 +155,9 @@
    "requiredProjectName": "Project_AlienMasterProject",
    "crew": 0,
    "weightedBuildMaterials": {
-      "water": null,
-      "volatiles": null,
-      "metals": 1,
-      "nobleMetals": "",
-      "exotics": null
+      "metals": 1
    },
-   "iconResource": "shipbuildericons/ICO_HeavyLithiumHeatSink",
-   "density_tonsm3": 0.51,
-   "specificHeatCapacity_J": {
-      "molK": 24.8
-   },
-   "molarWeight g": {
-      "mol": 6.94
-   },
-   "liquidRange_K": 1150,
-   "1 gram - J": {
-      "K absorbtion": 3.57
-   },
-   "calc_capacity": 1051.88
+   "iconResource": "shipbuildericons/ICO_HeavyLithiumHeatSink"
 },
  {
    "dataName": "AlienExoticHeatSink",
@@ -371,24 +167,9 @@
    "requiredProjectName": "Project_AlienMasterProject",
    "crew": 0,
    "weightedBuildMaterials": {
-      "water": null,
-      "volatiles": null,
-      "metals": 0.8,
-      "nobleMetals": "",
-      "exotics": 0.2
-   },
-   "iconResource": "shipbuildericons/ICO_HeavyExoticHeatSink",
-   "density_tonsm3": 1,
-   "specificHeatCapacity_J": {
-      "molK": 120
-   },
-   "molarWeight g": {
-      "mol": 32
-   },
-   "liquidRange_K": 1900,
-   "1 gram - J": {
-      "K absorbtion": 3.75
+      "metals": 0.95,
+      "exotics": 0.05
    },
-   "calc_capacity": 3562.5
+   "iconResource": "shipbuildericons/ICO_HeavyExoticHeatSink"
 }
 ]
\ No newline at end of file
diff --git a/app/game/templates/TILaserWeaponTemplate.json b/app/game/templates/TILaserWeaponTemplate.json
index 179858e..cff90ad 100644
--- a/app/game/templates/TILaserWeaponTemplate.json
+++ b/app/game/templates/TILaserWeaponTemplate.json
@@ -15,9 +15,8 @@
    "shotPower_MJ": 50,
    "wavelength_nm": 1080,
    "mirrorRadius_cm": 30,
-   "beam_quality": 1.3,
-   "jitter_Rad": 1.19e-7,
-   "jitter_Div": 10000000,
+   "beam_quality": 1.35,
+   "jitter_Rad": 1e-7,
    "bombardmentValue": 0,
    "targetingRange_km": 250,
    "pivotRange_deg": 180,
@@ -25,8 +24,7 @@
    "weightedBuildMaterials": {
       "volatiles": 0.1,
       "metals": 0.7,
-      "nobleMetals": 0.2,
-      "exotics": null
+      "nobleMetals": 0.2
    },
    "iconResource": "shipbuildericons/ICO_PointDefenseLaserTurret",
    "modelResource": "shipweapons/point_defense_laser_battery",
@@ -49,9 +47,8 @@
    "shotPower_MJ": 100,
    "wavelength_nm": 1080,
    "mirrorRadius_cm": 60,
-   "beam_quality": 1.3,
-   "jitter_Rad": 1.23e-7,
-   "jitter_Div": 10000000,
+   "beam_quality": 1.35,
+   "jitter_Rad": 1e-7,
    "bombardmentValue": 0.2,
    "targetingRange_km": 600,
    "pivotRange_deg": 180,
@@ -59,8 +56,7 @@
    "weightedBuildMaterials": {
       "volatiles": 0.1,
       "metals": 0.7,
-      "nobleMetals": 0.2,
-      "exotics": null
+      "nobleMetals": 0.2
    },
    "iconResource": "shipbuildericons/ICO_60cmIRLaserBattery",
    "modelResource": "shipweapons/small_laser_battery",
@@ -73,7 +69,7 @@
    "mount": "TwoHullHoriz",
    "crew": 3,
    "sortOrder": 3,
-   "requiredProjectName": "Project_120cmIRLaserBattery",
+   "requiredProjectName": "Project_60cmIRLaserBattery",
    "attackMode": true,
    "defenseMode": true,
    "hp": 1,
@@ -83,9 +79,8 @@
    "shotPower_MJ": 150,
    "wavelength_nm": 1080,
    "mirrorRadius_cm": 120,
-   "beam_quality": 1.3,
-   "jitter_Rad": 1.27e-7,
-   "jitter_Div": 10000000,
+   "beam_quality": 1.35,
+   "jitter_Rad": 8e-8,
    "bombardmentValue": 0.4,
    "targetingRange_km": 700,
    "pivotRange_deg": 180,
@@ -93,8 +88,7 @@
    "weightedBuildMaterials": {
       "volatiles": 0.1,
       "metals": 0.7,
-      "nobleMetals": 0.2,
-      "exotics": null
+      "nobleMetals": 0.2
    },
    "iconResource": "shipbuildericons/ICO_120cmIRLaserBattery",
    "modelResource": "shipweapons/medium_laser_battery",
@@ -107,7 +101,7 @@
    "mount": "FourHull",
    "crew": 4,
    "sortOrder": 4,
-   "requiredProjectName": "Project_360cmIRLaserBattery",
+   "requiredProjectName": "Project_60cmIRLaserBattery",
    "attackMode": true,
    "defenseMode": true,
    "hp": 1,
@@ -117,9 +111,8 @@
    "shotPower_MJ": 250,
    "wavelength_nm": 1080,
    "mirrorRadius_cm": 360,
-   "beam_quality": 1.3,
-   "jitter_Rad": 1.34e-7,
-   "jitter_Div": 10000000,
+   "beam_quality": 1.35,
+   "jitter_Rad": 6.4e-8,
    "bombardmentValue": 0.8,
    "targetingRange_km": 850,
    "pivotRange_deg": 180,
@@ -127,8 +120,7 @@
    "weightedBuildMaterials": {
       "volatiles": 0.1,
       "metals": 0.7,
-      "nobleMetals": 0.2,
-      "exotics": null
+      "nobleMetals": 0.2
    },
    "iconResource": "shipbuildericons/ICO_360cmIRLaserBattery",
    "modelResource": "shipweapons/large_laser_battery",
@@ -151,9 +143,8 @@
    "shotPower_MJ": 200,
    "wavelength_nm": 1080,
    "mirrorRadius_cm": 240,
-   "beam_quality": 1.3,
-   "jitter_Rad": 1.32e-7,
-   "jitter_Div": 10000000,
+   "beam_quality": 1.35,
+   "jitter_Rad": 5.1e-8,
    "bombardmentValue": 0.6,
    "targetingRange_km": 800,
    "pivotRange_deg": 45,
@@ -161,8 +152,7 @@
    "weightedBuildMaterials": {
       "volatiles": 0.1,
       "metals": 0.7,
-      "nobleMetals": 0.2,
-      "exotics": null
+      "nobleMetals": 0.2
    },
    "iconResource": "shipbuildericons/ICO_240cmIRLaserCannon",
    "modelResource": "shipweapons/small_laser_cannon",
@@ -175,7 +165,7 @@
    "mount": "TwoNoseVert",
    "crew": 5,
    "sortOrder": 6,
-   "requiredProjectName": "Project_480cmIRLaserCannon",
+   "requiredProjectName": "Project_240cmIRLaserCannon",
    "attackMode": true,
    "defenseMode": true,
    "hp": 1,
@@ -185,9 +175,8 @@
    "shotPower_MJ": 300,
    "wavelength_nm": 1080,
    "mirrorRadius_cm": 480,
-   "beam_quality": 1.3,
-   "jitter_Rad": 1.36e-7,
-   "jitter_Div": 10000000,
+   "beam_quality": 1.35,
+   "jitter_Rad": 4.1e-8,
    "bombardmentValue": 1,
    "targetingRange_km": 900,
    "pivotRange_deg": 45,
@@ -195,8 +184,7 @@
    "weightedBuildMaterials": {
       "volatiles": 0.1,
       "metals": 0.7,
-      "nobleMetals": 0.2,
-      "exotics": null
+      "nobleMetals": 0.2
    },
    "iconResource": "shipbuildericons/ICO_480cmIRLaserCannon",
    "modelResource": "shipweapons/medium_laser_cannon",
@@ -209,7 +197,7 @@
    "mount": "ThreeNoseAngle",
    "crew": 6,
    "sortOrder": 7,
-   "requiredProjectName": "Project_720cmIRLaserCannon",
+   "requiredProjectName": "Project_240cmIRLaserCannon",
    "attackMode": true,
    "defenseMode": true,
    "hp": 1,
@@ -219,9 +207,8 @@
    "shotPower_MJ": 350,
    "wavelength_nm": 1080,
    "mirrorRadius_cm": 720,
-   "beam_quality": 1.3,
-   "jitter_Rad": 1.39e-7,
-   "jitter_Div": 10000000,
+   "beam_quality": 1.35,
+   "jitter_Rad": 3.3e-8,
    "bombardmentValue": 1.4,
    "targetingRange_km": 950,
    "pivotRange_deg": 45,
@@ -229,8 +216,7 @@
    "weightedBuildMaterials": {
       "volatiles": 0.1,
       "metals": 0.7,
-      "nobleMetals": 0.2,
-      "exotics": null
+      "nobleMetals": 0.2
    },
    "iconResource": "shipbuildericons/ICO_720cmIRLaserCannon",
    "modelResource": "shipweapons/large_laser_cannon",
@@ -243,7 +229,7 @@
    "mount": "FourNose",
    "crew": 8,
    "sortOrder": 8,
-   "requiredProjectName": "Project_960cmIRLaserCannon",
+   "requiredProjectName": "Project_240cmIRLaserCannon",
    "attackMode": true,
    "defenseMode": true,
    "hp": 1,
@@ -253,9 +239,8 @@
    "shotPower_MJ": 400,
    "wavelength_nm": 1080,
    "mirrorRadius_cm": 960,
-   "beam_quality": 1.3,
-   "jitter_Rad": 1.4e-7,
-   "jitter_Div": 10050000,
+   "beam_quality": 1.35,
+   "jitter_Rad": 2.6e-8,
    "bombardmentValue": 2,
    "targetingRange_km": 1000,
    "pivotRange_deg": 45,
@@ -263,8 +248,7 @@
    "weightedBuildMaterials": {
       "volatiles": 0.1,
       "metals": 0.7,
-      "nobleMetals": 0.2,
-      "exotics": null
+      "nobleMetals": 0.2
    },
    "iconResource": "shipbuildericons/ICO_960cmIRLaserCannon",
    "modelResource": "shipweapons/huge_laser_cannon",
@@ -287,9 +271,8 @@
    "shotPower_MJ": 50,
    "wavelength_nm": 1080,
    "mirrorRadius_cm": 30,
-   "beam_quality": 1.2,
-   "jitter_Rad": 9.5e-8,
-   "jitter_Div": null,
+   "beam_quality": 1.25,
+   "jitter_Rad": 7.5e-8,
    "bombardmentValue": 0,
    "targetingRange_km": 300,
    "pivotRange_deg": 180,
@@ -297,8 +280,7 @@
    "weightedBuildMaterials": {
       "volatiles": 0.1,
       "metals": 0.65,
-      "nobleMetals": 0.25,
-      "exotics": null
+      "nobleMetals": 0.25
    },
    "iconResource": "shipbuildericons/ICO_PointDefenseArcLaserTurret",
    "modelResource": "shipweapons/point_defense_laser_battery",
@@ -321,9 +303,8 @@
    "shotPower_MJ": 100,
    "wavelength_nm": 1080,
    "mirrorRadius_cm": 60,
-   "beam_quality": 1.2,
-   "jitter_Rad": 9.8e-8,
-   "jitter_Div": null,
+   "beam_quality": 1.25,
+   "jitter_Rad": 7.5e-8,
    "bombardmentValue": 0.2,
    "targetingRange_km": 600,
    "pivotRange_deg": 180,
@@ -331,8 +312,7 @@
    "weightedBuildMaterials": {
       "volatiles": 0.1,
       "metals": 0.65,
-      "nobleMetals": 0.25,
-      "exotics": null
+      "nobleMetals": 0.25
    },
    "iconResource": "shipbuildericons/ICO_60cmIRArcLaserBattery",
    "modelResource": "shipweapons/small_laser_battery",
@@ -345,7 +325,7 @@
    "mount": "TwoHullHoriz",
    "crew": 3,
    "sortOrder": 11,
-   "requiredProjectName": "Project_120cmIRArcLaserBattery",
+   "requiredProjectName": "Project_60cmIRArcLaserBattery",
    "attackMode": true,
    "defenseMode": true,
    "hp": 1,
@@ -355,9 +335,8 @@
    "shotPower_MJ": 150,
    "wavelength_nm": 1080,
    "mirrorRadius_cm": 120,
-   "beam_quality": 1.2,
-   "jitter_Rad": 1.02e-7,
-   "jitter_Div": null,
+   "beam_quality": 1.25,
+   "jitter_Rad": 6e-8,
    "bombardmentValue": 0.4,
    "targetingRange_km": 700,
    "pivotRange_deg": 180,
@@ -365,8 +344,7 @@
    "weightedBuildMaterials": {
       "volatiles": 0.1,
       "metals": 0.65,
-      "nobleMetals": 0.25,
-      "exotics": null
+      "nobleMetals": 0.25
    },
    "iconResource": "shipbuildericons/ICO_120cmIRArcLaserBattery",
    "modelResource": "shipweapons/medium_laser_battery",
@@ -379,7 +357,7 @@
    "mount": "FourHull",
    "crew": 4,
    "sortOrder": 12,
-   "requiredProjectName": "Project_360cmIRArcLaserBattery",
+   "requiredProjectName": "Project_60cmIRArcLaserBattery",
    "attackMode": true,
    "defenseMode": true,
    "hp": 1,
@@ -389,9 +367,8 @@
    "shotPower_MJ": 250,
    "wavelength_nm": 1080,
    "mirrorRadius_cm": 360,
-   "beam_quality": 1.2,
-   "jitter_Rad": 1.07e-7,
-   "jitter_Div": null,
+   "beam_quality": 1.25,
+   "jitter_Rad": 4.8e-8,
    "bombardmentValue": 0.8,
    "targetingRange_km": 850,
    "pivotRange_deg": 180,
@@ -399,8 +376,7 @@
    "weightedBuildMaterials": {
       "volatiles": 0.1,
       "metals": 0.65,
-      "nobleMetals": 0.25,
-      "exotics": null
+      "nobleMetals": 0.25
    },
    "iconResource": "shipbuildericons/ICO_360cmIRArcLaserBattery",
    "modelResource": "shipweapons/large_laser_battery",
@@ -423,9 +399,8 @@
    "shotPower_MJ": 200,
    "wavelength_nm": 1080,
    "mirrorRadius_cm": 240,
-   "beam_quality": 1.2,
-   "jitter_Rad": 1.05e-7,
-   "jitter_Div": null,
+   "beam_quality": 1.25,
+   "jitter_Rad": 3.8e-8,
    "bombardmentValue": 0.6,
    "targetingRange_km": 800,
    "pivotRange_deg": 45,
@@ -433,8 +408,7 @@
    "weightedBuildMaterials": {
       "volatiles": 0.1,
       "metals": 0.65,
-      "nobleMetals": 0.25,
-      "exotics": null
+      "nobleMetals": 0.25
    },
    "iconResource": "shipbuildericons/ICO_240cmIRArcLaserCannon",
    "modelResource": "shipweapons/small_laser_cannon",
@@ -447,7 +421,7 @@
    "mount": "TwoNoseVert",
    "crew": 5,
    "sortOrder": 14,
-   "requiredProjectName": "Project_480cmIRArcLaserCannon",
+   "requiredProjectName": "Project_240cmIRArcLaserCannon",
    "attackMode": true,
    "defenseMode": true,
    "hp": 1,
@@ -457,9 +431,8 @@
    "shotPower_MJ": 300,
    "wavelength_nm": 1080,
    "mirrorRadius_cm": 480,
-   "beam_quality": 1.2,
-   "jitter_Rad": 1.09e-7,
-   "jitter_Div": null,
+   "beam_quality": 1.25,
+   "jitter_Rad": 3.1e-8,
    "bombardmentValue": 1,
    "targetingRange_km": 900,
    "pivotRange_deg": 45,
@@ -467,8 +440,7 @@
    "weightedBuildMaterials": {
       "volatiles": 0.1,
       "metals": 0.65,
-      "nobleMetals": 0.25,
-      "exotics": null
+      "nobleMetals": 0.25
    },
    "iconResource": "shipbuildericons/ICO_480cmIRArcLaserCannon",
    "modelResource": "shipweapons/medium_laser_cannon",
@@ -481,7 +453,7 @@
    "mount": "ThreeNoseAngle",
    "crew": 6,
    "sortOrder": 15,
-   "requiredProjectName": "Project_720cmIRArcLaserCannon",
+   "requiredProjectName": "Project_240cmIRArcLaserCannon",
    "attackMode": true,
    "defenseMode": true,
    "hp": 1,
@@ -491,9 +463,8 @@
    "shotPower_MJ": 350,
    "wavelength_nm": 1080,
    "mirrorRadius_cm": 720,
-   "beam_quality": 1.2,
-   "jitter_Rad": 1.11e-7,
-   "jitter_Div": null,
+   "beam_quality": 1.25,
+   "jitter_Rad": 2.5e-8,
    "bombardmentValue": 1.4,
    "targetingRange_km": 950,
    "pivotRange_deg": 45,
@@ -501,8 +472,7 @@
    "weightedBuildMaterials": {
       "volatiles": 0.1,
       "metals": 0.65,
-      "nobleMetals": 0.25,
-      "exotics": null
+      "nobleMetals": 0.25
    },
    "iconResource": "shipbuildericons/ICO_720cmIRArcLaserCannon",
    "modelResource": "shipweapons/large_laser_cannon",
@@ -515,7 +485,7 @@
    "mount": "FourNose",
    "crew": 8,
    "sortOrder": 16,
-   "requiredProjectName": "Project_960cmIRArcLaserCannon",
+   "requiredProjectName": "Project_240cmIRArcLaserCannon",
    "attackMode": true,
    "defenseMode": true,
    "hp": 1,
@@ -525,9 +495,8 @@
    "shotPower_MJ": 400,
    "wavelength_nm": 1080,
    "mirrorRadius_cm": 960,
-   "beam_quality": 1.2,
-   "jitter_Rad": 1.12e-7,
-   "jitter_Div": null,
+   "beam_quality": 1.25,
+   "jitter_Rad": 2e-8,
    "bombardmentValue": 2,
    "targetingRange_km": 1000,
    "pivotRange_deg": 45,
@@ -535,8 +504,7 @@
    "weightedBuildMaterials": {
       "volatiles": 0.1,
       "metals": 0.65,
-      "nobleMetals": 0.25,
-      "exotics": null
+      "nobleMetals": 0.25
    },
    "iconResource": "shipbuildericons/ICO_960cmIRArcLaserCannon",
    "modelResource": "shipweapons/huge_laser_cannon",
@@ -559,9 +527,8 @@
    "shotPower_MJ": 50,
    "wavelength_nm": 1080,
    "mirrorRadius_cm": 30,
-   "beam_quality": 1.1,
-   "jitter_Rad": 7.1e-8,
-   "jitter_Div": null,
+   "beam_quality": 1.15,
+   "jitter_Rad": 5e-8,
    "bombardmentValue": 0,
    "targetingRange_km": 350,
    "pivotRange_deg": 180,
@@ -569,8 +536,7 @@
    "weightedBuildMaterials": {
       "volatiles": 0.1,
       "metals": 0.6,
-      "nobleMetals": 0.3,
-      "exotics": null
+      "nobleMetals": 0.3
    },
    "iconResource": "shipbuildericons/ICO_PointDefensePhaserTurret",
    "modelResource": "shipweapons/point_defense_laser_battery",
@@ -593,9 +559,8 @@
    "shotPower_MJ": 100,
    "wavelength_nm": 1080,
    "mirrorRadius_cm": 60,
-   "beam_quality": 1.1,
-   "jitter_Rad": 7.4e-8,
-   "jitter_Div": null,
+   "beam_quality": 1.15,
+   "jitter_Rad": 5e-8,
    "bombardmentValue": 0.2,
    "targetingRange_km": 600,
    "pivotRange_deg": 180,
@@ -603,8 +568,7 @@
    "weightedBuildMaterials": {
       "volatiles": 0.1,
       "metals": 0.6,
-      "nobleMetals": 0.3,
-      "exotics": null
+      "nobleMetals": 0.3
    },
    "iconResource": "shipbuildericons/ICO_60cmIRPhaserBattery",
    "modelResource": "shipweapons/small_laser_battery",
@@ -617,7 +581,7 @@
    "mount": "TwoHullHoriz",
    "crew": 3,
    "sortOrder": 19,
-   "requiredProjectName": "Project_120cmIRPhaserBattery",
+   "requiredProjectName": "Project_60cmIRPhaserBattery",
    "attackMode": true,
    "defenseMode": true,
    "hp": 1,
@@ -627,9 +591,8 @@
    "shotPower_MJ": 150,
    "wavelength_nm": 1080,
    "mirrorRadius_cm": 120,
-   "beam_quality": 1.1,
-   "jitter_Rad": 7.6e-8,
-   "jitter_Div": null,
+   "beam_quality": 1.15,
+   "jitter_Rad": 4e-8,
    "bombardmentValue": 0.4,
    "targetingRange_km": 700,
    "pivotRange_deg": 180,
@@ -637,8 +600,7 @@
    "weightedBuildMaterials": {
       "volatiles": 0.1,
       "metals": 0.6,
-      "nobleMetals": 0.3,
-      "exotics": null
+      "nobleMetals": 0.3
    },
    "iconResource": "shipbuildericons/ICO_120cmIRPhaserBattery",
    "modelResource": "shipweapons/medium_laser_battery",
@@ -651,7 +613,7 @@
    "mount": "FourHull",
    "crew": 4,
    "sortOrder": 20,
-   "requiredProjectName": "Project_360cmIRPhaserBattery",
+   "requiredProjectName": "Project_60cmIRPhaserBattery",
    "attackMode": true,
    "defenseMode": true,
    "hp": 1,
@@ -661,9 +623,8 @@
    "shotPower_MJ": 250,
    "wavelength_nm": 1080,
    "mirrorRadius_cm": 360,
-   "beam_quality": 1.1,
-   "jitter_Rad": 8.1e-8,
-   "jitter_Div": null,
+   "beam_quality": 1.15,
+   "jitter_Rad": 3.2e-8,
    "bombardmentValue": 0.8,
    "targetingRange_km": 850,
    "pivotRange_deg": 180,
@@ -671,8 +632,7 @@
    "weightedBuildMaterials": {
       "volatiles": 0.1,
       "metals": 0.6,
-      "nobleMetals": 0.3,
-      "exotics": null
+      "nobleMetals": 0.3
    },
    "iconResource": "shipbuildericons/ICO_360cmIRPhaserBattery",
    "modelResource": "shipweapons/large_laser_battery",
@@ -695,9 +655,8 @@
    "shotPower_MJ": 200,
    "wavelength_nm": 1080,
    "mirrorRadius_cm": 240,
-   "beam_quality": 1.1,
-   "jitter_Rad": 7.9e-8,
-   "jitter_Div": null,
+   "beam_quality": 1.15,
+   "jitter_Rad": 2.6e-8,
    "bombardmentValue": 0.6,
    "targetingRange_km": 800,
    "pivotRange_deg": 45,
@@ -705,8 +664,7 @@
    "weightedBuildMaterials": {
       "volatiles": 0.1,
       "metals": 0.6,
-      "nobleMetals": 0.3,
-      "exotics": null
+      "nobleMetals": 0.3
    },
    "iconResource": "shipbuildericons/ICO_240cmIRPhaserCannon",
    "modelResource": "shipweapons/small_laser_cannon",
@@ -719,7 +677,7 @@
    "mount": "TwoNoseVert",
    "crew": 5,
    "sortOrder": 22,
-   "requiredProjectName": "Project_480cmIRPhaserCannon",
+   "requiredProjectName": "Project_240cmIRPhaserCannon",
    "attackMode": true,
    "defenseMode": true,
    "hp": 1,
@@ -729,9 +687,8 @@
    "shotPower_MJ": 300,
    "wavelength_nm": 1080,
    "mirrorRadius_cm": 480,
-   "beam_quality": 1.1,
-   "jitter_Rad": 8.2e-8,
-   "jitter_Div": null,
+   "beam_quality": 1.15,
+   "jitter_Rad": 2e-8,
    "bombardmentValue": 1,
    "targetingRange_km": 900,
    "pivotRange_deg": 45,
@@ -739,8 +696,7 @@
    "weightedBuildMaterials": {
       "volatiles": 0.1,
       "metals": 0.6,
-      "nobleMetals": 0.3,
-      "exotics": null
+      "nobleMetals": 0.3
    },
    "iconResource": "shipbuildericons/ICO_480cmIRPhaserCannon",
    "modelResource": "shipweapons/medium_laser_cannon",
@@ -753,7 +709,7 @@
    "mount": "ThreeNoseAngle",
    "crew": 6,
    "sortOrder": 23,
-   "requiredProjectName": "Project_720cmIRPhaserCannon",
+   "requiredProjectName": "Project_240cmIRPhaserCannon",
    "attackMode": true,
    "defenseMode": true,
    "hp": 1,
@@ -763,9 +719,8 @@
    "shotPower_MJ": 350,
    "wavelength_nm": 1080,
    "mirrorRadius_cm": 720,
-   "beam_quality": 1.1,
-   "jitter_Rad": 8.3e-8,
-   "jitter_Div": null,
+   "beam_quality": 1.15,
+   "jitter_Rad": 1.6e-8,
    "bombardmentValue": 1.4,
    "targetingRange_km": 950,
    "pivotRange_deg": 45,
@@ -773,8 +728,7 @@
    "weightedBuildMaterials": {
       "volatiles": 0.1,
       "metals": 0.6,
-      "nobleMetals": 0.3,
-      "exotics": null
+      "nobleMetals": 0.3
    },
    "iconResource": "shipbuildericons/ICO_720cmIRPhaserCannon",
    "modelResource": "shipweapons/large_laser_cannon",
@@ -787,7 +741,7 @@
    "mount": "FourNose",
    "crew": 8,
    "sortOrder": 24,
-   "requiredProjectName": "Project_960cmIRPhaserCannon",
+   "requiredProjectName": "Project_240cmIRPhaserCannon",
    "attackMode": true,
    "defenseMode": true,
    "hp": 1,
@@ -797,9 +751,8 @@
    "shotPower_MJ": 400,
    "wavelength_nm": 1080,
    "mirrorRadius_cm": 960,
-   "beam_quality": 1.1,
-   "jitter_Rad": 8.4e-8,
-   "jitter_Div": null,
+   "beam_quality": 1.15,
+   "jitter_Rad": 1.3e-8,
    "bombardmentValue": 2,
    "targetingRange_km": 1000,
    "pivotRange_deg": 45,
@@ -807,8 +760,7 @@
    "weightedBuildMaterials": {
       "volatiles": 0.1,
       "metals": 0.6,
-      "nobleMetals": 0.3,
-      "exotics": null
+      "nobleMetals": 0.3
    },
    "iconResource": "shipbuildericons/ICO_960cmIRPhaserCannon",
    "modelResource": "shipweapons/huge_laser_cannon",
@@ -832,8 +784,7 @@
    "wavelength_nm": 540,
    "mirrorRadius_cm": 60,
    "beam_quality": 1.3,
-   "jitter_Rad": 1.23e-7,
-   "jitter_Div": 10000000,
+   "jitter_Rad": 1e-7,
    "bombardmentValue": 0.2,
    "targetingRange_km": 600,
    "pivotRange_deg": 180,
@@ -841,8 +792,7 @@
    "weightedBuildMaterials": {
       "volatiles": 0.1,
       "metals": 0.65,
-      "nobleMetals": 0.25,
-      "exotics": null
+      "nobleMetals": 0.25
    },
    "iconResource": "shipbuildericons/ICO_60cmGreenLaserBattery",
    "modelResource": "shipweapons/small_laser_battery",
@@ -855,7 +805,7 @@
    "mount": "TwoHullHoriz",
    "crew": 3,
    "sortOrder": 26,
-   "requiredProjectName": "Project_120cmGreenLaserBattery",
+   "requiredProjectName": "Project_60cmGreenLaserBattery",
    "attackMode": true,
    "defenseMode": true,
    "hp": 1,
@@ -866,8 +816,7 @@
    "wavelength_nm": 540,
    "mirrorRadius_cm": 120,
    "beam_quality": 1.3,
-   "jitter_Rad": 1.27e-7,
-   "jitter_Div": 10000000,
+   "jitter_Rad": 8e-8,
    "bombardmentValue": 0.4,
    "targetingRange_km": 700,
    "pivotRange_deg": 180,
@@ -875,8 +824,7 @@
    "weightedBuildMaterials": {
       "volatiles": 0.1,
       "metals": 0.65,
-      "nobleMetals": 0.25,
-      "exotics": null
+      "nobleMetals": 0.25
    },
    "iconResource": "shipbuildericons/ICO_120cmGreenLaserBattery",
    "modelResource": "shipweapons/medium_laser_battery",
@@ -889,7 +837,7 @@
    "mount": "FourHull",
    "crew": 4,
    "sortOrder": 27,
-   "requiredProjectName": "Project_360cmGreenLaserBattery",
+   "requiredProjectName": "Project_60cmGreenLaserBattery",
    "attackMode": true,
    "defenseMode": true,
    "hp": 1,
@@ -900,8 +848,7 @@
    "wavelength_nm": 540,
    "mirrorRadius_cm": 360,
    "beam_quality": 1.3,
-   "jitter_Rad": 1.34e-7,
-   "jitter_Div": 10000000,
+   "jitter_Rad": 6.4e-8,
    "bombardmentValue": 0.8,
    "targetingRange_km": 850,
    "pivotRange_deg": 180,
@@ -909,8 +856,7 @@
    "weightedBuildMaterials": {
       "volatiles": 0.1,
       "metals": 0.65,
-      "nobleMetals": 0.25,
-      "exotics": null
+      "nobleMetals": 0.25
    },
    "iconResource": "shipbuildericons/ICO_360cmGreenLaserBattery",
    "modelResource": "shipweapons/large_laser_battery",
@@ -934,8 +880,7 @@
    "wavelength_nm": 540,
    "mirrorRadius_cm": 240,
    "beam_quality": 1.3,
-   "jitter_Rad": 1.32e-7,
-   "jitter_Div": 10000000,
+   "jitter_Rad": 5.1e-8,
    "bombardmentValue": 0.6,
    "targetingRange_km": 800,
    "pivotRange_deg": 45,
@@ -943,8 +888,7 @@
    "weightedBuildMaterials": {
       "volatiles": 0.1,
       "metals": 0.65,
-      "nobleMetals": 0.25,
-      "exotics": null
+      "nobleMetals": 0.25
    },
    "iconResource": "shipbuildericons/ICO_240cmGreenLaserCannon",
    "modelResource": "shipweapons/small_laser_cannon",
@@ -957,7 +901,7 @@
    "mount": "TwoNoseVert",
    "crew": 5,
    "sortOrder": 29,
-   "requiredProjectName": "Project_480cmGreenLaserCannon",
+   "requiredProjectName": "Project_240cmGreenLaserCannon",
    "attackMode": true,
    "defenseMode": true,
    "hp": 1,
@@ -968,8 +912,7 @@
    "wavelength_nm": 540,
    "mirrorRadius_cm": 480,
    "beam_quality": 1.3,
-   "jitter_Rad": 1.36e-7,
-   "jitter_Div": 10000000,
+   "jitter_Rad": 4.1e-8,
    "bombardmentValue": 1,
    "targetingRange_km": 900,
    "pivotRange_deg": 45,
@@ -977,8 +920,7 @@
    "weightedBuildMaterials": {
       "volatiles": 0.1,
       "metals": 0.65,
-      "nobleMetals": 0.25,
-      "exotics": null
+      "nobleMetals": 0.25
    },
    "iconResource": "shipbuildericons/ICO_480cmGreenLaserCannon",
    "modelResource": "shipweapons/medium_laser_cannon",
@@ -991,7 +933,7 @@
    "mount": "ThreeNoseAngle",
    "crew": 6,
    "sortOrder": 30,
-   "requiredProjectName": "Project_720cmGreenLaserCannon",
+   "requiredProjectName": "Project_240cmGreenLaserCannon",
    "attackMode": true,
    "defenseMode": true,
    "hp": 1,
@@ -1002,8 +944,7 @@
    "wavelength_nm": 540,
    "mirrorRadius_cm": 720,
    "beam_quality": 1.3,
-   "jitter_Rad": 1.39e-7,
-   "jitter_Div": 10000000,
+   "jitter_Rad": 3.3e-8,
    "bombardmentValue": 1.4,
    "targetingRange_km": 950,
    "pivotRange_deg": 45,
@@ -1011,8 +952,7 @@
    "weightedBuildMaterials": {
       "volatiles": 0.1,
       "metals": 0.65,
-      "nobleMetals": 0.25,
-      "exotics": null
+      "nobleMetals": 0.25
    },
    "iconResource": "shipbuildericons/ICO_720cmGreenLaserCannon",
    "modelResource": "shipweapons/large_laser_cannon",
@@ -1025,7 +965,7 @@
    "mount": "FourNose",
    "crew": 8,
    "sortOrder": 31,
-   "requiredProjectName": "Project_960cmGreenLaserCannon",
+   "requiredProjectName": "Project_240cmGreenLaserCannon",
    "attackMode": true,
    "defenseMode": true,
    "hp": 1,
@@ -1036,8 +976,7 @@
    "wavelength_nm": 540,
    "mirrorRadius_cm": 960,
    "beam_quality": 1.3,
-   "jitter_Rad": 1.4e-7,
-   "jitter_Div": 10050000,
+   "jitter_Rad": 2.6e-8,
    "bombardmentValue": 2,
    "targetingRange_km": 1000,
    "pivotRange_deg": 45,
@@ -1045,8 +984,7 @@
    "weightedBuildMaterials": {
       "volatiles": 0.1,
       "metals": 0.65,
-      "nobleMetals": 0.25,
-      "exotics": null
+      "nobleMetals": 0.25
    },
    "iconResource": "shipbuildericons/ICO_960cmGreenLaserCannon",
    "modelResource": "shipweapons/huge_laser_cannon",
@@ -1070,8 +1008,7 @@
    "wavelength_nm": 540,
    "mirrorRadius_cm": 60,
    "beam_quality": 1.2,
-   "jitter_Rad": 9.8e-8,
-   "jitter_Div": null,
+   "jitter_Rad": 7.5e-8,
    "bombardmentValue": 0.4,
    "targetingRange_km": 600,
    "pivotRange_deg": 180,
@@ -1079,8 +1016,7 @@
    "weightedBuildMaterials": {
       "volatiles": 0.1,
       "metals": 0.6,
-      "nobleMetals": 0.3,
-      "exotics": null
+      "nobleMetals": 0.3
    },
    "iconResource": "shipbuildericons/ICO_60cmGreenArcLaserBattery",
    "modelResource": "shipweapons/small_laser_battery",
@@ -1093,7 +1029,7 @@
    "mount": "TwoHullHoriz",
    "crew": 3,
    "sortOrder": 33,
-   "requiredProjectName": "Project_120cmGreenArcLaserBattery",
+   "requiredProjectName": "Project_60cmGreenArcLaserBattery",
    "attackMode": true,
    "defenseMode": true,
    "hp": 1,
@@ -1104,8 +1040,7 @@
    "wavelength_nm": 540,
    "mirrorRadius_cm": 120,
    "beam_quality": 1.2,
-   "jitter_Rad": 1.02e-7,
-   "jitter_Div": null,
+   "jitter_Rad": 6e-8,
    "bombardmentValue": 0.8,
    "targetingRange_km": 700,
    "pivotRange_deg": 180,
@@ -1113,8 +1048,7 @@
    "weightedBuildMaterials": {
       "volatiles": 0.1,
       "metals": 0.6,
-      "nobleMetals": 0.3,
-      "exotics": null
+      "nobleMetals": 0.3
    },
    "iconResource": "shipbuildericons/ICO_120cmGreenArcLaserBattery",
    "modelResource": "shipweapons/medium_laser_battery",
@@ -1127,7 +1061,7 @@
    "mount": "FourHull",
    "crew": 4,
    "sortOrder": 34,
-   "requiredProjectName": "Project_360cmGreenArcLaserBattery",
+   "requiredProjectName": "Project_60cmGreenArcLaserBattery",
    "attackMode": true,
    "defenseMode": true,
    "hp": 1,
@@ -1138,8 +1072,7 @@
    "wavelength_nm": 540,
    "mirrorRadius_cm": 360,
    "beam_quality": 1.2,
-   "jitter_Rad": 1.07e-7,
-   "jitter_Div": null,
+   "jitter_Rad": 4.8e-8,
    "bombardmentValue": 1.6,
    "targetingRange_km": 850,
    "pivotRange_deg": 180,
@@ -1147,8 +1080,7 @@
    "weightedBuildMaterials": {
       "volatiles": 0.1,
       "metals": 0.6,
-      "nobleMetals": 0.3,
-      "exotics": null
+      "nobleMetals": 0.3
    },
    "iconResource": "shipbuildericons/ICO_360cmGreenArcLaserBattery",
    "modelResource": "shipweapons/large_laser_battery",
@@ -1172,8 +1104,7 @@
    "wavelength_nm": 540,
    "mirrorRadius_cm": 240,
    "beam_quality": 1.2,
-   "jitter_Rad": 1.05e-7,
-   "jitter_Div": null,
+   "jitter_Rad": 3.8e-8,
    "bombardmentValue": 1.2,
    "targetingRange_km": 800,
    "pivotRange_deg": 45,
@@ -1181,8 +1112,7 @@
    "weightedBuildMaterials": {
       "volatiles": 0.1,
       "metals": 0.6,
-      "nobleMetals": 0.3,
-      "exotics": null
+      "nobleMetals": 0.3
    },
    "iconResource": "shipbuildericons/ICO_240cmGreenArcLaserCannon",
    "modelResource": "shipweapons/small_laser_cannon",
@@ -1195,7 +1125,7 @@
    "mount": "TwoNoseVert",
    "crew": 5,
    "sortOrder": 36,
-   "requiredProjectName": "Project_480cmGreenArcLaserCannon",
+   "requiredProjectName": "Project_240cmGreenArcLaserCannon",
    "attackMode": true,
    "defenseMode": true,
    "hp": 1,
@@ -1206,8 +1136,7 @@
    "wavelength_nm": 540,
    "mirrorRadius_cm": 480,
    "beam_quality": 1.2,
-   "jitter_Rad": 1.09e-7,
-   "jitter_Div": null,
+   "jitter_Rad": 3.1e-8,
    "bombardmentValue": 2,
    "targetingRange_km": 900,
    "pivotRange_deg": 45,
@@ -1215,8 +1144,7 @@
    "weightedBuildMaterials": {
       "volatiles": 0.1,
       "metals": 0.6,
-      "nobleMetals": 0.3,
-      "exotics": null
+      "nobleMetals": 0.3
    },
    "iconResource": "shipbuildericons/ICO_480cmGreenArcLaserCannon",
    "modelResource": "shipweapons/medium_laser_cannon",
@@ -1229,7 +1157,7 @@
    "mount": "ThreeNoseAngle",
    "crew": 6,
    "sortOrder": 37,
-   "requiredProjectName": "Project_720cmGreenArcLaserCannon",
+   "requiredProjectName": "Project_240cmGreenArcLaserCannon",
    "attackMode": true,
    "defenseMode": true,
    "hp": 1,
@@ -1240,8 +1168,7 @@
    "wavelength_nm": 540,
    "mirrorRadius_cm": 720,
    "beam_quality": 1.2,
-   "jitter_Rad": 1.11e-7,
-   "jitter_Div": null,
+   "jitter_Rad": 2.5e-8,
    "bombardmentValue": 2.8,
    "targetingRange_km": 950,
    "pivotRange_deg": 45,
@@ -1249,8 +1176,7 @@
    "weightedBuildMaterials": {
       "volatiles": 0.1,
       "metals": 0.6,
-      "nobleMetals": 0.3,
-      "exotics": null
+      "nobleMetals": 0.3
    },
    "iconResource": "shipbuildericons/ICO_720cmGreenArcLaserCannon",
    "modelResource": "shipweapons/large_laser_cannon",
@@ -1263,7 +1189,7 @@
    "mount": "FourNose",
    "crew": 8,
    "sortOrder": 38,
-   "requiredProjectName": "Project_960cmGreenArcLaserCannon",
+   "requiredProjectName": "Project_240cmGreenArcLaserCannon",
    "attackMode": true,
    "defenseMode": true,
    "hp": 1,
@@ -1274,8 +1200,7 @@
    "wavelength_nm": 540,
    "mirrorRadius_cm": 960,
    "beam_quality": 1.2,
-   "jitter_Rad": 1.12e-7,
-   "jitter_Div": null,
+   "jitter_Rad": 2e-8,
    "bombardmentValue": 4,
    "targetingRange_km": 1000,
    "pivotRange_deg": 45,
@@ -1283,8 +1208,7 @@
    "weightedBuildMaterials": {
       "volatiles": 0.1,
       "metals": 0.6,
-      "nobleMetals": 0.3,
-      "exotics": null
+      "nobleMetals": 0.3
    },
    "iconResource": "shipbuildericons/ICO_960cmGreenArcLaserCannon",
    "modelResource": "shipweapons/huge_laser_cannon",
@@ -1308,17 +1232,16 @@
    "wavelength_nm": 540,
    "mirrorRadius_cm": 60,
    "beam_quality": 1.1,
-   "jitter_Rad": 7.4e-8,
-   "jitter_Div": null,
+   "jitter_Rad": 5e-8,
    "bombardmentValue": 0.8,
    "targetingRange_km": 600,
    "pivotRange_deg": 180,
    "isPointDefenseTargetable": false,
    "weightedBuildMaterials": {
       "volatiles": 0.1,
-      "metals": 0.55,
+      "metals": 0.525,
       "nobleMetals": 0.35,
-      "exotics": null
+      "exotics": 0.025
    },
    "iconResource": "shipbuildericons/ICO_60cmGreenPhaserBattery",
    "modelResource": "shipweapons/small_laser_battery",
@@ -1331,7 +1254,7 @@
    "mount": "TwoHullHoriz",
    "crew": 3,
    "sortOrder": 40,
-   "requiredProjectName": "Project_120cmGreenPhaserBattery",
+   "requiredProjectName": "Project_60cmGreenPhaserBattery",
    "attackMode": true,
    "defenseMode": true,
    "hp": 1,
@@ -1342,17 +1265,16 @@
    "wavelength_nm": 540,
    "mirrorRadius_cm": 120,
    "beam_quality": 1.1,
-   "jitter_Rad": 7.6e-8,
-   "jitter_Div": null,
+   "jitter_Rad": 4e-8,
    "bombardmentValue": 1.6,
    "targetingRange_km": 700,
    "pivotRange_deg": 180,
    "isPointDefenseTargetable": false,
    "weightedBuildMaterials": {
       "volatiles": 0.1,
-      "metals": 0.55,
+      "metals": 0.525,
       "nobleMetals": 0.35,
-      "exotics": null
+      "exotics": 0.025
    },
    "iconResource": "shipbuildericons/ICO_120cmGreenPhaserBattery",
    "modelResource": "shipweapons/medium_laser_battery",
@@ -1365,7 +1287,7 @@
    "mount": "FourHull",
    "crew": 4,
    "sortOrder": 41,
-   "requiredProjectName": "Project_360cmGreenPhaserBattery",
+   "requiredProjectName": "Project_60cmGreenPhaserBattery",
    "attackMode": true,
    "defenseMode": true,
    "hp": 1,
@@ -1376,17 +1298,16 @@
    "wavelength_nm": 540,
    "mirrorRadius_cm": 360,
    "beam_quality": 1.1,
-   "jitter_Rad": 8.1e-8,
-   "jitter_Div": null,
+   "jitter_Rad": 3.2e-8,
    "bombardmentValue": 3.2,
    "targetingRange_km": 850,
    "pivotRange_deg": 180,
    "isPointDefenseTargetable": false,
    "weightedBuildMaterials": {
       "volatiles": 0.1,
-      "metals": 0.55,
+      "metals": 0.525,
       "nobleMetals": 0.35,
-      "exotics": null
+      "exotics": 0.025
    },
    "iconResource": "shipbuildericons/ICO_360cmGreenPhaserBattery",
    "modelResource": "shipweapons/large_laser_battery",
@@ -1410,17 +1331,16 @@
    "wavelength_nm": 540,
    "mirrorRadius_cm": 240,
    "beam_quality": 1.1,
-   "jitter_Rad": 7.9e-8,
-   "jitter_Div": null,
+   "jitter_Rad": 2.6e-8,
    "bombardmentValue": 2.4,
    "targetingRange_km": 800,
    "pivotRange_deg": 45,
    "isPointDefenseTargetable": false,
    "weightedBuildMaterials": {
       "volatiles": 0.1,
-      "metals": 0.55,
+      "metals": 0.525,
       "nobleMetals": 0.35,
-      "exotics": null
+      "exotics": 0.025
    },
    "iconResource": "shipbuildericons/ICO_240cmGreenPhaserCannon",
    "modelResource": "shipweapons/small_laser_cannon",
@@ -1433,7 +1353,7 @@
    "mount": "TwoNoseVert",
    "crew": 5,
    "sortOrder": 43,
-   "requiredProjectName": "Project_480cmGreenPhaserCannon",
+   "requiredProjectName": "Project_240cmGreenPhaserCannon",
    "attackMode": true,
    "defenseMode": true,
    "hp": 1,
@@ -1444,17 +1364,16 @@
    "wavelength_nm": 540,
    "mirrorRadius_cm": 480,
    "beam_quality": 1.1,
-   "jitter_Rad": 8.2e-8,
-   "jitter_Div": null,
+   "jitter_Rad": 2e-8,
    "bombardmentValue": 4,
    "targetingRange_km": 900,
    "pivotRange_deg": 45,
    "isPointDefenseTargetable": false,
    "weightedBuildMaterials": {
       "volatiles": 0.1,
-      "metals": 0.55,
+      "metals": 0.525,
       "nobleMetals": 0.35,
-      "exotics": null
+      "exotics": 0.025
    },
    "iconResource": "shipbuildericons/ICO_480cmGreenPhaserCannon",
    "modelResource": "shipweapons/medium_laser_cannon",
@@ -1467,7 +1386,7 @@
    "mount": "ThreeNoseAngle",
    "crew": 6,
    "sortOrder": 44,
-   "requiredProjectName": "Project_720cmGreenPhaserCannon",
+   "requiredProjectName": "Project_240cmGreenPhaserCannon",
    "attackMode": true,
    "defenseMode": true,
    "hp": 1,
@@ -1478,17 +1397,16 @@
    "wavelength_nm": 540,
    "mirrorRadius_cm": 720,
    "beam_quality": 1.1,
-   "jitter_Rad": 8.3e-8,
-   "jitter_Div": null,
+   "jitter_Rad": 1.6e-8,
    "bombardmentValue": 5.6,
    "targetingRange_km": 950,
    "pivotRange_deg": 45,
    "isPointDefenseTargetable": false,
    "weightedBuildMaterials": {
       "volatiles": 0.1,
-      "metals": 0.55,
+      "metals": 0.525,
       "nobleMetals": 0.35,
-      "exotics": null
+      "exotics": 0.025
    },
    "iconResource": "shipbuildericons/ICO_720cmGreenPhaserCannon",
    "modelResource": "shipweapons/large_laser_cannon",
@@ -1501,7 +1419,7 @@
    "mount": "FourNose",
    "crew": 8,
    "sortOrder": 45,
-   "requiredProjectName": "Project_960cmGreenPhaserCannon",
+   "requiredProjectName": "Project_240cmGreenPhaserCannon",
    "attackMode": true,
    "defenseMode": true,
    "hp": 1,
@@ -1512,17 +1430,16 @@
    "wavelength_nm": 540,
    "mirrorRadius_cm": 960,
    "beam_quality": 1.1,
-   "jitter_Rad": 8.4e-8,
-   "jitter_Div": null,
+   "jitter_Rad": 1.3e-8,
    "bombardmentValue": 8,
    "targetingRange_km": 1000,
    "pivotRange_deg": 45,
    "isPointDefenseTargetable": false,
    "weightedBuildMaterials": {
       "volatiles": 0.1,
-      "metals": 0.55,
+      "metals": 0.525,
       "nobleMetals": 0.35,
-      "exotics": null
+      "exotics": 0.025
    },
    "iconResource": "shipbuildericons/ICO_960cmGreenPhaserCannon",
    "modelResource": "shipweapons/huge_laser_cannon",
@@ -1545,9 +1462,8 @@
    "shotPower_MJ": 100,
    "wavelength_nm": 270,
    "mirrorRadius_cm": 60,
-   "beam_quality": 1.3,
-   "jitter_Rad": 1.23e-7,
-   "jitter_Div": 10000000,
+   "beam_quality": 1.25,
+   "jitter_Rad": 1e-7,
    "bombardmentValue": 0.2,
    "targetingRange_km": 600,
    "pivotRange_deg": 180,
@@ -1555,8 +1471,7 @@
    "weightedBuildMaterials": {
       "volatiles": 0.1,
       "metals": 0.6,
-      "nobleMetals": 0.3,
-      "exotics": null
+      "nobleMetals": 0.3
    },
    "iconResource": "shipbuildericons/ICO_60cmUVLaserBattery",
    "modelResource": "shipweapons/small_laser_battery",
@@ -1569,7 +1484,7 @@
    "mount": "TwoHullHoriz",
    "crew": 3,
    "sortOrder": 47,
-   "requiredProjectName": "Project_120cmUVLaserBattery",
+   "requiredProjectName": "Project_60cmUVLaserBattery",
    "attackMode": true,
    "defenseMode": true,
    "hp": 1,
@@ -1579,9 +1494,8 @@
    "shotPower_MJ": 150,
    "wavelength_nm": 270,
    "mirrorRadius_cm": 120,
-   "beam_quality": 1.3,
-   "jitter_Rad": 1.27e-7,
-   "jitter_Div": 10000000,
+   "beam_quality": 1.25,
+   "jitter_Rad": 8e-8,
    "bombardmentValue": 0.4,
    "targetingRange_km": 700,
    "pivotRange_deg": 180,
@@ -1589,8 +1503,7 @@
    "weightedBuildMaterials": {
       "volatiles": 0.1,
       "metals": 0.6,
-      "nobleMetals": 0.3,
-      "exotics": null
+      "nobleMetals": 0.3
    },
    "iconResource": "shipbuildericons/ICO_120cmUVLaserBattery",
    "modelResource": "shipweapons/medium_laser_battery",
@@ -1603,7 +1516,7 @@
    "mount": "FourHull",
    "crew": 4,
    "sortOrder": 48,
-   "requiredProjectName": "Project_360cmUVLaserBattery",
+   "requiredProjectName": "Project_60cmUVLaserBattery",
    "attackMode": true,
    "defenseMode": true,
    "hp": 1,
@@ -1613,9 +1526,8 @@
    "shotPower_MJ": 250,
    "wavelength_nm": 270,
    "mirrorRadius_cm": 360,
-   "beam_quality": 1.3,
-   "jitter_Rad": 1.34e-7,
-   "jitter_Div": 10000000,
+   "beam_quality": 1.25,
+   "jitter_Rad": 6.4e-8,
    "bombardmentValue": 0.8,
    "targetingRange_km": 850,
    "pivotRange_deg": 180,
@@ -1623,8 +1535,7 @@
    "weightedBuildMaterials": {
       "volatiles": 0.1,
       "metals": 0.6,
-      "nobleMetals": 0.3,
-      "exotics": null
+      "nobleMetals": 0.3
    },
    "iconResource": "shipbuildericons/ICO_360cmUVLaserBattery",
    "modelResource": "shipweapons/large_laser_battery",
@@ -1647,9 +1558,8 @@
    "shotPower_MJ": 200,
    "wavelength_nm": 270,
    "mirrorRadius_cm": 240,
-   "beam_quality": 1.3,
-   "jitter_Rad": 1.32e-7,
-   "jitter_Div": 10000000,
+   "beam_quality": 1.25,
+   "jitter_Rad": 5.1e-8,
    "bombardmentValue": 0.6,
    "targetingRange_km": 800,
    "pivotRange_deg": 45,
@@ -1657,8 +1567,7 @@
    "weightedBuildMaterials": {
       "volatiles": 0.1,
       "metals": 0.6,
-      "nobleMetals": 0.3,
-      "exotics": null
+      "nobleMetals": 0.3
    },
    "iconResource": "shipbuildericons/ICO_240cmUVLaserCannon",
    "modelResource": "shipweapons/small_laser_cannon",
@@ -1671,7 +1580,7 @@
    "mount": "TwoNoseVert",
    "crew": 5,
    "sortOrder": 50,
-   "requiredProjectName": "Project_480cmUVLaserCannon",
+   "requiredProjectName": "Project_240cmUVLaserCannon",
    "attackMode": true,
    "defenseMode": true,
    "hp": 1,
@@ -1681,9 +1590,8 @@
    "shotPower_MJ": 300,
    "wavelength_nm": 270,
    "mirrorRadius_cm": 480,
-   "beam_quality": 1.3,
-   "jitter_Rad": 1.36e-7,
-   "jitter_Div": 10000000,
+   "beam_quality": 1.25,
+   "jitter_Rad": 4.1e-8,
    "bombardmentValue": 1,
    "targetingRange_km": 900,
    "pivotRange_deg": 45,
@@ -1691,8 +1599,7 @@
    "weightedBuildMaterials": {
       "volatiles": 0.1,
       "metals": 0.6,
-      "nobleMetals": 0.3,
-      "exotics": null
+      "nobleMetals": 0.3
    },
    "iconResource": "shipbuildericons/ICO_480cmUVLaserCannon",
    "modelResource": "shipweapons/medium_laser_cannon",
@@ -1705,7 +1612,7 @@
    "mount": "ThreeNoseAngle",
    "crew": 6,
    "sortOrder": 51,
-   "requiredProjectName": "Project_720cmUVLaserCannon",
+   "requiredProjectName": "Project_240cmUVLaserCannon",
    "attackMode": true,
    "defenseMode": true,
    "hp": 1,
@@ -1715,9 +1622,8 @@
    "shotPower_MJ": 350,
    "wavelength_nm": 270,
    "mirrorRadius_cm": 720,
-   "beam_quality": 1.3,
-   "jitter_Rad": 1.39e-7,
-   "jitter_Div": 10000000,
+   "beam_quality": 1.25,
+   "jitter_Rad": 3.3e-8,
    "bombardmentValue": 1.4,
    "targetingRange_km": 950,
    "pivotRange_deg": 45,
@@ -1725,8 +1631,7 @@
    "weightedBuildMaterials": {
       "volatiles": 0.1,
       "metals": 0.6,
-      "nobleMetals": 0.3,
-      "exotics": null
+      "nobleMetals": 0.3
    },
    "iconResource": "shipbuildericons/ICO_720cmUVLaserCannon",
    "modelResource": "shipweapons/large_laser_cannon",
@@ -1739,7 +1644,7 @@
    "mount": "FourNose",
    "crew": 8,
    "sortOrder": 52,
-   "requiredProjectName": "Project_960cmUVLaserCannon",
+   "requiredProjectName": "Project_240cmUVLaserCannon",
    "attackMode": true,
    "defenseMode": true,
    "hp": 1,
@@ -1749,9 +1654,8 @@
    "shotPower_MJ": 400,
    "wavelength_nm": 270,
    "mirrorRadius_cm": 960,
-   "beam_quality": 1.3,
-   "jitter_Rad": 1.4e-7,
-   "jitter_Div": 10050000,
+   "beam_quality": 1.25,
+   "jitter_Rad": 2.6e-8,
    "bombardmentValue": 2,
    "targetingRange_km": 1000,
    "pivotRange_deg": 45,
@@ -1759,8 +1663,7 @@
    "weightedBuildMaterials": {
       "volatiles": 0.1,
       "metals": 0.6,
-      "nobleMetals": 0.3,
-      "exotics": null
+      "nobleMetals": 0.3
    },
    "iconResource": "shipbuildericons/ICO_960cmUVLaserCannon",
    "modelResource": "shipweapons/huge_laser_cannon",
@@ -1783,18 +1686,16 @@
    "shotPower_MJ": 100,
    "wavelength_nm": 270,
    "mirrorRadius_cm": 60,
-   "beam_quality": 1.2,
-   "jitter_Rad": 9.8e-8,
-   "jitter_Div": null,
+   "beam_quality": 1.15,
+   "jitter_Rad": 7.5e-8,
    "bombardmentValue": 0.4,
    "targetingRange_km": 600,
    "pivotRange_deg": 180,
    "isPointDefenseTargetable": false,
    "weightedBuildMaterials": {
       "volatiles": 0.1,
-      "metals": 0.5,
-      "nobleMetals": 0.375,
-      "exotics": 0.025
+      "metals": 0.525,
+      "nobleMetals": 0.375
    },
    "iconResource": "shipbuildericons/ICO_60cmUVArcLaserBattery",
    "modelResource": "shipweapons/small_laser_battery",
@@ -1807,7 +1708,7 @@
    "mount": "TwoHullHoriz",
    "crew": 3,
    "sortOrder": 54,
-   "requiredProjectName": "Project_120cmUVArcLaserBattery",
+   "requiredProjectName": "Project_60cmUVArcLaserBattery",
    "attackMode": true,
    "defenseMode": true,
    "hp": 1,
@@ -1817,18 +1718,16 @@
    "shotPower_MJ": 150,
    "wavelength_nm": 270,
    "mirrorRadius_cm": 120,
-   "beam_quality": 1.2,
-   "jitter_Rad": 1.02e-7,
-   "jitter_Div": null,
+   "beam_quality": 1.15,
+   "jitter_Rad": 6e-8,
    "bombardmentValue": 0.8,
    "targetingRange_km": 700,
    "pivotRange_deg": 180,
    "isPointDefenseTargetable": false,
    "weightedBuildMaterials": {
       "volatiles": 0.1,
-      "metals": 0.5,
-      "nobleMetals": 0.375,
-      "exotics": 0.025
+      "metals": 0.525,
+      "nobleMetals": 0.375
    },
    "iconResource": "shipbuildericons/ICO_120cmUVArcLaserBattery",
    "modelResource": "shipweapons/medium_laser_battery",
@@ -1841,7 +1740,7 @@
    "mount": "FourHull",
    "crew": 4,
    "sortOrder": 55,
-   "requiredProjectName": "Project_360cmUVArcLaserBattery",
+   "requiredProjectName": "Project_60cmUVArcLaserBattery",
    "attackMode": true,
    "defenseMode": true,
    "hp": 1,
@@ -1851,18 +1750,16 @@
    "shotPower_MJ": 250,
    "wavelength_nm": 270,
    "mirrorRadius_cm": 360,
-   "beam_quality": 1.2,
-   "jitter_Rad": 1.07e-7,
-   "jitter_Div": null,
+   "beam_quality": 1.15,
+   "jitter_Rad": 4.8e-8,
    "bombardmentValue": 1.6,
    "targetingRange_km": 850,
    "pivotRange_deg": 180,
    "isPointDefenseTargetable": false,
    "weightedBuildMaterials": {
       "volatiles": 0.1,
-      "metals": 0.5,
-      "nobleMetals": 0.375,
-      "exotics": 0.025
+      "metals": 0.525,
+      "nobleMetals": 0.375
    },
    "iconResource": "shipbuildericons/ICO_360cmUVArcLaserBattery",
    "modelResource": "shipweapons/large_laser_battery",
@@ -1885,18 +1782,16 @@
    "shotPower_MJ": 200,
    "wavelength_nm": 270,
    "mirrorRadius_cm": 240,
-   "beam_quality": 1.2,
-   "jitter_Rad": 1.05e-7,
-   "jitter_Div": null,
+   "beam_quality": 1.15,
+   "jitter_Rad": 3.8e-8,
    "bombardmentValue": 1.2,
    "targetingRange_km": 800,
    "pivotRange_deg": 45,
    "isPointDefenseTargetable": false,
    "weightedBuildMaterials": {
       "volatiles": 0.1,
-      "metals": 0.5,
-      "nobleMetals": 0.375,
-      "exotics": 0.025
+      "metals": 0.525,
+      "nobleMetals": 0.375
    },
    "iconResource": "shipbuildericons/ICO_240cmUVArcLaserCannon",
    "modelResource": "shipweapons/small_laser_cannon",
@@ -1909,7 +1804,7 @@
    "mount": "TwoNoseVert",
    "crew": 5,
    "sortOrder": 57,
-   "requiredProjectName": "Project_480cmUVArcLaserCannon",
+   "requiredProjectName": "Project_240cmUVArcLaserCannon",
    "attackMode": true,
    "defenseMode": true,
    "hp": 1,
@@ -1919,18 +1814,16 @@
    "shotPower_MJ": 300,
    "wavelength_nm": 270,
    "mirrorRadius_cm": 480,
-   "beam_quality": 1.2,
-   "jitter_Rad": 1.09e-7,
-   "jitter_Div": null,
+   "beam_quality": 1.15,
+   "jitter_Rad": 3.1e-8,
    "bombardmentValue": 2,
    "targetingRange_km": 900,
    "pivotRange_deg": 45,
    "isPointDefenseTargetable": false,
    "weightedBuildMaterials": {
       "volatiles": 0.1,
-      "metals": 0.5,
-      "nobleMetals": 0.375,
-      "exotics": 0.025
+      "metals": 0.525,
+      "nobleMetals": 0.375
    },
    "iconResource": "shipbuildericons/ICO_480cmUVArcLaserCannon",
    "modelResource": "shipweapons/medium_laser_cannon",
@@ -1943,7 +1836,7 @@
    "mount": "ThreeNoseAngle",
    "crew": 6,
    "sortOrder": 58,
-   "requiredProjectName": "Project_720cmUVArcLaserCannon",
+   "requiredProjectName": "Project_240cmUVArcLaserCannon",
    "attackMode": true,
    "defenseMode": true,
    "hp": 1,
@@ -1953,18 +1846,16 @@
    "shotPower_MJ": 350,
    "wavelength_nm": 270,
    "mirrorRadius_cm": 720,
-   "beam_quality": 1.2,
-   "jitter_Rad": 1.11e-7,
-   "jitter_Div": null,
+   "beam_quality": 1.15,
+   "jitter_Rad": 2.5e-8,
    "bombardmentValue": 2.8,
    "targetingRange_km": 950,
    "pivotRange_deg": 45,
    "isPointDefenseTargetable": false,
    "weightedBuildMaterials": {
       "volatiles": 0.1,
-      "metals": 0.5,
-      "nobleMetals": 0.375,
-      "exotics": 0.025
+      "metals": 0.525,
+      "nobleMetals": 0.375
    },
    "iconResource": "shipbuildericons/ICO_720cmUVArcLaserCannon",
    "modelResource": "shipweapons/large_laser_cannon",
@@ -1977,7 +1868,7 @@
    "mount": "FourNose",
    "crew": 8,
    "sortOrder": 59,
-   "requiredProjectName": "Project_960cmUVArcLaserCannon",
+   "requiredProjectName": "Project_240cmUVArcLaserCannon",
    "attackMode": true,
    "defenseMode": true,
    "hp": 1,
@@ -1987,18 +1878,16 @@
    "shotPower_MJ": 400,
    "wavelength_nm": 270,
    "mirrorRadius_cm": 960,
-   "beam_quality": 1.2,
-   "jitter_Rad": 1.12e-7,
-   "jitter_Div": null,
+   "beam_quality": 1.15,
+   "jitter_Rad": 2e-8,
    "bombardmentValue": 4,
    "targetingRange_km": 1000,
    "pivotRange_deg": 45,
    "isPointDefenseTargetable": false,
    "weightedBuildMaterials": {
       "volatiles": 0.1,
-      "metals": 0.5,
-      "nobleMetals": 0.375,
-      "exotics": 0.025
+      "metals": 0.525,
+      "nobleMetals": 0.375
    },
    "iconResource": "shipbuildericons/ICO_960cmUVArcLaserCannon",
    "modelResource": "shipweapons/huge_laser_cannon",
@@ -2021,9 +1910,8 @@
    "shotPower_MJ": 100,
    "wavelength_nm": 270,
    "mirrorRadius_cm": 60,
-   "beam_quality": 1.1,
-   "jitter_Rad": 7.4e-8,
-   "jitter_Div": null,
+   "beam_quality": 1.05,
+   "jitter_Rad": 5e-8,
    "bombardmentValue": 0.8,
    "targetingRange_km": 600,
    "pivotRange_deg": 180,
@@ -2045,7 +1933,7 @@
    "mount": "TwoHullHoriz",
    "crew": 3,
    "sortOrder": 61,
-   "requiredProjectName": "Project_120cmUVPhaserBattery",
+   "requiredProjectName": "Project_60cmUVPhaserBattery",
    "attackMode": true,
    "defenseMode": true,
    "hp": 1,
@@ -2055,9 +1943,8 @@
    "shotPower_MJ": 150,
    "wavelength_nm": 270,
    "mirrorRadius_cm": 120,
-   "beam_quality": 1.1,
-   "jitter_Rad": 7.6e-8,
-   "jitter_Div": null,
+   "beam_quality": 1.05,
+   "jitter_Rad": 4e-8,
    "bombardmentValue": 1.6,
    "targetingRange_km": 700,
    "pivotRange_deg": 180,
@@ -2079,7 +1966,7 @@
    "mount": "FourHull",
    "crew": 4,
    "sortOrder": 62,
-   "requiredProjectName": "Project_360cmUVPhaserBattery",
+   "requiredProjectName": "Project_60cmUVPhaserBattery",
    "attackMode": true,
    "defenseMode": true,
    "hp": 1,
@@ -2089,9 +1976,8 @@
    "shotPower_MJ": 250,
    "wavelength_nm": 270,
    "mirrorRadius_cm": 360,
-   "beam_quality": 1.1,
-   "jitter_Rad": 8.1e-8,
-   "jitter_Div": null,
+   "beam_quality": 1.05,
+   "jitter_Rad": 3.2e-8,
    "bombardmentValue": 3.2,
    "targetingRange_km": 850,
    "pivotRange_deg": 180,
@@ -2123,9 +2009,8 @@
    "shotPower_MJ": 200,
    "wavelength_nm": 270,
    "mirrorRadius_cm": 240,
-   "beam_quality": 1.1,
-   "jitter_Rad": 7.9e-8,
-   "jitter_Div": null,
+   "beam_quality": 1.05,
+   "jitter_Rad": 2.6e-8,
    "bombardmentValue": 2.4,
    "targetingRange_km": 800,
    "pivotRange_deg": 45,
@@ -2147,7 +2032,7 @@
    "mount": "TwoNoseVert",
    "crew": 5,
    "sortOrder": 64,
-   "requiredProjectName": "Project_480cmUVPhaserCannon",
+   "requiredProjectName": "Project_240cmUVPhaserCannon",
    "attackMode": true,
    "defenseMode": true,
    "hp": 1,
@@ -2157,9 +2042,8 @@
    "shotPower_MJ": 300,
    "wavelength_nm": 270,
    "mirrorRadius_cm": 480,
-   "beam_quality": 1.1,
-   "jitter_Rad": 8.2e-8,
-   "jitter_Div": null,
+   "beam_quality": 1.05,
+   "jitter_Rad": 2e-8,
    "bombardmentValue": 4,
    "targetingRange_km": 900,
    "pivotRange_deg": 45,
@@ -2181,7 +2065,7 @@
    "mount": "ThreeNoseAngle",
    "crew": 6,
    "sortOrder": 65,
-   "requiredProjectName": "Project_720cmUVPhaserCannon",
+   "requiredProjectName": "Project_240cmUVPhaserCannon",
    "attackMode": true,
    "defenseMode": true,
    "hp": 1,
@@ -2191,9 +2075,8 @@
    "shotPower_MJ": 350,
    "wavelength_nm": 270,
    "mirrorRadius_cm": 720,
-   "beam_quality": 1.1,
-   "jitter_Rad": 8.3e-8,
-   "jitter_Div": null,
+   "beam_quality": 1.05,
+   "jitter_Rad": 1.6e-8,
    "bombardmentValue": 5.6,
    "targetingRange_km": 950,
    "pivotRange_deg": 45,
@@ -2215,7 +2098,7 @@
    "mount": "FourNose",
    "crew": 8,
    "sortOrder": 66,
-   "requiredProjectName": "Project_960cmUVPhaserCannon",
+   "requiredProjectName": "Project_240cmUVPhaserCannon",
    "attackMode": true,
    "defenseMode": true,
    "hp": 1,
@@ -2225,9 +2108,8 @@
    "shotPower_MJ": 400,
    "wavelength_nm": 270,
    "mirrorRadius_cm": 960,
-   "beam_quality": 1.1,
-   "jitter_Rad": 8.4e-8,
-   "jitter_Div": null,
+   "beam_quality": 1.05,
+   "jitter_Rad": 1.3e-8,
    "bombardmentValue": 8,
    "targetingRange_km": 1000,
    "pivotRange_deg": 45,
@@ -2247,7 +2129,6 @@
    "dataName": "AlienPointDefenseLaserTurret",
    "friendlyName": "Alien Point Defense Laser Turret",
    "mount": "OneHull",
-   "crew": null,
    "sortOrder": 67,
    "requiredProjectName": "Project_AlienMasterProject",
    "attackMode": false,
@@ -2260,17 +2141,14 @@
    "wavelength_nm": 980,
    "mirrorRadius_cm": 32,
    "beam_quality": 1.1,
-   "jitter_Rad": 7.9e-8,
-   "jitter_Div": 15000000,
+   "jitter_Rad": 5e-8,
    "bombardmentValue": 0,
    "targetingRange_km": 350,
    "pivotRange_deg": 180,
    "isPointDefenseTargetable": false,
    "weightedBuildMaterials": {
-      "volatiles": null,
       "metals": 0.9,
-      "nobleMetals": 0.1,
-      "exotics": null
+      "nobleMetals": 0.1
    },
    "iconResource": "shipbuildericons/ICO_AlienPointDefenseLaserTurret",
    "modelResource": "shipweapons/alien_point_defense_laser_battery",
@@ -2281,7 +2159,6 @@
    "dataName": "Alien64cmOrangeLaserBattery",
    "friendlyName": "Alien 64 cm Orange Laser Battery",
    "mount": "OneHull",
-   "crew": null,
    "sortOrder": 68,
    "requiredProjectName": "Project_AlienMasterProject",
    "attackMode": true,
@@ -2294,17 +2171,14 @@
    "wavelength_nm": 630,
    "mirrorRadius_cm": 64,
    "beam_quality": 1.1,
-   "jitter_Rad": 8.2e-8,
-   "jitter_Div": 15000000,
+   "jitter_Rad": 5e-8,
    "bombardmentValue": 0.8,
-   "targetingRange_km": 1000,
+   "targetingRange_km": 700,
    "pivotRange_deg": 180,
    "isPointDefenseTargetable": false,
    "weightedBuildMaterials": {
-      "volatiles": null,
       "metals": 0.9,
-      "nobleMetals": 0.1,
-      "exotics": null
+      "nobleMetals": 0.1
    },
    "iconResource": "shipbuildericons/ICO_Alien64cmOrangeLaserBattery",
    "modelResource": "shipweapons/alien_small_laser_battery",
@@ -2315,7 +2189,6 @@
    "dataName": "Alien128cmOrangeLaserBattery",
    "friendlyName": "Alien 128 cm Orange Laser Battery",
    "mount": "TwoHullHoriz",
-   "crew": null,
    "sortOrder": 69,
    "requiredProjectName": "Project_AlienMasterProject",
    "attackMode": true,
@@ -2328,17 +2201,14 @@
    "wavelength_nm": 630,
    "mirrorRadius_cm": 128,
    "beam_quality": 1.1,
-   "jitter_Rad": 8.5e-8,
-   "jitter_Div": 15000000,
+   "jitter_Rad": 4e-8,
    "bombardmentValue": 1.6,
-   "targetingRange_km": 1000,
+   "targetingRange_km": 800,
    "pivotRange_deg": 180,
    "isPointDefenseTargetable": false,
    "weightedBuildMaterials": {
-      "volatiles": null,
       "metals": 0.9,
-      "nobleMetals": 0.1,
-      "exotics": null
+      "nobleMetals": 0.1
    },
    "iconResource": "shipbuildericons/ICO_Alien128cmOrangeLaserBattery",
    "modelResource": "shipweapons/alien_medium_laser_battery",
@@ -2349,7 +2219,6 @@
    "dataName": "Alien384cmOrangeLaserBattery",
    "friendlyName": "Alien 384 cm Orange Laser Battery",
    "mount": "FourHull",
-   "crew": null,
    "sortOrder": 70,
    "requiredProjectName": "Project_AlienMasterProject",
    "attackMode": true,
@@ -2362,17 +2231,14 @@
    "wavelength_nm": 630,
    "mirrorRadius_cm": 384,
    "beam_quality": 1.1,
-   "jitter_Rad": 9e-8,
-   "jitter_Div": 15000000,
+   "jitter_Rad": 3.2e-8,
    "bombardmentValue": 3.2,
-   "targetingRange_km": 1000,
+   "targetingRange_km": 900,
    "pivotRange_deg": 180,
    "isPointDefenseTargetable": false,
    "weightedBuildMaterials": {
-      "volatiles": null,
       "metals": 0.9,
-      "nobleMetals": 0.1,
-      "exotics": null
+      "nobleMetals": 0.1
    },
    "iconResource": "shipbuildericons/ICO_Alien384cmOrangeLaserBattery",
    "modelResource": "shipweapons/alien_large_laser_battery",
@@ -2383,7 +2249,6 @@
    "dataName": "Alien256cmOrangeLaserCannon",
    "friendlyName": "Alien 256 cm Orange Laser Cannon",
    "mount": "OneNose",
-   "crew": null,
    "sortOrder": 71,
    "requiredProjectName": "Project_AlienMasterProject",
    "attackMode": true,
@@ -2396,17 +2261,14 @@
    "wavelength_nm": 630,
    "mirrorRadius_cm": 256,
    "beam_quality": 1.1,
-   "jitter_Rad": 8.8e-8,
-   "jitter_Div": 15000000,
+   "jitter_Rad": 2.6e-8,
    "bombardmentValue": 2.4,
-   "targetingRange_km": 1000,
+   "targetingRange_km": 800,
    "pivotRange_deg": 45,
    "isPointDefenseTargetable": false,
    "weightedBuildMaterials": {
-      "volatiles": null,
       "metals": 0.9,
-      "nobleMetals": 0.1,
-      "exotics": null
+      "nobleMetals": 0.1
    },
    "iconResource": "shipbuildericons/ICO_Alien256cmOrangeLaserCannon",
    "modelResource": "shipweapons/alien_small_laser_cannon",
@@ -2417,7 +2279,6 @@
    "dataName": "Alien512cmOrangeLaserCannon",
    "friendlyName": "Alien 512 cm Orange Laser Cannon",
    "mount": "TwoNoseVert",
-   "crew": null,
    "sortOrder": 72,
    "requiredProjectName": "Project_AlienMasterProject",
    "attackMode": true,
@@ -2430,17 +2291,14 @@
    "wavelength_nm": 630,
    "mirrorRadius_cm": 512,
    "beam_quality": 1.1,
-   "jitter_Rad": 9.1e-8,
-   "jitter_Div": 15000000,
+   "jitter_Rad": 2e-8,
    "bombardmentValue": 4,
-   "targetingRange_km": 1000,
+   "targetingRange_km": 900,
    "pivotRange_deg": 45,
    "isPointDefenseTargetable": false,
    "weightedBuildMaterials": {
-      "volatiles": null,
       "metals": 0.9,
-      "nobleMetals": 0.1,
-      "exotics": null
+      "nobleMetals": 0.1
    },
    "iconResource": "shipbuildericons/ICO_Alien512cmOrangeLaserCannon",
    "modelResource": "shipweapons/alien_medium_laser_cannon",
@@ -2451,7 +2309,6 @@
    "dataName": "Alien768cmOrangeLaserCannon",
    "friendlyName": "Alien 768 cm Orange Laser Cannon",
    "mount": "ThreeNoseAngle",
-   "crew": null,
    "sortOrder": 73,
    "requiredProjectName": "Project_AlienMasterProject",
    "attackMode": true,
@@ -2464,17 +2321,14 @@
    "wavelength_nm": 630,
    "mirrorRadius_cm": 768,
    "beam_quality": 1.1,
-   "jitter_Rad": 9.3e-8,
-   "jitter_Div": 15000000,
+   "jitter_Rad": 1.6e-8,
    "bombardmentValue": 5.6,
    "targetingRange_km": 1000,
    "pivotRange_deg": 45,
    "isPointDefenseTargetable": false,
    "weightedBuildMaterials": {
-      "volatiles": null,
       "metals": 0.9,
-      "nobleMetals": 0.1,
-      "exotics": null
+      "nobleMetals": 0.1
    },
    "iconResource": "shipbuildericons/ICO_Alien768cmOrangeLaserCannon",
    "modelResource": "shipweapons/alien_large_laser_cannon",
@@ -2485,7 +2339,6 @@
    "dataName": "Alien1024cmOrangeLaserCannon",
    "friendlyName": "Alien 1024 cm Orange Laser Cannon",
    "mount": "FourNose",
-   "crew": null,
    "sortOrder": 74,
    "requiredProjectName": "Project_AlienMasterProject",
    "attackMode": true,
@@ -2498,17 +2351,14 @@
    "wavelength_nm": 630,
    "mirrorRadius_cm": 1024,
    "beam_quality": 1.1,
-   "jitter_Rad": 9.4e-8,
-   "jitter_Div": 15000000,
+   "jitter_Rad": 1.3e-8,
    "bombardmentValue": 8,
    "targetingRange_km": 1000,
    "pivotRange_deg": 45,
    "isPointDefenseTargetable": false,
    "weightedBuildMaterials": {
-      "volatiles": null,
       "metals": 0.9,
-      "nobleMetals": 0.1,
-      "exotics": null
+      "nobleMetals": 0.1
    },
    "iconResource": "shipbuildericons/ICO_Alien1024cmOrangeLaserCannon",
    "modelResource": "shipweapons/alien_huge_laser_cannon",
@@ -2519,7 +2369,6 @@
    "dataName": "Alien64cmVioletLaserBattery",
    "friendlyName": "Alien 64 cm Violet Laser Battery",
    "mount": "OneHull",
-   "crew": null,
    "sortOrder": 75,
    "requiredProjectName": "Project_AlienMasterProject",
    "attackMode": true,
@@ -2532,14 +2381,12 @@
    "wavelength_nm": 450,
    "mirrorRadius_cm": 64,
    "beam_quality": 1.1,
-   "jitter_Rad": 7e-8,
-   "jitter_Div": 17500000,
+   "jitter_Rad": 4.5e-8,
    "bombardmentValue": 0.8,
-   "targetingRange_km": 1000,
+   "targetingRange_km": 800,
    "pivotRange_deg": 180,
    "isPointDefenseTargetable": false,
    "weightedBuildMaterials": {
-      "volatiles": null,
       "metals": 0.79,
       "nobleMetals": 0.2,
       "exotics": 0.01
@@ -2553,7 +2400,6 @@
    "dataName": "Alien128cmVioletLaserBattery",
    "friendlyName": "Alien 128 cm Violet Laser Battery",
    "mount": "TwoHullHoriz",
-   "crew": null,
    "sortOrder": 76,
    "requiredProjectName": "Project_AlienMasterProject",
    "attackMode": true,
@@ -2566,17 +2412,15 @@
    "wavelength_nm": 450,
    "mirrorRadius_cm": 128,
    "beam_quality": 1.1,
-   "jitter_Rad": 7.3e-8,
-   "jitter_Div": 17500000,
+   "jitter_Rad": 3.6e-8,
    "bombardmentValue": 1.6,
-   "targetingRange_km": 1000,
+   "targetingRange_km": 900,
    "pivotRange_deg": 180,
    "isPointDefenseTargetable": false,
    "weightedBuildMaterials": {
-      "volatiles": null,
       "metals": 0.78,
       "nobleMetals": 0.2,
-      "exotics": 0.02
+      "exotics": 0.01
    },
    "iconResource": "shipbuildericons/ICO_Alien128cmVioletLaserBattery",
    "modelResource": "shipweapons/alien_medium_laser_battery",
@@ -2587,7 +2431,6 @@
    "dataName": "Alien384cmVioletLaserBattery",
    "friendlyName": "Alien 384 cm Violet Laser Battery",
    "mount": "FourHull",
-   "crew": null,
    "sortOrder": 77,
    "requiredProjectName": "Project_AlienMasterProject",
    "attackMode": true,
@@ -2600,17 +2443,15 @@
    "wavelength_nm": 450,
    "mirrorRadius_cm": 384,
    "beam_quality": 1.1,
-   "jitter_Rad": 7.7e-8,
-   "jitter_Div": 17500000,
+   "jitter_Rad": 2.9e-8,
    "bombardmentValue": 3.2,
    "targetingRange_km": 1000,
    "pivotRange_deg": 180,
    "isPointDefenseTargetable": false,
    "weightedBuildMaterials": {
-      "volatiles": null,
       "metals": 0.76,
       "nobleMetals": 0.2,
-      "exotics": 0.04
+      "exotics": 0.01
    },
    "iconResource": "shipbuildericons/ICO_Alien384cmVioletLaserBattery",
    "modelResource": "shipweapons/alien_large_laser_battery",
@@ -2621,7 +2462,6 @@
    "dataName": "Alien256cmVioletLaserCannon",
    "friendlyName": "Alien 256 cm Violet Laser Cannon",
    "mount": "OneNose",
-   "crew": null,
    "sortOrder": 78,
    "requiredProjectName": "Project_AlienMasterProject",
    "attackMode": true,
@@ -2634,14 +2474,12 @@
    "wavelength_nm": 450,
    "mirrorRadius_cm": 256,
    "beam_quality": 1.1,
-   "jitter_Rad": 7.5e-8,
-   "jitter_Div": 17500000,
+   "jitter_Rad": 2.3e-8,
    "bombardmentValue": 2.4,
-   "targetingRange_km": 1000,
+   "targetingRange_km": 800,
    "pivotRange_deg": 45,
    "isPointDefenseTargetable": false,
    "weightedBuildMaterials": {
-      "volatiles": null,
       "metals": 0.79,
       "nobleMetals": 0.2,
       "exotics": 0.01
@@ -2655,7 +2493,6 @@
    "dataName": "Alien512cmVioletLaserCannon",
    "friendlyName": "Alien 512 cm Violet Laser Cannon",
    "mount": "TwoNoseVert",
-   "crew": null,
    "sortOrder": 79,
    "requiredProjectName": "Project_AlienMasterProject",
    "attackMode": true,
@@ -2668,17 +2505,15 @@
    "wavelength_nm": 450,
    "mirrorRadius_cm": 512,
    "beam_quality": 1.1,
-   "jitter_Rad": 7.8e-8,
-   "jitter_Div": 17500000,
+   "jitter_Rad": 1.8e-8,
    "bombardmentValue": 4,
-   "targetingRange_km": 1000,
+   "targetingRange_km": 900,
    "pivotRange_deg": 45,
    "isPointDefenseTargetable": false,
    "weightedBuildMaterials": {
-      "volatiles": null,
       "metals": 0.78,
       "nobleMetals": 0.2,
-      "exotics": 0.02
+      "exotics": 0.01
    },
    "iconResource": "shipbuildericons/ICO_Alien512cmVioletLaserCannon",
    "modelResource": "shipweapons/alien_medium_laser_cannon",
@@ -2689,7 +2524,6 @@
    "dataName": "Alien768cmVioletLaserCannon",
    "friendlyName": "Alien 768 cm Violet Laser Cannon",
    "mount": "ThreeNoseAngle",
-   "crew": null,
    "sortOrder": 80,
    "requiredProjectName": "Project_AlienMasterProject",
    "attackMode": true,
@@ -2702,17 +2536,15 @@
    "wavelength_nm": 450,
    "mirrorRadius_cm": 768,
    "beam_quality": 1.1,
-   "jitter_Rad": 8e-8,
-   "jitter_Div": 17500000,
+   "jitter_Rad": 1.5e-8,
    "bombardmentValue": 5.6,
    "targetingRange_km": 1000,
    "pivotRange_deg": 45,
    "isPointDefenseTargetable": false,
    "weightedBuildMaterials": {
-      "volatiles": null,
       "metals": 0.76,
       "nobleMetals": 0.2,
-      "exotics": 0.04
+      "exotics": 0.01
    },
    "iconResource": "shipbuildericons/ICO_Alien768cmVioletLaserCannon",
    "modelResource": "shipweapons/alien_large_laser_cannon",
@@ -2723,7 +2555,6 @@
    "dataName": "Alien1024cmVioletLaserCannon",
    "friendlyName": "Alien 1024 cm Violet Laser Cannon",
    "mount": "FourNose",
-   "crew": null,
    "sortOrder": 81,
    "requiredProjectName": "Project_AlienMasterProject",
    "attackMode": true,
@@ -2736,54 +2567,254 @@
    "wavelength_nm": 450,
    "mirrorRadius_cm": 1024,
    "beam_quality": 1.1,
-   "jitter_Rad": 8.1e-8,
-   "jitter_Div": 17500000,
+   "jitter_Rad": 1.2e-8,
    "bombardmentValue": 8,
    "targetingRange_km": 1000,
    "pivotRange_deg": 45,
    "isPointDefenseTargetable": false,
    "weightedBuildMaterials": {
-      "volatiles": null,
       "metals": 0.72,
       "nobleMetals": 0.2,
-      "exotics": 0.08
+      "exotics": 0.01
    },
    "iconResource": "shipbuildericons/ICO_Alien1024cmVioletLaserCannon",
    "modelResource": "shipweapons/alien_huge_laser_cannon",
    "effectResource": "spaceCombat/Alien Laser Beam Blue",
    "fireSoundFXResource": "event:/SFX/Game_SFX/Lasers/trig_SFX_Alien_Laser_Cannon_Hi_Tech"
+},
+ {
+   "dataName": "Alien384cmXaserBattery",
+   "friendlyName": "Alien 384 cm Xaser Battery",
+   "mount": "FourHull",
+   "sortOrder": 82,
+   "requiredProjectName": "Project_AlienAdvancedMasterProject",
+   "attackMode": true,
+   "defenseMode": true,
+   "hp": 2,
+   "baseWeaponMass_tons": 440,
+   "cooldown_s": 24,
+   "efficiency": 0.4,
+   "shotPower_MJ": 240,
+   "wavelength_nm": 10,
+   "mirrorRadius_cm": 384,
+   "beam_quality": 1.05,
+   "jitter_Rad": 2.6e-8,
+   "bombardmentValue": 4.5,
+   "targetingRange_km": 900,
+   "pivotRange_deg": 180,
+   "isPointDefenseTargetable": false,
+   "weightedBuildMaterials": {
+      "metals": 0.65,
+      "nobleMetals": 0.3,
+      "exotics": 0.05
+   },
+   "iconResource": "shipbuildericons/ICO_Alien384cmXaserBattery",
+   "modelResource": "shipweapons/alien_large_laser_battery",
+   "effectResource": "spaceCombat/Alien Laser XRay",
+   "fireSoundFXResource": "event:/SFX/Game_SFX/Lasers/trig_SFX_Alien_Laser_Cannon_Hi_Tech"
+},
+ {
+   "dataName": "Alien256cmXaserCannon",
+   "friendlyName": "Alien 256 cm Xaser Cannon",
+   "mount": "OneNose",
+   "sortOrder": 83,
+   "requiredProjectName": "Project_AlienAdvancedMasterProject",
+   "attackMode": true,
+   "defenseMode": true,
+   "hp": 2,
+   "baseWeaponMass_tons": 333,
+   "cooldown_s": 24,
+   "efficiency": 0.4,
+   "shotPower_MJ": 192,
+   "wavelength_nm": 10,
+   "mirrorRadius_cm": 256,
+   "beam_quality": 1.05,
+   "jitter_Rad": 2e-8,
+   "bombardmentValue": 4,
+   "targetingRange_km": 900,
+   "pivotRange_deg": 45,
+   "isPointDefenseTargetable": false,
+   "weightedBuildMaterials": {
+      "metals": 0.65,
+      "nobleMetals": 0.3,
+      "exotics": 0.05
+   },
+   "iconResource": "shipbuildericons/ICO_Alien256cmXaserCannon",
+   "modelResource": "shipweapons/alien_small_laser_cannon",
+   "effectResource": "spaceCombat/Alien Laser XRay",
+   "fireSoundFXResource": "event:/SFX/Game_SFX/Lasers/trig_SFX_Alien_Laser_Cannon_Hi_Tech"
+},
+ {
+   "dataName": "Alien512cmXaserCannon",
+   "friendlyName": "Alien 512 cm Xaser Cannon",
+   "mount": "TwoNoseVert",
+   "sortOrder": 84,
+   "requiredProjectName": "Project_AlienAdvancedMasterProject",
+   "attackMode": true,
+   "defenseMode": true,
+   "hp": 2,
+   "baseWeaponMass_tons": 547,
+   "cooldown_s": 24,
+   "efficiency": 0.4,
+   "shotPower_MJ": 256,
+   "wavelength_nm": 10,
+   "mirrorRadius_cm": 512,
+   "beam_quality": 1.05,
+   "jitter_Rad": 1.6e-8,
+   "bombardmentValue": 5,
+   "targetingRange_km": 1000,
+   "pivotRange_deg": 45,
+   "isPointDefenseTargetable": false,
+   "weightedBuildMaterials": {
+      "metals": 0.65,
+      "nobleMetals": 0.3,
+      "exotics": 0.05
+   },
+   "iconResource": "shipbuildericons/ICO_Alien512cmXaserCannon",
+   "modelResource": "shipweapons/alien_medium_laser_cannon",
+   "effectResource": "spaceCombat/Alien Laser XRay",
+   "fireSoundFXResource": "event:/SFX/Game_SFX/Lasers/trig_SFX_Alien_Laser_Cannon_Hi_Tech"
+},
+ {
+   "dataName": "Alien768cmXaserCannon",
+   "friendlyName": "Alien 768 cm Xaser Cannon",
+   "mount": "ThreeNoseAngle",
+   "sortOrder": 85,
+   "requiredProjectName": "Project_AlienAdvancedMasterProject",
+   "attackMode": true,
+   "defenseMode": false,
+   "hp": 2,
+   "baseWeaponMass_tons": 760,
+   "cooldown_s": 24,
+   "efficiency": 0.4,
+   "shotPower_MJ": 384,
+   "wavelength_nm": 10,
+   "mirrorRadius_cm": 768,
+   "beam_quality": 1.05,
+   "jitter_Rad": 1.3e-8,
+   "bombardmentValue": 6,
+   "targetingRange_km": 1000,
+   "pivotRange_deg": 45,
+   "isPointDefenseTargetable": false,
+   "weightedBuildMaterials": {
+      "metals": 0.65,
+      "nobleMetals": 0.3,
+      "exotics": 0.05
+   },
+   "iconResource": "shipbuildericons/ICO_Alien768cmXaserCannon",
+   "modelResource": "shipweapons/alien_large_laser_cannon",
+   "effectResource": "spaceCombat/Alien Laser XRay",
+   "fireSoundFXResource": "event:/SFX/Game_SFX/Lasers/trig_SFX_Alien_Laser_Cannon_Hi_Tech"
+},
+ {
+   "dataName": "Alien1024cmXaserCannon",
+   "friendlyName": "Alien 1024 cm Xaser Cannon",
+   "mount": "FourNose",
+   "sortOrder": 86,
+   "requiredProjectName": "Project_AlienAdvancedMasterProject",
+   "attackMode": true,
+   "defenseMode": false,
+   "hp": 2,
+   "baseWeaponMass_tons": 973,
+   "cooldown_s": 24,
+   "efficiency": 0.4,
+   "shotPower_MJ": 448,
+   "wavelength_nm": 10,
+   "mirrorRadius_cm": 1024,
+   "beam_quality": 1.05,
+   "jitter_Rad": 1e-8,
+   "bombardmentValue": 8,
+   "targetingRange_km": 1000,
+   "pivotRange_deg": 45,
+   "isPointDefenseTargetable": false,
+   "weightedBuildMaterials": {
+      "metals": 0.65,
+      "nobleMetals": 0.3,
+      "exotics": 0.05
+   },
+   "iconResource": "shipbuildericons/ICO_Alien1024cmXaserCannon",
+   "modelResource": "shipweapons/alien_huge_laser_cannon",
+   "effectResource": "spaceCombat/Alien Laser XRay",
+   "fireSoundFXResource": "event:/SFX/Game_SFX/Lasers/trig_SFX_Alien_Laser_Cannon_Hi_Tech"
+},
+ {
+   "dataName": "Alien768cmGraserCannon",
+   "friendlyName": "Alien 768 cm Graser Cannon",
+   "mount": "ThreeNoseAngle",
+   "sortOrder": 87,
+   "requiredProjectName": "Project_AlienAdvancedMasterProject",
+   "attackMode": true,
+   "defenseMode": false,
+   "hp": 2,
+   "baseWeaponMass_tons": 1400,
+   "cooldown_s": 36,
+   "efficiency": 0.3,
+   "shotPower_MJ": 384,
+   "wavelength_nm": 0.1,
+   "mirrorRadius_cm": 768,
+   "beam_quality": 1.05,
+   "jitter_Rad": 1e-8,
+   "bombardmentValue": 8,
+   "targetingRange_km": 1000,
+   "pivotRange_deg": 45,
+   "isPointDefenseTargetable": false,
+   "weightedBuildMaterials": {
+      "metals": 0.5,
+      "nobleMetals": 0.4,
+      "exotics": 0.1
+   },
+   "iconResource": "shipbuildericons/ICO_Alien768cmGraserCannon",
+   "modelResource": "shipweapons/alien_large_laser_cannon",
+   "effectResource": "spaceCombat/Alien Laser Gamma Ray",
+   "fireSoundFXResource": "event:/SFX/Game_SFX/Lasers/trig_SFX_Alien_Laser_Cannon_Hi_Tech"
+},
+ {
+   "dataName": "Alien1024cmGraserCannon",
+   "friendlyName": "Alien 1024 cm Graser Cannon",
+   "mount": "FourNose",
+   "sortOrder": 88,
+   "requiredProjectName": "Project_AlienAdvancedMasterProject",
+   "attackMode": true,
+   "defenseMode": false,
+   "hp": 2,
+   "baseWeaponMass_tons": 1827,
+   "cooldown_s": 36,
+   "efficiency": 0.3,
+   "shotPower_MJ": 448,
+   "wavelength_nm": 0.1,
+   "mirrorRadius_cm": 1024,
+   "beam_quality": 1.05,
+   "jitter_Rad": 8e-9,
+   "bombardmentValue": 12,
+   "targetingRange_km": 1000,
+   "pivotRange_deg": 45,
+   "isPointDefenseTargetable": false,
+   "weightedBuildMaterials": {
+      "metals": 0.5,
+      "nobleMetals": 0.4,
+      "exotics": 0.1
+   },
+   "iconResource": "shipbuildericons/ICO_Alien1024cmGraserCannon",
+   "modelResource": "shipweapons/alien_huge_laser_cannon",
+   "effectResource": "spaceCombat/Alien Laser Gamma Ray",
+   "fireSoundFXResource": "event:/SFX/Game_SFX/Lasers/trig_SFX_Alien_Laser_Cannon_Hi_Tech"
 },
  {
    "dataName": "RegionDefenseIRLaser",
    "friendlyName": "Region Defense IR Laser",
    "mount": "RegionDefense",
-   "crew": null,
-   "sortOrder": null,
-   "requiredProjectName": "",
    "attackMode": true,
    "defenseMode": true,
-   "hp": null,
-   "baseWeaponMass_tons": null,
    "cooldown_s": 30,
-   "efficiency": null,
    "shotPower_MJ": 1000,
    "wavelength_nm": 1080,
    "mirrorRadius_cm": 3600,
    "beam_quality": 1.3,
-   "jitter_Rad": 1.25e-7,
-   "jitter_Div": null,
+   "jitter_Rad": 2.6e-8,
    "bombardmentValue": 1.1,
    "targetingRange_km": 2000,
    "pivotRange_deg": 180,
    "isPointDefenseTargetable": false,
-   "weightedBuildMaterials": {
-      "volatiles": null,
-      "metals": null,
-      "nobleMetals": null,
-      "exotics": null
-   },
-   "iconResource": "",
-   "modelResource": "",
    "effectResource": "spaceCombat/Standard Laser Beam Red",
    "fireSoundFXResource": "event:/SFX/Game_SFX/Lasers/trig_SFX_Basic_Laser_Cannon"
 },
@@ -2791,33 +2822,18 @@
    "dataName": "RegionDefenseGreenLaser",
    "friendlyName": "Region Defense Green Laser",
    "mount": "RegionDefense",
-   "crew": null,
-   "sortOrder": null,
-   "requiredProjectName": "",
    "attackMode": true,
    "defenseMode": true,
-   "hp": null,
-   "baseWeaponMass_tons": null,
    "cooldown_s": 30,
-   "efficiency": null,
    "shotPower_MJ": 1000,
    "wavelength_nm": 540,
    "mirrorRadius_cm": 3600,
    "beam_quality": 1.3,
-   "jitter_Rad": 1.25e-7,
-   "jitter_Div": null,
+   "jitter_Rad": 2.6e-8,
    "bombardmentValue": 1.2,
    "targetingRange_km": 2000,
    "pivotRange_deg": 180,
    "isPointDefenseTargetable": false,
-   "weightedBuildMaterials": {
-      "volatiles": null,
-      "metals": null,
-      "nobleMetals": null,
-      "exotics": null
-   },
-   "iconResource": "",
-   "modelResource": "",
    "effectResource": "spaceCombat/Standard Laser Beam Green",
    "fireSoundFXResource": "event:/SFX/Game_SFX/Lasers/trig_SFX_Basic_Laser_Cannon"
 },
@@ -2825,33 +2841,18 @@
    "dataName": "RegionDefenseIRArcLaser",
    "friendlyName": "Region Defense IR Arc Laser",
    "mount": "RegionDefense",
-   "crew": null,
-   "sortOrder": null,
-   "requiredProjectName": "",
    "attackMode": true,
    "defenseMode": true,
-   "hp": null,
-   "baseWeaponMass_tons": null,
    "cooldown_s": 30,
-   "efficiency": null,
    "shotPower_MJ": 1000,
    "wavelength_nm": 1080,
    "mirrorRadius_cm": 3600,
    "beam_quality": 1.2,
-   "jitter_Rad": 6.3e-8,
-   "jitter_Div": null,
+   "jitter_Rad": 2e-8,
    "bombardmentValue": 2.1,
    "targetingRange_km": 2000,
    "pivotRange_deg": 180,
    "isPointDefenseTargetable": false,
-   "weightedBuildMaterials": {
-      "volatiles": null,
-      "metals": null,
-      "nobleMetals": null,
-      "exotics": null
-   },
-   "iconResource": "",
-   "modelResource": "",
    "effectResource": "spaceCombat/Arc Laser Beam Red",
    "fireSoundFXResource": "event:/SFX/Game_SFX/Lasers/trig_SFX_Arc_Laser_Cannon"
 },
@@ -2859,33 +2860,18 @@
    "dataName": "RegionDefenseGreenArcLaser",
    "friendlyName": "Region Defense Green Arc Laser",
    "mount": "RegionDefense",
-   "crew": null,
-   "sortOrder": null,
-   "requiredProjectName": "",
    "attackMode": true,
    "defenseMode": true,
-   "hp": null,
-   "baseWeaponMass_tons": null,
    "cooldown_s": 30,
-   "efficiency": null,
    "shotPower_MJ": 1000,
    "wavelength_nm": 540,
    "mirrorRadius_cm": 3600,
    "beam_quality": 1.2,
-   "jitter_Rad": 6.3e-8,
-   "jitter_Div": null,
+   "jitter_Rad": 2e-8,
    "bombardmentValue": 2.2,
    "targetingRange_km": 2000,
    "pivotRange_deg": 180,
    "isPointDefenseTargetable": false,
-   "weightedBuildMaterials": {
-      "volatiles": null,
-      "metals": null,
-      "nobleMetals": null,
-      "exotics": null
-   },
-   "iconResource": "",
-   "modelResource": "",
    "effectResource": "spaceCombat/Arc Laser Beam Green",
    "fireSoundFXResource": "event:/SFX/Game_SFX/Lasers/trig_SFX_Arc_Laser_Cannon"
 },
@@ -2893,33 +2879,18 @@
    "dataName": "RegionDefenseIRPhaser",
    "friendlyName": "Region Defense IR Phaser",
    "mount": "RegionDefense",
-   "crew": null,
-   "sortOrder": null,
-   "requiredProjectName": "",
    "attackMode": true,
    "defenseMode": true,
-   "hp": null,
-   "baseWeaponMass_tons": null,
    "cooldown_s": 30,
-   "efficiency": null,
    "shotPower_MJ": 1000,
    "wavelength_nm": 1080,
    "mirrorRadius_cm": 3600,
    "beam_quality": 1.1,
-   "jitter_Rad": 2.5e-8,
-   "jitter_Div": null,
+   "jitter_Rad": 1.3e-8,
    "bombardmentValue": 3.1,
    "targetingRange_km": 2000,
    "pivotRange_deg": 180,
    "isPointDefenseTargetable": false,
-   "weightedBuildMaterials": {
-      "volatiles": null,
-      "metals": null,
-      "nobleMetals": null,
-      "exotics": null
-   },
-   "iconResource": "",
-   "modelResource": "",
    "effectResource": "spaceCombat/Phaser Beam Red",
    "fireSoundFXResource": "event:/SFX/Game_SFX/Lasers/trig_SFX_Phaser_Cannon"
 },
@@ -2927,33 +2898,18 @@
    "dataName": "RegionDefenseGreenPhaser",
    "friendlyName": "Region Defense Green Phaser",
    "mount": "RegionDefense",
-   "crew": null,
-   "sortOrder": null,
-   "requiredProjectName": "",
    "attackMode": true,
    "defenseMode": true,
-   "hp": null,
-   "baseWeaponMass_tons": null,
    "cooldown_s": 30,
-   "efficiency": null,
    "shotPower_MJ": 1000,
    "wavelength_nm": 540,
    "mirrorRadius_cm": 3600,
    "beam_quality": 1.1,
-   "jitter_Rad": 2.5e-8,
-   "jitter_Div": null,
+   "jitter_Rad": 1.3e-8,
    "bombardmentValue": 3.2,
    "targetingRange_km": 2000,
    "pivotRange_deg": 180,
    "isPointDefenseTargetable": false,
-   "weightedBuildMaterials": {
-      "volatiles": null,
-      "metals": null,
-      "nobleMetals": null,
-      "exotics": null
-   },
-   "iconResource": "",
-   "modelResource": "",
    "effectResource": "spaceCombat/Phaser Beam Green",
    "fireSoundFXResource": "event:/SFX/Game_SFX/Lasers/trig_SFX_Phaser_Cannon"
 },
@@ -2961,33 +2917,18 @@
    "dataName": "T1BaseIRLaser",
    "friendlyName": "T1 Base IR Laser",
    "mount": "T1BaseDefense",
-   "crew": null,
-   "sortOrder": null,
-   "requiredProjectName": "",
    "attackMode": true,
    "defenseMode": true,
-   "hp": null,
-   "baseWeaponMass_tons": null,
    "cooldown_s": 900,
-   "efficiency": null,
    "shotPower_MJ": 500,
    "wavelength_nm": 1080,
    "mirrorRadius_cm": 960,
    "beam_quality": 1.3,
-   "jitter_Rad": 1.05e-7,
-   "jitter_Div": null,
+   "jitter_Rad": 3.3e-8,
    "bombardmentValue": 1.1,
    "targetingRange_km": 2000,
    "pivotRange_deg": 180,
    "isPointDefenseTargetable": false,
-   "weightedBuildMaterials": {
-      "volatiles": null,
-      "metals": null,
-      "nobleMetals": null,
-      "exotics": null
-   },
-   "iconResource": "",
-   "modelResource": "",
    "effectResource": "spaceCombat/Standard Laser Beam Red",
    "fireSoundFXResource": "event:/SFX/Game_SFX/Lasers/trig_SFX_Basic_Laser_Cannon"
 },
@@ -2995,33 +2936,18 @@
    "dataName": "T1BaseGreenLaser",
    "friendlyName": "T1 Base Green Laser",
    "mount": "T1BaseDefense",
-   "crew": null,
-   "sortOrder": null,
-   "requiredProjectName": "",
    "attackMode": true,
    "defenseMode": true,
-   "hp": null,
-   "baseWeaponMass_tons": null,
    "cooldown_s": 900,
-   "efficiency": null,
    "shotPower_MJ": 500,
    "wavelength_nm": 540,
    "mirrorRadius_cm": 960,
    "beam_quality": 1.2,
-   "jitter_Rad": 1.05e-7,
-   "jitter_Div": null,
+   "jitter_Rad": 3.3e-8,
    "bombardmentValue": 1.2,
    "targetingRange_km": 2000,
    "pivotRange_deg": 180,
    "isPointDefenseTargetable": false,
-   "weightedBuildMaterials": {
-      "volatiles": null,
-      "metals": null,
-      "nobleMetals": null,
-      "exotics": null
-   },
-   "iconResource": "",
-   "modelResource": "",
    "effectResource": "spaceCombat/Standard Laser Beam Green",
    "fireSoundFXResource": "event:/SFX/Game_SFX/Lasers/trig_SFX_Basic_Laser_Cannon"
 },
@@ -3029,33 +2955,18 @@
    "dataName": "T1BaseUVLaser",
    "friendlyName": "T1 Base UV Laser",
    "mount": "T1BaseDefense",
-   "crew": null,
-   "sortOrder": null,
-   "requiredProjectName": "",
    "attackMode": true,
    "defenseMode": true,
-   "hp": null,
-   "baseWeaponMass_tons": null,
    "cooldown_s": 900,
-   "efficiency": null,
    "shotPower_MJ": 500,
    "wavelength_nm": 270,
    "mirrorRadius_cm": 960,
    "beam_quality": 1.1,
-   "jitter_Rad": 1.05e-7,
-   "jitter_Div": null,
+   "jitter_Rad": 3.3e-8,
    "bombardmentValue": 1.3,
    "targetingRange_km": 2000,
    "pivotRange_deg": 180,
    "isPointDefenseTargetable": false,
-   "weightedBuildMaterials": {
-      "volatiles": null,
-      "metals": null,
-      "nobleMetals": null,
-      "exotics": null
-   },
-   "iconResource": "",
-   "modelResource": "",
    "effectResource": "spaceCombat/Standard Laser Beam Violet",
    "fireSoundFXResource": "event:/SFX/Game_SFX/Lasers/trig_SFX_Basic_Laser_Cannon"
 },
@@ -3063,33 +2974,18 @@
    "dataName": "T1BaseIRArcLaser",
    "friendlyName": "T1 Base IR Arc Laser",
    "mount": "T1BaseDefense",
-   "crew": null,
-   "sortOrder": null,
-   "requiredProjectName": "",
    "attackMode": true,
    "defenseMode": true,
-   "hp": null,
-   "baseWeaponMass_tons": null,
    "cooldown_s": 900,
-   "efficiency": null,
    "shotPower_MJ": 500,
    "wavelength_nm": 1080,
    "mirrorRadius_cm": 960,
    "beam_quality": 1.3,
-   "jitter_Rad": 8.4e-8,
-   "jitter_Div": null,
+   "jitter_Rad": 2.5e-8,
    "bombardmentValue": 2.1,
    "targetingRange_km": 2000,
    "pivotRange_deg": 180,
    "isPointDefenseTargetable": false,
-   "weightedBuildMaterials": {
-      "volatiles": null,
-      "metals": null,
-      "nobleMetals": null,
-      "exotics": null
-   },
-   "iconResource": "",
-   "modelResource": "",
    "effectResource": "spaceCombat/Arc Laser Beam Red",
    "fireSoundFXResource": "event:/SFX/Game_SFX/Lasers/trig_SFX_Arc_Laser_Cannon"
 },
@@ -3097,33 +2993,18 @@
    "dataName": "T1BaseGreenArcLaser",
    "friendlyName": "T1 Base Green Arc Laser",
    "mount": "T1BaseDefense",
-   "crew": null,
-   "sortOrder": null,
-   "requiredProjectName": "",
    "attackMode": true,
    "defenseMode": true,
-   "hp": null,
-   "baseWeaponMass_tons": null,
    "cooldown_s": 900,
-   "efficiency": null,
    "shotPower_MJ": 500,
    "wavelength_nm": 540,
    "mirrorRadius_cm": 960,
    "beam_quality": 1.2,
-   "jitter_Rad": 8.4e-8,
-   "jitter_Div": null,
+   "jitter_Rad": 2.5e-8,
    "bombardmentValue": 2.2,
    "targetingRange_km": 2000,
    "pivotRange_deg": 180,
    "isPointDefenseTargetable": false,
-   "weightedBuildMaterials": {
-      "volatiles": null,
-      "metals": null,
-      "nobleMetals": null,
-      "exotics": null
-   },
-   "iconResource": "",
-   "modelResource": "",
    "effectResource": "spaceCombat/Arc Laser Beam Green",
    "fireSoundFXResource": "event:/SFX/Game_SFX/Lasers/trig_SFX_Arc_Laser_Cannon"
 },
@@ -3131,33 +3012,18 @@
    "dataName": "T1BaseUVArcLaser",
    "friendlyName": "T1 Base UV Arc Laser",
    "mount": "T1BaseDefense",
-   "crew": null,
-   "sortOrder": null,
-   "requiredProjectName": "",
    "attackMode": true,
    "defenseMode": true,
-   "hp": null,
-   "baseWeaponMass_tons": null,
    "cooldown_s": 900,
-   "efficiency": null,
    "shotPower_MJ": 500,
    "wavelength_nm": 270,
    "mirrorRadius_cm": 960,
    "beam_quality": 1.1,
-   "jitter_Rad": 8.4e-8,
-   "jitter_Div": null,
+   "jitter_Rad": 2.5e-8,
    "bombardmentValue": 2.3,
    "targetingRange_km": 2000,
    "pivotRange_deg": 180,
    "isPointDefenseTargetable": false,
-   "weightedBuildMaterials": {
-      "volatiles": null,
-      "metals": null,
-      "nobleMetals": null,
-      "exotics": null
-   },
-   "iconResource": "",
-   "modelResource": "",
    "effectResource": "spaceCombat/Arc Laser Beam Violet",
    "fireSoundFXResource": "event:/SFX/Game_SFX/Lasers/trig_SFX_Arc_Laser_Cannon"
 },
@@ -3165,33 +3031,18 @@
    "dataName": "T1BaseIRPhaser",
    "friendlyName": "T1 Base IR Phaser",
    "mount": "T1BaseDefense",
-   "crew": null,
-   "sortOrder": null,
-   "requiredProjectName": "",
    "attackMode": true,
    "defenseMode": true,
-   "hp": null,
-   "baseWeaponMass_tons": null,
    "cooldown_s": 900,
-   "efficiency": null,
    "shotPower_MJ": 500,
    "wavelength_nm": 1080,
    "mirrorRadius_cm": 960,
    "beam_quality": 1.3,
-   "jitter_Rad": 6.3e-8,
-   "jitter_Div": null,
+   "jitter_Rad": 1.6e-8,
    "bombardmentValue": 3.1,
    "targetingRange_km": 2000,
    "pivotRange_deg": 180,
    "isPointDefenseTargetable": false,
-   "weightedBuildMaterials": {
-      "volatiles": null,
-      "metals": null,
-      "nobleMetals": null,
-      "exotics": null
-   },
-   "iconResource": "",
-   "modelResource": "",
    "effectResource": "spaceCombat/Phaser Beam Red",
    "fireSoundFXResource": "event:/SFX/Game_SFX/Lasers/trig_SFX_Phaser_Cannon"
 },
@@ -3199,33 +3050,18 @@
    "dataName": "T1BaseGreenPhaser",
    "friendlyName": "T1 Base Green Phaser",
    "mount": "T1BaseDefense",
-   "crew": null,
-   "sortOrder": null,
-   "requiredProjectName": "",
    "attackMode": true,
    "defenseMode": true,
-   "hp": null,
-   "baseWeaponMass_tons": null,
    "cooldown_s": 900,
-   "efficiency": null,
    "shotPower_MJ": 500,
    "wavelength_nm": 540,
    "mirrorRadius_cm": 960,
    "beam_quality": 1.2,
-   "jitter_Rad": 6.3e-8,
-   "jitter_Div": null,
+   "jitter_Rad": 1.6e-8,
    "bombardmentValue": 3.2,
    "targetingRange_km": 2000,
    "pivotRange_deg": 180,
    "isPointDefenseTargetable": false,
-   "weightedBuildMaterials": {
-      "volatiles": null,
-      "metals": null,
-      "nobleMetals": null,
-      "exotics": null
-   },
-   "iconResource": "",
-   "modelResource": "",
    "effectResource": "spaceCombat/Phaser Beam Green",
    "fireSoundFXResource": "event:/SFX/Game_SFX/Lasers/trig_SFX_Phaser_Cannon"
 },
@@ -3233,33 +3069,18 @@
    "dataName": "T1BaseUVPhaser",
    "friendlyName": "T1 Base UV Phaser",
    "mount": "T1BaseDefense",
-   "crew": null,
-   "sortOrder": null,
-   "requiredProjectName": "",
    "attackMode": true,
    "defenseMode": true,
-   "hp": null,
-   "baseWeaponMass_tons": null,
    "cooldown_s": 900,
-   "efficiency": null,
    "shotPower_MJ": 500,
    "wavelength_nm": 270,
    "mirrorRadius_cm": 960,
    "beam_quality": 1.1,
-   "jitter_Rad": 6.3e-8,
-   "jitter_Div": null,
+   "jitter_Rad": 1.6e-8,
    "bombardmentValue": 3.3,
    "targetingRange_km": 2000,
    "pivotRange_deg": 180,
    "isPointDefenseTargetable": false,
-   "weightedBuildMaterials": {
-      "volatiles": null,
-      "metals": null,
-      "nobleMetals": null,
-      "exotics": null
-   },
-   "iconResource": "",
-   "modelResource": "",
    "effectResource": "spaceCombat/Phaser Beam Violet",
    "fireSoundFXResource": "event:/SFX/Game_SFX/Lasers/trig_SFX_Phaser_Cannon"
 },
@@ -3267,33 +3088,18 @@
    "dataName": "T2BaseIRLaser",
    "friendlyName": "T2 Base IR Laser",
    "mount": "T2BaseDefense",
-   "crew": null,
-   "sortOrder": null,
-   "requiredProjectName": "",
    "attackMode": true,
    "defenseMode": true,
-   "hp": null,
-   "baseWeaponMass_tons": null,
    "cooldown_s": 900,
-   "efficiency": null,
    "shotPower_MJ": 650,
    "wavelength_nm": 1080,
    "mirrorRadius_cm": 1440,
    "beam_quality": 1.3,
-   "jitter_Rad": 1.05e-7,
-   "jitter_Div": null,
+   "jitter_Rad": 2.6e-8,
    "bombardmentValue": 1.1,
    "targetingRange_km": 2000,
    "pivotRange_deg": 180,
    "isPointDefenseTargetable": false,
-   "weightedBuildMaterials": {
-      "volatiles": null,
-      "metals": null,
-      "nobleMetals": null,
-      "exotics": null
-   },
-   "iconResource": "",
-   "modelResource": "",
    "effectResource": "spaceCombat/Standard Laser Beam Red",
    "fireSoundFXResource": "event:/SFX/Game_SFX/Lasers/trig_SFX_Basic_Laser_Cannon"
 },
@@ -3301,33 +3107,18 @@
    "dataName": "T2BaseGreenLaser",
    "friendlyName": "T2 Base Green Laser",
    "mount": "T2BaseDefense",
-   "crew": null,
-   "sortOrder": null,
-   "requiredProjectName": "",
    "attackMode": true,
    "defenseMode": true,
-   "hp": null,
-   "baseWeaponMass_tons": null,
    "cooldown_s": 900,
-   "efficiency": null,
    "shotPower_MJ": 650,
    "wavelength_nm": 540,
    "mirrorRadius_cm": 1440,
    "beam_quality": 1.2,
-   "jitter_Rad": 1.05e-7,
-   "jitter_Div": null,
+   "jitter_Rad": 2.6e-8,
    "bombardmentValue": 1.2,
    "targetingRange_km": 2000,
    "pivotRange_deg": 180,
    "isPointDefenseTargetable": false,
-   "weightedBuildMaterials": {
-      "volatiles": null,
-      "metals": null,
-      "nobleMetals": null,
-      "exotics": null
-   },
-   "iconResource": "",
-   "modelResource": "",
    "effectResource": "spaceCombat/Standard Laser Beam Green",
    "fireSoundFXResource": "event:/SFX/Game_SFX/Lasers/trig_SFX_Basic_Laser_Cannon"
 },
@@ -3335,33 +3126,18 @@
    "dataName": "T2BaseUVLaser",
    "friendlyName": "T2 Base UV Laser",
    "mount": "T2BaseDefense",
-   "crew": null,
-   "sortOrder": null,
-   "requiredProjectName": "",
    "attackMode": true,
    "defenseMode": true,
-   "hp": null,
-   "baseWeaponMass_tons": null,
    "cooldown_s": 900,
-   "efficiency": null,
    "shotPower_MJ": 650,
    "wavelength_nm": 270,
    "mirrorRadius_cm": 1440,
    "beam_quality": 1.1,
-   "jitter_Rad": 1.05e-7,
-   "jitter_Div": null,
+   "jitter_Rad": 2.6e-8,
    "bombardmentValue": 1.3,
    "targetingRange_km": 2000,
    "pivotRange_deg": 180,
    "isPointDefenseTargetable": false,
-   "weightedBuildMaterials": {
-      "volatiles": null,
-      "metals": null,
-      "nobleMetals": null,
-      "exotics": null
-   },
-   "iconResource": "",
-   "modelResource": "",
    "effectResource": "spaceCombat/Standard Laser Beam Violet",
    "fireSoundFXResource": "event:/SFX/Game_SFX/Lasers/trig_SFX_Basic_Laser_Cannon"
 },
@@ -3369,33 +3145,18 @@
    "dataName": "T2BaseIRArcLaser",
    "friendlyName": "T2 Base IR Arc Laser",
    "mount": "T2BaseDefense",
-   "crew": null,
-   "sortOrder": null,
-   "requiredProjectName": "",
    "attackMode": true,
    "defenseMode": true,
-   "hp": null,
-   "baseWeaponMass_tons": null,
    "cooldown_s": 900,
-   "efficiency": null,
    "shotPower_MJ": 650,
    "wavelength_nm": 1080,
    "mirrorRadius_cm": 1440,
    "beam_quality": 1.3,
-   "jitter_Rad": 8.4e-8,
-   "jitter_Div": null,
+   "jitter_Rad": 2e-8,
    "bombardmentValue": 2.1,
    "targetingRange_km": 2000,
    "pivotRange_deg": 180,
    "isPointDefenseTargetable": false,
-   "weightedBuildMaterials": {
-      "volatiles": null,
-      "metals": null,
-      "nobleMetals": null,
-      "exotics": null
-   },
-   "iconResource": "",
-   "modelResource": "",
    "effectResource": "spaceCombat/Arc Laser Beam Red",
    "fireSoundFXResource": "event:/SFX/Game_SFX/Lasers/trig_SFX_Arc_Laser_Cannon"
 },
@@ -3403,33 +3164,18 @@
    "dataName": "T2BaseGreenArcLaser",
    "friendlyName": "T2 Base Green Arc Laser",
    "mount": "T2BaseDefense",
-   "crew": null,
-   "sortOrder": null,
-   "requiredProjectName": "",
    "attackMode": true,
    "defenseMode": true,
-   "hp": null,
-   "baseWeaponMass_tons": null,
    "cooldown_s": 900,
-   "efficiency": null,
    "shotPower_MJ": 650,
    "wavelength_nm": 540,
    "mirrorRadius_cm": 1440,
    "beam_quality": 1.2,
-   "jitter_Rad": 8.4e-8,
-   "jitter_Div": null,
+   "jitter_Rad": 2e-8,
    "bombardmentValue": 2.2,
    "targetingRange_km": 2000,
    "pivotRange_deg": 180,
    "isPointDefenseTargetable": false,
-   "weightedBuildMaterials": {
-      "volatiles": null,
-      "metals": null,
-      "nobleMetals": null,
-      "exotics": null
-   },
-   "iconResource": "",
-   "modelResource": "",
    "effectResource": "spaceCombat/Arc Laser Beam Green",
    "fireSoundFXResource": "event:/SFX/Game_SFX/Lasers/trig_SFX_Arc_Laser_Cannon"
 },
@@ -3437,33 +3183,18 @@
    "dataName": "T2BaseUVArcLaser",
    "friendlyName": "T2 Base UV Arc Laser",
    "mount": "T2BaseDefense",
-   "crew": null,
-   "sortOrder": null,
-   "requiredProjectName": "",
    "attackMode": true,
    "defenseMode": true,
-   "hp": null,
-   "baseWeaponMass_tons": null,
    "cooldown_s": 900,
-   "efficiency": null,
    "shotPower_MJ": 650,
    "wavelength_nm": 270,
    "mirrorRadius_cm": 1440,
    "beam_quality": 1.1,
-   "jitter_Rad": 8.4e-8,
-   "jitter_Div": null,
+   "jitter_Rad": 2e-8,
    "bombardmentValue": 2.3,
    "targetingRange_km": 2000,
    "pivotRange_deg": 180,
    "isPointDefenseTargetable": false,
-   "weightedBuildMaterials": {
-      "volatiles": null,
-      "metals": null,
-      "nobleMetals": null,
-      "exotics": null
-   },
-   "iconResource": "",
-   "modelResource": "",
    "effectResource": "spaceCombat/Arc Laser Beam Violet",
    "fireSoundFXResource": "event:/SFX/Game_SFX/Lasers/trig_SFX_Arc_Laser_Cannon"
 },
@@ -3471,33 +3202,18 @@
    "dataName": "T2BaseIRPhaser",
    "friendlyName": "T2 Base IR Phaser",
    "mount": "T2BaseDefense",
-   "crew": null,
-   "sortOrder": null,
-   "requiredProjectName": "",
    "attackMode": true,
    "defenseMode": true,
-   "hp": null,
-   "baseWeaponMass_tons": null,
    "cooldown_s": 900,
-   "efficiency": null,
    "shotPower_MJ": 650,
    "wavelength_nm": 1080,
    "mirrorRadius_cm": 1440,
    "beam_quality": 1.3,
-   "jitter_Rad": 6.3e-8,
-   "jitter_Div": null,
+   "jitter_Rad": 1.3e-8,
    "bombardmentValue": 3.1,
    "targetingRange_km": 2000,
    "pivotRange_deg": 180,
    "isPointDefenseTargetable": false,
-   "weightedBuildMaterials": {
-      "volatiles": null,
-      "metals": null,
-      "nobleMetals": null,
-      "exotics": null
-   },
-   "iconResource": "",
-   "modelResource": "",
    "effectResource": "spaceCombat/Phaser Beam Red",
    "fireSoundFXResource": "event:/SFX/Game_SFX/Lasers/trig_SFX_Phaser_Cannon"
 },
@@ -3505,33 +3221,18 @@
    "dataName": "T2BaseGreenPhaser",
    "friendlyName": "T2 Base Green Phaser",
    "mount": "T2BaseDefense",
-   "crew": null,
-   "sortOrder": null,
-   "requiredProjectName": "",
    "attackMode": true,
    "defenseMode": true,
-   "hp": null,
-   "baseWeaponMass_tons": null,
    "cooldown_s": 900,
-   "efficiency": null,
    "shotPower_MJ": 650,
    "wavelength_nm": 540,
    "mirrorRadius_cm": 1440,
    "beam_quality": 1.2,
-   "jitter_Rad": 6.3e-8,
-   "jitter_Div": null,
+   "jitter_Rad": 1.3e-8,
    "bombardmentValue": 3.2,
    "targetingRange_km": 2000,
    "pivotRange_deg": 180,
    "isPointDefenseTargetable": false,
-   "weightedBuildMaterials": {
-      "volatiles": null,
-      "metals": null,
-      "nobleMetals": null,
-      "exotics": null
-   },
-   "iconResource": "",
-   "modelResource": "",
    "effectResource": "spaceCombat/Phaser Beam Green",
    "fireSoundFXResource": "event:/SFX/Game_SFX/Lasers/trig_SFX_Phaser_Cannon"
 },
@@ -3539,33 +3240,18 @@
    "dataName": "T2BaseUVPhaser",
    "friendlyName": "T2 Base UV Phaser",
    "mount": "T2BaseDefense",
-   "crew": null,
-   "sortOrder": null,
-   "requiredProjectName": "",
    "attackMode": true,
    "defenseMode": true,
-   "hp": null,
-   "baseWeaponMass_tons": null,
    "cooldown_s": 900,
-   "efficiency": null,
    "shotPower_MJ": 650,
    "wavelength_nm": 270,
    "mirrorRadius_cm": 1440,
    "beam_quality": 1.1,
-   "jitter_Rad": 6.3e-8,
-   "jitter_Div": null,
+   "jitter_Rad": 1.3e-8,
    "bombardmentValue": 3.3,
    "targetingRange_km": 2000,
    "pivotRange_deg": 180,
    "isPointDefenseTargetable": false,
-   "weightedBuildMaterials": {
-      "volatiles": null,
-      "metals": null,
-      "nobleMetals": null,
-      "exotics": null
-   },
-   "iconResource": "",
-   "modelResource": "",
    "effectResource": "spaceCombat/Phaser Beam Violet",
    "fireSoundFXResource": "event:/SFX/Game_SFX/Lasers/trig_SFX_Phaser_Cannon"
 },
@@ -3573,33 +3259,18 @@
    "dataName": "T3BaseIRLaser",
    "friendlyName": "T3 Base IR Laser",
    "mount": "T3BaseDefense",
-   "crew": null,
-   "sortOrder": null,
-   "requiredProjectName": "",
    "attackMode": true,
    "defenseMode": true,
-   "hp": null,
-   "baseWeaponMass_tons": null,
    "cooldown_s": 900,
-   "efficiency": null,
    "shotPower_MJ": 800,
    "wavelength_nm": 1080,
    "mirrorRadius_cm": 1920,
    "beam_quality": 1.3,
-   "jitter_Rad": 1.05e-7,
-   "jitter_Div": null,
+   "jitter_Rad": 2.1e-8,
    "bombardmentValue": 1.1,
    "targetingRange_km": 2000,
    "pivotRange_deg": 180,
    "isPointDefenseTargetable": false,
-   "weightedBuildMaterials": {
-      "volatiles": null,
-      "metals": null,
-      "nobleMetals": null,
-      "exotics": null
-   },
-   "iconResource": "",
-   "modelResource": "",
    "effectResource": "spaceCombat/Standard Laser Beam Red",
    "fireSoundFXResource": "event:/SFX/Game_SFX/Lasers/trig_SFX_Basic_Laser_Cannon"
 },
@@ -3607,33 +3278,18 @@
    "dataName": "T3BaseGreenLaser",
    "friendlyName": "T3 Base Green Laser",
    "mount": "T3BaseDefense",
-   "crew": null,
-   "sortOrder": null,
-   "requiredProjectName": "",
    "attackMode": true,
    "defenseMode": true,
-   "hp": null,
-   "baseWeaponMass_tons": null,
    "cooldown_s": 900,
-   "efficiency": null,
    "shotPower_MJ": 800,
    "wavelength_nm": 540,
    "mirrorRadius_cm": 1920,
    "beam_quality": 1.2,
-   "jitter_Rad": 1.05e-7,
-   "jitter_Div": null,
+   "jitter_Rad": 2.1e-8,
    "bombardmentValue": 1.2,
    "targetingRange_km": 2000,
    "pivotRange_deg": 180,
    "isPointDefenseTargetable": false,
-   "weightedBuildMaterials": {
-      "volatiles": null,
-      "metals": null,
-      "nobleMetals": null,
-      "exotics": null
-   },
-   "iconResource": "",
-   "modelResource": "",
    "effectResource": "spaceCombat/Standard Laser Beam Green",
    "fireSoundFXResource": "event:/SFX/Game_SFX/Lasers/trig_SFX_Basic_Laser_Cannon"
 },
@@ -3641,33 +3297,18 @@
    "dataName": "T3BaseUVLaser",
    "friendlyName": "T3 Base UV Laser",
    "mount": "T3BaseDefense",
-   "crew": null,
-   "sortOrder": null,
-   "requiredProjectName": "",
    "attackMode": true,
    "defenseMode": true,
-   "hp": null,
-   "baseWeaponMass_tons": null,
    "cooldown_s": 900,
-   "efficiency": null,
    "shotPower_MJ": 800,
    "wavelength_nm": 270,
    "mirrorRadius_cm": 1920,
    "beam_quality": 1.1,
-   "jitter_Rad": 1.05e-7,
-   "jitter_Div": null,
+   "jitter_Rad": 2.1e-8,
    "bombardmentValue": 1.3,
    "targetingRange_km": 2000,
    "pivotRange_deg": 180,
    "isPointDefenseTargetable": false,
-   "weightedBuildMaterials": {
-      "volatiles": null,
-      "metals": null,
-      "nobleMetals": null,
-      "exotics": null
-   },
-   "iconResource": "",
-   "modelResource": "",
    "effectResource": "spaceCombat/Standard Laser Beam Violet",
    "fireSoundFXResource": "event:/SFX/Game_SFX/Lasers/trig_SFX_Basic_Laser_Cannon"
 },
@@ -3675,33 +3316,18 @@
    "dataName": "T3BaseIRArcLaser",
    "friendlyName": "T3 Base IR Arc Laser",
    "mount": "T3BaseDefense",
-   "crew": null,
-   "sortOrder": null,
-   "requiredProjectName": "",
    "attackMode": true,
    "defenseMode": true,
-   "hp": null,
-   "baseWeaponMass_tons": null,
    "cooldown_s": 900,
-   "efficiency": null,
    "shotPower_MJ": 800,
    "wavelength_nm": 1080,
    "mirrorRadius_cm": 1920,
    "beam_quality": 1.3,
-   "jitter_Rad": 8.4e-8,
-   "jitter_Div": null,
+   "jitter_Rad": 1.6e-8,
    "bombardmentValue": 2.1,
    "targetingRange_km": 2000,
    "pivotRange_deg": 180,
    "isPointDefenseTargetable": false,
-   "weightedBuildMaterials": {
-      "volatiles": null,
-      "metals": null,
-      "nobleMetals": null,
-      "exotics": null
-   },
-   "iconResource": "",
-   "modelResource": "",
    "effectResource": "spaceCombat/Arc Laser Beam Red",
    "fireSoundFXResource": "event:/SFX/Game_SFX/Lasers/trig_SFX_Arc_Laser_Cannon"
 },
@@ -3709,33 +3335,18 @@
    "dataName": "T3BaseGreenArcLaser",
    "friendlyName": "T3 Base Green Arc Laser",
    "mount": "T3BaseDefense",
-   "crew": null,
-   "sortOrder": null,
-   "requiredProjectName": "",
    "attackMode": true,
    "defenseMode": true,
-   "hp": null,
-   "baseWeaponMass_tons": null,
    "cooldown_s": 900,
-   "efficiency": null,
    "shotPower_MJ": 800,
    "wavelength_nm": 540,
    "mirrorRadius_cm": 1920,
    "beam_quality": 1.2,
-   "jitter_Rad": 8.4e-8,
-   "jitter_Div": null,
+   "jitter_Rad": 1.6e-8,
    "bombardmentValue": 2.2,
    "targetingRange_km": 2000,
    "pivotRange_deg": 180,
    "isPointDefenseTargetable": false,
-   "weightedBuildMaterials": {
-      "volatiles": null,
-      "metals": null,
-      "nobleMetals": null,
-      "exotics": null
-   },
-   "iconResource": "",
-   "modelResource": "",
    "effectResource": "spaceCombat/Arc Laser Beam Green",
    "fireSoundFXResource": "event:/SFX/Game_SFX/Lasers/trig_SFX_Arc_Laser_Cannon"
 },
@@ -3743,33 +3354,18 @@
    "dataName": "T3BaseUVArcLaser",
    "friendlyName": "T3 Base UV Arc Laser",
    "mount": "T3BaseDefense",
-   "crew": null,
-   "sortOrder": null,
-   "requiredProjectName": "",
    "attackMode": true,
    "defenseMode": true,
-   "hp": null,
-   "baseWeaponMass_tons": null,
    "cooldown_s": 900,
-   "efficiency": null,
    "shotPower_MJ": 800,
    "wavelength_nm": 270,
    "mirrorRadius_cm": 1920,
    "beam_quality": 1.1,
-   "jitter_Rad": 8.4e-8,
-   "jitter_Div": null,
+   "jitter_Rad": 1.6e-8,
    "bombardmentValue": 2.3,
    "targetingRange_km": 2000,
    "pivotRange_deg": 180,
    "isPointDefenseTargetable": false,
-   "weightedBuildMaterials": {
-      "volatiles": null,
-      "metals": null,
-      "nobleMetals": null,
-      "exotics": null
-   },
-   "iconResource": "",
-   "modelResource": "",
    "effectResource": "spaceCombat/Arc Laser Beam Violet",
    "fireSoundFXResource": "event:/SFX/Game_SFX/Lasers/trig_SFX_Arc_Laser_Cannon"
 },
@@ -3777,33 +3373,18 @@
    "dataName": "T3BaseIRPhaser",
    "friendlyName": "T3 Base IR Phaser",
    "mount": "T3BaseDefense",
-   "crew": null,
-   "sortOrder": null,
-   "requiredProjectName": "",
    "attackMode": true,
    "defenseMode": true,
-   "hp": null,
-   "baseWeaponMass_tons": null,
    "cooldown_s": 900,
-   "efficiency": null,
    "shotPower_MJ": 800,
    "wavelength_nm": 1080,
    "mirrorRadius_cm": 1920,
    "beam_quality": 1.3,
-   "jitter_Rad": 6.3e-8,
-   "jitter_Div": null,
+   "jitter_Rad": 1e-8,
    "bombardmentValue": 3.1,
    "targetingRange_km": 2000,
    "pivotRange_deg": 180,
    "isPointDefenseTargetable": false,
-   "weightedBuildMaterials": {
-      "volatiles": null,
-      "metals": null,
-      "nobleMetals": null,
-      "exotics": null
-   },
-   "iconResource": "",
-   "modelResource": "",
    "effectResource": "spaceCombat/Phaser Beam Red",
    "fireSoundFXResource": "event:/SFX/Game_SFX/Lasers/trig_SFX_Phaser_Cannon"
 },
@@ -3811,33 +3392,18 @@
    "dataName": "T3BaseGreenPhaser",
    "friendlyName": "T3 Base Green Phaser",
    "mount": "T3BaseDefense",
-   "crew": null,
-   "sortOrder": null,
-   "requiredProjectName": "",
    "attackMode": true,
    "defenseMode": true,
-   "hp": null,
-   "baseWeaponMass_tons": null,
    "cooldown_s": 900,
-   "efficiency": null,
    "shotPower_MJ": 800,
    "wavelength_nm": 540,
    "mirrorRadius_cm": 1920,
    "beam_quality": 1.2,
-   "jitter_Rad": 6.3e-8,
-   "jitter_Div": null,
+   "jitter_Rad": 1e-8,
    "bombardmentValue": 3.2,
    "targetingRange_km": 2000,
    "pivotRange_deg": 180,
    "isPointDefenseTargetable": false,
-   "weightedBuildMaterials": {
-      "volatiles": null,
-      "metals": null,
-      "nobleMetals": null,
-      "exotics": null
-   },
-   "iconResource": "",
-   "modelResource": "",
    "effectResource": "spaceCombat/Phaser Beam Green",
    "fireSoundFXResource": "event:/SFX/Game_SFX/Lasers/trig_SFX_Phaser_Cannon"
 },
@@ -3845,33 +3411,18 @@
    "dataName": "T3BaseUVPhaser",
    "friendlyName": "T3 Base UV Phaser",
    "mount": "T3BaseDefense",
-   "crew": null,
-   "sortOrder": null,
-   "requiredProjectName": "",
    "attackMode": true,
    "defenseMode": true,
-   "hp": null,
-   "baseWeaponMass_tons": null,
    "cooldown_s": 900,
-   "efficiency": null,
    "shotPower_MJ": 800,
    "wavelength_nm": 270,
    "mirrorRadius_cm": 1920,
    "beam_quality": 1.1,
-   "jitter_Rad": 6.3e-8,
-   "jitter_Div": null,
+   "jitter_Rad": 1e-8,
    "bombardmentValue": 3.3,
    "targetingRange_km": 2000,
    "pivotRange_deg": 180,
    "isPointDefenseTargetable": false,
-   "weightedBuildMaterials": {
-      "volatiles": null,
-      "metals": null,
-      "nobleMetals": null,
-      "exotics": null
-   },
-   "iconResource": "",
-   "modelResource": "",
    "effectResource": "spaceCombat/Phaser Beam Violet",
    "fireSoundFXResource": "event:/SFX/Game_SFX/Lasers/trig_SFX_Phaser_Cannon"
 },
@@ -3879,33 +3430,20 @@
    "dataName": "AlienRegionDefenseLaser",
    "friendlyName": "Alien Region Defense Laser",
    "mount": "RegionDefense",
-   "crew": null,
-   "sortOrder": null,
    "requiredProjectName": "Project_AlienMasterProject",
    "attackMode": true,
    "defenseMode": true,
-   "hp": null,
-   "baseWeaponMass_tons": null,
    "cooldown_s": 900,
    "efficiency": 0.5,
    "shotPower_MJ": 1024,
    "wavelength_nm": 450,
    "mirrorRadius_cm": 4096,
    "beam_quality": 1.1,
-   "jitter_Rad": 2.5e-8,
-   "jitter_Div": null,
+   "jitter_Rad": 1.2e-8,
    "bombardmentValue": 9.9,
    "targetingRange_km": 2000,
    "pivotRange_deg": 180,
    "isPointDefenseTargetable": false,
-   "weightedBuildMaterials": {
-      "volatiles": null,
-      "metals": null,
-      "nobleMetals": null,
-      "exotics": null
-   },
-   "iconResource": "",
-   "modelResource": "",
    "effectResource": "spaceCombat/Alien Laser Beam Blue",
    "fireSoundFXResource": "event:/SFX/Game_SFX/Lasers/trig_SFX_Alien_Laser_Cannon_Hi_Tech"
 },
@@ -3913,33 +3451,20 @@
    "dataName": "AlienT1BaseDefenseLaser",
    "friendlyName": "Alien T1 Base Defense Laser",
    "mount": "T1BaseDefense",
-   "crew": null,
-   "sortOrder": null,
    "requiredProjectName": "Project_AlienMasterProject",
    "attackMode": true,
    "defenseMode": true,
-   "hp": null,
-   "baseWeaponMass_tons": null,
    "cooldown_s": 900,
    "efficiency": 0.5,
    "shotPower_MJ": 512,
    "wavelength_nm": 450,
    "mirrorRadius_cm": 1024,
    "beam_quality": 1.1,
-   "jitter_Rad": 2.5e-8,
-   "jitter_Div": null,
+   "jitter_Rad": 1.5e-8,
    "bombardmentValue": 9.9,
    "targetingRange_km": 2000,
    "pivotRange_deg": 180,
    "isPointDefenseTargetable": false,
-   "weightedBuildMaterials": {
-      "volatiles": null,
-      "metals": null,
-      "nobleMetals": null,
-      "exotics": null
-   },
-   "iconResource": "",
-   "modelResource": "",
    "effectResource": "spaceCombat/Alien Laser Beam Blue",
    "fireSoundFXResource": "event:/SFX/Game_SFX/Lasers/trig_SFX_Alien_Laser_Cannon_Hi_Tech"
 },
@@ -3947,33 +3472,20 @@
    "dataName": "AlienT2BaseDefenseLaser",
    "friendlyName": "Alien T2 Base Defense Laser",
    "mount": "T2BaseDefense",
-   "crew": null,
-   "sortOrder": null,
    "requiredProjectName": "Project_AlienMasterProject",
    "attackMode": true,
    "defenseMode": true,
-   "hp": null,
-   "baseWeaponMass_tons": null,
    "cooldown_s": 900,
    "efficiency": 0.5,
    "shotPower_MJ": 684,
    "wavelength_nm": 450,
    "mirrorRadius_cm": 2048,
    "beam_quality": 1.1,
-   "jitter_Rad": 2.5e-8,
-   "jitter_Div": null,
+   "jitter_Rad": 1.2e-8,
    "bombardmentValue": 9.9,
    "targetingRange_km": 2000,
    "pivotRange_deg": 180,
    "isPointDefenseTargetable": false,
-   "weightedBuildMaterials": {
-      "volatiles": null,
-      "metals": null,
-      "nobleMetals": null,
-      "exotics": null
-   },
-   "iconResource": "",
-   "modelResource": "",
    "effectResource": "spaceCombat/Alien Laser Beam Blue",
    "fireSoundFXResource": "event:/SFX/Game_SFX/Lasers/trig_SFX_Alien_Laser_Cannon_Hi_Tech"
 },
@@ -3981,33 +3493,20 @@
    "dataName": "AlienT3BaseDefenseLaser",
    "friendlyName": "Alien T3 Base Defense Laser",
    "mount": "T3BaseDefense",
-   "crew": null,
-   "sortOrder": null,
    "requiredProjectName": "Project_AlienMasterProject",
    "attackMode": true,
    "defenseMode": true,
-   "hp": null,
-   "baseWeaponMass_tons": null,
    "cooldown_s": 900,
    "efficiency": 0.5,
    "shotPower_MJ": 768,
    "wavelength_nm": 450,
    "mirrorRadius_cm": 3072,
    "beam_quality": 1.1,
-   "jitter_Rad": 2.5e-8,
-   "jitter_Div": null,
+   "jitter_Rad": 9e-9,
    "bombardmentValue": 9.9,
    "targetingRange_km": 2000,
    "pivotRange_deg": 180,
    "isPointDefenseTargetable": false,
-   "weightedBuildMaterials": {
-      "volatiles": null,
-      "metals": null,
-      "nobleMetals": null,
-      "exotics": null
-   },
-   "iconResource": "",
-   "modelResource": "",
    "effectResource": "spaceCombat/Alien Laser Beam Blue",
    "fireSoundFXResource": "event:/SFX/Game_SFX/Lasers/trig_SFX_Alien_Laser_Cannon_Hi_Tech"
 }
diff --git a/app/game/templates/TIMagneticGunTemplate.json b/app/game/templates/TIMagneticGunTemplate.json
index e647f5a..c5841aa 100644
--- a/app/game/templates/TIMagneticGunTemplate.json
+++ b/app/game/templates/TIMagneticGunTemplate.json
@@ -5,18 +5,16 @@
    "mount": "OneHull",
    "crew": 3,
    "sort": 1,
-   "requiredProjectName": "Project_LightRailgunBatteryMk1",
+   "requiredProjectName": "Project_RailgunBatteryMk1",
    "attackMode": true,
    "defenseMode": true,
    "baseWeaponMass_tons": 50,
    "cooldown_s": 30,
-   "salvo_shots": null,
-   "intraSalvoCooldown_s": null,
    "efficiency": 0.25,
    "flatChipping": 0.25,
    "magazine": 1000,
    "ammoMass_kg": 12,
-   "muzzleVelocity_kps": 2.5,
+   "muzzleVelocity_kps": 3,
    "warheadMass_kg": 9,
    "bombardmentValue": 1,
    "targetingRange_km": 500,
@@ -25,14 +23,12 @@
    "weightedBuildMaterials": {
       "volatiles": 0.3,
       "metals": 0.5,
-      "nobleMetals": 0.2,
-      "exotics": null
+      "nobleMetals": 0.2
    },
    "ammoMaterials": {
       "volatiles": 0.1,
       "metals": 0.5,
-      "nobleMetals": 0.4,
-      "exotics": ""
+      "nobleMetals": 0.4
    },
    "iconResource": "shipbuildericons/ICO_LightRailgunBatteryMk1",
    "modelResource": "shipweapons/small_railgun_battery",
@@ -42,126 +38,114 @@
    "impactSoundFXResource": "event:/SFX/Game_SFX/Ship_Fire_Impacts/trig_SFX_BlasterLongLoudMid010MonoRR"
 },
  {
-   "dataName": "RailgunBatteryMk1",
-   "friendlyName": "Railgun Battery Mk1",
-   "mount": "TwoHullHoriz",
-   "crew": 4,
+   "dataName": "LightRailgunBatteryMk2",
+   "friendlyName": "Light Railgun Battery Mk2",
+   "mount": "OneHull",
+   "crew": 3,
    "sort": 2,
-   "requiredProjectName": "Project_RailgunBatteryMk1",
+   "requiredProjectName": "Project_RailgunBatteryMk2",
    "attackMode": true,
-   "defenseMode": false,
-   "baseWeaponMass_tons": 100,
-   "cooldown_s": 36,
-   "salvo_shots": null,
-   "intraSalvoCooldown_s": null,
-   "efficiency": 0.25,
+   "defenseMode": true,
+   "baseWeaponMass_tons": 45,
+   "cooldown_s": 20,
+   "efficiency": 0.3,
    "flatChipping": 0.25,
-   "magazine": 1200,
-   "ammoMass_kg": 24,
-   "muzzleVelocity_kps": 3,
-   "warheadMass_kg": 18,
+   "magazine": 1000,
+   "ammoMass_kg": 12,
+   "muzzleVelocity_kps": 3.3,
+   "warheadMass_kg": 9.6,
    "bombardmentValue": 2,
-   "targetingRange_km": 650,
+   "targetingRange_km": 550,
    "pivotRange_deg": 180,
    "isPointDefenseTargetable": true,
    "weightedBuildMaterials": {
       "volatiles": 0.3,
       "metals": 0.5,
-      "nobleMetals": 0.2,
-      "exotics": null
+      "nobleMetals": 0.2
    },
    "ammoMaterials": {
       "volatiles": 0.1,
       "metals": 0.5,
-      "nobleMetals": 0.4,
-      "exotics": ""
+      "nobleMetals": 0.4
    },
-   "iconResource": "shipbuildericons/ICO_RailgunBatteryMk1",
-   "modelResource": "shipweapons/medium_railgun_battery",
+   "iconResource": "shipbuildericons/ICO_LightRailgunBatteryMk2",
+   "modelResource": "shipweapons/small_railgun_battery",
    "shotModelResource": "spaceCombat/BulletRail",
    "impactVisualFXResource": "spaceCombat/ImpactOrange",
    "fireSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_RailGun_Turret",
    "impactSoundFXResource": "event:/SFX/Game_SFX/Ship_Fire_Impacts/trig_SFX_BlasterLongLoudMid010MonoRR"
 },
  {
-   "dataName": "HeavyRailgunBatteryMk1",
-   "friendlyName": "Heavy Railgun Battery Mk1",
-   "mount": "FourHull",
-   "crew": 5,
+   "dataName": "LightRailgunBatteryMk3",
+   "friendlyName": "Light Railgun Battery Mk3",
+   "mount": "OneHull",
+   "crew": 3,
    "sort": 3,
-   "requiredProjectName": "Project_HeavyRailgunBatteryMk1",
+   "requiredProjectName": "Project_RailgunBatteryMk3",
    "attackMode": true,
-   "defenseMode": false,
-   "baseWeaponMass_tons": 200,
-   "cooldown_s": 43.2,
-   "salvo_shots": null,
-   "intraSalvoCooldown_s": null,
-   "efficiency": 0.25,
+   "defenseMode": true,
+   "baseWeaponMass_tons": 40,
+   "cooldown_s": 10,
+   "efficiency": 0.35,
    "flatChipping": 0.25,
-   "magazine": 1440,
-   "ammoMass_kg": 48,
+   "magazine": 1000,
+   "ammoMass_kg": 12,
    "muzzleVelocity_kps": 3.6,
-   "warheadMass_kg": 36,
+   "warheadMass_kg": 10.5,
    "bombardmentValue": 3,
-   "targetingRange_km": 800,
+   "targetingRange_km": 600,
    "pivotRange_deg": 180,
    "isPointDefenseTargetable": true,
    "weightedBuildMaterials": {
       "volatiles": 0.3,
       "metals": 0.5,
-      "nobleMetals": 0.2,
-      "exotics": null
+      "nobleMetals": 0.2
    },
    "ammoMaterials": {
       "volatiles": 0.1,
       "metals": 0.5,
-      "nobleMetals": 0.4,
-      "exotics": ""
+      "nobleMetals": 0.4
    },
-   "iconResource": "shipbuildericons/ICO_HeavyRailgunBatteryMk1",
-   "modelResource": "shipweapons/large_railgun_battery",
+   "iconResource": "shipbuildericons/ICO_LightRailgunBatteryMk3",
+   "modelResource": "shipweapons/small_railgun_battery",
    "shotModelResource": "spaceCombat/BulletRail",
    "impactVisualFXResource": "spaceCombat/ImpactOrange",
    "fireSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_RailGun_Turret",
    "impactSoundFXResource": "event:/SFX/Game_SFX/Ship_Fire_Impacts/trig_SFX_BlasterLongLoudMid010MonoRR"
 },
  {
-   "dataName": "LightRailgunBatteryMk2",
-   "friendlyName": "Light Railgun Battery Mk2",
-   "mount": "OneHull",
-   "crew": 3,
+   "dataName": "RailgunBatteryMk1",
+   "friendlyName": "Railgun Battery Mk1",
+   "mount": "TwoHullHoriz",
+   "crew": 4,
    "sort": 4,
-   "requiredProjectName": "Project_LightRailgunBatteryMk2",
+   "requiredProjectName": "Project_RailgunBatteryMk1",
    "attackMode": true,
-   "defenseMode": true,
-   "baseWeaponMass_tons": 45,
-   "cooldown_s": 20,
-   "salvo_shots": null,
-   "intraSalvoCooldown_s": null,
-   "efficiency": 0.3,
+   "defenseMode": false,
+   "baseWeaponMass_tons": 100,
+   "cooldown_s": 30,
+   "efficiency": 0.25,
    "flatChipping": 0.25,
-   "magazine": 1000,
-   "ammoMass_kg": 12,
-   "muzzleVelocity_kps": 3,
-   "warheadMass_kg": 9.6,
+   "magazine": 1200,
+   "ammoMass_kg": 24,
+   "muzzleVelocity_kps": 3.3,
+   "warheadMass_kg": 18,
    "bombardmentValue": 2,
-   "targetingRange_km": 550,
+   "targetingRange_km": 650,
    "pivotRange_deg": 180,
    "isPointDefenseTargetable": true,
    "weightedBuildMaterials": {
       "volatiles": 0.3,
       "metals": 0.5,
-      "nobleMetals": 0.2,
-      "exotics": null
+      "nobleMetals": 0.2
    },
    "ammoMaterials": {
       "volatiles": 0.1,
       "metals": 0.5,
-      "nobleMetals": 0.4,
-      "exotics": ""
+      "nobleMetals": 0.4
    },
-   "iconResource": "shipbuildericons/ICO_LightRailgunBatteryMk2",
-   "modelResource": "shipweapons/small_railgun_battery",
+   "iconResource": "shipbuildericons/ICO_RailgunBatteryMk1",
+   "modelResource": "shipweapons/medium_railgun_battery",
    "shotModelResource": "spaceCombat/BulletRail",
    "impactVisualFXResource": "spaceCombat/ImpactOrange",
    "fireSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_RailGun_Turret",
@@ -177,9 +161,7 @@
    "attackMode": true,
    "defenseMode": false,
    "baseWeaponMass_tons": 90,
-   "cooldown_s": 24,
-   "salvo_shots": null,
-   "intraSalvoCooldown_s": null,
+   "cooldown_s": 20,
    "efficiency": 0.3,
    "flatChipping": 0.25,
    "magazine": 1200,
@@ -193,14 +175,12 @@
    "weightedBuildMaterials": {
       "volatiles": 0.3,
       "metals": 0.5,
-      "nobleMetals": 0.2,
-      "exotics": null
+      "nobleMetals": 0.2
    },
    "ammoMaterials": {
       "volatiles": 0.1,
       "metals": 0.5,
-      "nobleMetals": 0.4,
-      "exotics": ""
+      "nobleMetals": 0.4
    },
    "iconResource": "shipbuildericons/ICO_RailgunBatteryMk2",
    "modelResource": "shipweapons/medium_railgun_battery",
@@ -210,126 +190,114 @@
    "impactSoundFXResource": "event:/SFX/Game_SFX/Ship_Fire_Impacts/trig_SFX_BlasterLongLoudMid010MonoRR"
 },
  {
-   "dataName": "HeavyRailgunBatteryMk2",
-   "friendlyName": "Heavy Railgun Battery Mk2",
-   "mount": "FourHull",
-   "crew": 5,
+   "dataName": "RailgunBatteryMk3",
+   "friendlyName": "Railgun Battery Mk3",
+   "mount": "TwoHullHoriz",
+   "crew": 4,
    "sort": 6,
-   "requiredProjectName": "Project_HeavyRailgunBatteryMk2",
+   "requiredProjectName": "Project_RailgunBatteryMk3",
    "attackMode": true,
    "defenseMode": false,
-   "baseWeaponMass_tons": 180,
-   "cooldown_s": 28.8,
-   "salvo_shots": null,
-   "intraSalvoCooldown_s": null,
-   "efficiency": 0.3,
+   "baseWeaponMass_tons": 80,
+   "cooldown_s": 10,
+   "efficiency": 0.35,
    "flatChipping": 0.25,
-   "magazine": 1440,
-   "ammoMass_kg": 48,
+   "magazine": 1200,
+   "ammoMass_kg": 24,
    "muzzleVelocity_kps": 4.32,
-   "warheadMass_kg": 38.4,
+   "warheadMass_kg": 21,
    "bombardmentValue": 4,
-   "targetingRange_km": 850,
+   "targetingRange_km": 750,
    "pivotRange_deg": 180,
    "isPointDefenseTargetable": true,
    "weightedBuildMaterials": {
       "volatiles": 0.3,
       "metals": 0.5,
-      "nobleMetals": 0.2,
-      "exotics": null
+      "nobleMetals": 0.2
    },
    "ammoMaterials": {
       "volatiles": 0.1,
       "metals": 0.5,
-      "nobleMetals": 0.4,
-      "exotics": ""
+      "nobleMetals": 0.4
    },
-   "iconResource": "shipbuildericons/ICO_HeavyRailgunBatteryMk2",
-   "modelResource": "shipweapons/large_railgun_battery",
+   "iconResource": "shipbuildericons/ICO_RailgunBatteryMk3",
+   "modelResource": "shipweapons/medium_railgun_battery",
    "shotModelResource": "spaceCombat/BulletRail",
    "impactVisualFXResource": "spaceCombat/ImpactOrange",
    "fireSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_RailGun_Turret",
    "impactSoundFXResource": "event:/SFX/Game_SFX/Ship_Fire_Impacts/trig_SFX_BlasterLongLoudMid010MonoRR"
 },
  {
-   "dataName": "LightRailgunBatteryMk3",
-   "friendlyName": "Light Railgun Battery Mk3",
-   "mount": "OneHull",
-   "crew": 3,
+   "dataName": "HeavyRailgunBatteryMk1",
+   "friendlyName": "Heavy Railgun Battery Mk1",
+   "mount": "FourHull",
+   "crew": 5,
    "sort": 7,
-   "requiredProjectName": "Project_LightRailgunBatteryMk3",
+   "requiredProjectName": "Project_RailgunBatteryMk1",
    "attackMode": true,
-   "defenseMode": true,
-   "baseWeaponMass_tons": 40,
-   "cooldown_s": 10,
-   "salvo_shots": null,
-   "intraSalvoCooldown_s": null,
-   "efficiency": 0.35,
+   "defenseMode": false,
+   "baseWeaponMass_tons": 200,
+   "cooldown_s": 30,
+   "efficiency": 0.25,
    "flatChipping": 0.25,
-   "magazine": 1000,
-   "ammoMass_kg": 12,
+   "magazine": 1440,
+   "ammoMass_kg": 48,
    "muzzleVelocity_kps": 3.6,
-   "warheadMass_kg": 10.5,
+   "warheadMass_kg": 36,
    "bombardmentValue": 3,
-   "targetingRange_km": 600,
+   "targetingRange_km": 800,
    "pivotRange_deg": 180,
    "isPointDefenseTargetable": true,
    "weightedBuildMaterials": {
       "volatiles": 0.3,
       "metals": 0.5,
-      "nobleMetals": 0.2,
-      "exotics": null
+      "nobleMetals": 0.2
    },
    "ammoMaterials": {
       "volatiles": 0.1,
       "metals": 0.5,
-      "nobleMetals": 0.4,
-      "exotics": ""
+      "nobleMetals": 0.4
    },
-   "iconResource": "shipbuildericons/ICO_LightRailgunBatteryMk3",
-   "modelResource": "shipweapons/small_railgun_battery",
+   "iconResource": "shipbuildericons/ICO_HeavyRailgunBatteryMk1",
+   "modelResource": "shipweapons/large_railgun_battery",
    "shotModelResource": "spaceCombat/BulletRail",
    "impactVisualFXResource": "spaceCombat/ImpactOrange",
    "fireSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_RailGun_Turret",
    "impactSoundFXResource": "event:/SFX/Game_SFX/Ship_Fire_Impacts/trig_SFX_BlasterLongLoudMid010MonoRR"
 },
  {
-   "dataName": "RailgunBatteryMk3",
-   "friendlyName": "Railgun Battery Mk3",
-   "mount": "TwoHullHoriz",
-   "crew": 4,
+   "dataName": "HeavyRailgunBatteryMk2",
+   "friendlyName": "Heavy Railgun Battery Mk2",
+   "mount": "FourHull",
+   "crew": 5,
    "sort": 8,
-   "requiredProjectName": "Project_RailgunBatteryMk3",
+   "requiredProjectName": "Project_RailgunBatteryMk2",
    "attackMode": true,
    "defenseMode": false,
-   "baseWeaponMass_tons": 80,
-   "cooldown_s": 12,
-   "salvo_shots": null,
-   "intraSalvoCooldown_s": null,
-   "efficiency": 0.35,
+   "baseWeaponMass_tons": 180,
+   "cooldown_s": 20,
+   "efficiency": 0.3,
    "flatChipping": 0.25,
-   "magazine": 1200,
-   "ammoMass_kg": 24,
+   "magazine": 1440,
+   "ammoMass_kg": 48,
    "muzzleVelocity_kps": 4.32,
-   "warheadMass_kg": 21,
+   "warheadMass_kg": 38.4,
    "bombardmentValue": 4,
-   "targetingRange_km": 750,
+   "targetingRange_km": 850,
    "pivotRange_deg": 180,
    "isPointDefenseTargetable": true,
    "weightedBuildMaterials": {
       "volatiles": 0.3,
       "metals": 0.5,
-      "nobleMetals": 0.2,
-      "exotics": null
+      "nobleMetals": 0.2
    },
    "ammoMaterials": {
       "volatiles": 0.1,
       "metals": 0.5,
-      "nobleMetals": 0.4,
-      "exotics": ""
+      "nobleMetals": 0.4
    },
-   "iconResource": "shipbuildericons/ICO_RailgunBatteryMk3",
-   "modelResource": "shipweapons/medium_railgun_battery",
+   "iconResource": "shipbuildericons/ICO_HeavyRailgunBatteryMk2",
+   "modelResource": "shipweapons/large_railgun_battery",
    "shotModelResource": "spaceCombat/BulletRail",
    "impactVisualFXResource": "spaceCombat/ImpactOrange",
    "fireSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_RailGun_Turret",
@@ -341,13 +309,11 @@
    "mount": "FourHull",
    "crew": 5,
    "sort": 9,
-   "requiredProjectName": "Project_HeavyRailgunBatteryMk3",
+   "requiredProjectName": "Project_RailgunBatteryMk3",
    "attackMode": true,
    "defenseMode": false,
    "baseWeaponMass_tons": 160,
-   "cooldown_s": 14.4,
-   "salvo_shots": null,
-   "intraSalvoCooldown_s": null,
+   "cooldown_s": 10,
    "efficiency": 0.35,
    "flatChipping": 0.25,
    "magazine": 1440,
@@ -361,14 +327,12 @@
    "weightedBuildMaterials": {
       "volatiles": 0.3,
       "metals": 0.5,
-      "nobleMetals": 0.2,
-      "exotics": null
+      "nobleMetals": 0.2
    },
    "ammoMaterials": {
       "volatiles": 0.1,
       "metals": 0.5,
-      "nobleMetals": 0.4,
-      "exotics": ""
+      "nobleMetals": 0.4
    },
    "iconResource": "shipbuildericons/ICO_HeavyRailgunBatteryMk3",
    "modelResource": "shipweapons/large_railgun_battery",
@@ -383,13 +347,11 @@
    "mount": "OneNose",
    "crew": 4,
    "sort": 10,
-   "requiredProjectName": "Project_LightRailCannonMk1",
+   "requiredProjectName": "Project_RailCannonMk1",
    "attackMode": true,
    "defenseMode": false,
    "baseWeaponMass_tons": 60,
    "cooldown_s": 45,
-   "salvo_shots": null,
-   "intraSalvoCooldown_s": null,
    "efficiency": 0.25,
    "flatChipping": 0.35,
    "magazine": 200,
@@ -403,14 +365,12 @@
    "weightedBuildMaterials": {
       "volatiles": 0.3,
       "metals": 0.5,
-      "nobleMetals": 0.2,
-      "exotics": null
+      "nobleMetals": 0.2
    },
    "ammoMaterials": {
       "volatiles": 0.1,
       "metals": 0.5,
-      "nobleMetals": 0.4,
-      "exotics": ""
+      "nobleMetals": 0.4
    },
    "iconResource": "shipbuildericons/ICO_LightRailCannonMk1",
    "modelResource": "shipweapons/small_railgun_cannon",
@@ -420,209 +380,189 @@
    "impactSoundFXResource": "event:/SFX/Game_SFX/Ship_Fire_Impacts/trig_SFX_BlasterLongLoudMid017MonoRR"
 },
  {
-   "dataName": "RailCannonMk1",
-   "friendlyName": "Rail Cannon Mk1",
-   "mount": "TwoNoseVert",
-   "crew": 5,
+   "dataName": "LightRailCannonMk2",
+   "friendlyName": "Light Rail Cannon Mk2",
+   "mount": "OneNose",
+   "crew": 4,
    "sort": 11,
-   "requiredProjectName": "Project_RailCannonMk1",
+   "requiredProjectName": "Project_RailCannonMk2",
    "attackMode": true,
    "defenseMode": false,
-   "baseWeaponMass_tons": 120,
-   "cooldown_s": 54,
-   "salvo_shots": null,
-   "intraSalvoCooldown_s": null,
-   "efficiency": 0.25,
+   "baseWeaponMass_tons": 55,
+   "cooldown_s": 30,
+   "efficiency": 0.3,
    "flatChipping": 0.35,
-   "magazine": 240,
-   "ammoMass_kg": 60,
+   "magazine": 200,
+   "ammoMass_kg": 30,
    "muzzleVelocity_kps": 4.32,
-   "warheadMass_kg": 45,
+   "warheadMass_kg": 24,
    "bombardmentValue": 3,
-   "targetingRange_km": 700,
+   "targetingRange_km": 600,
    "pivotRange_deg": 30,
    "isPointDefenseTargetable": true,
    "weightedBuildMaterials": {
       "volatiles": 0.3,
       "metals": 0.5,
-      "nobleMetals": 0.2,
-      "exotics": null
+      "nobleMetals": 0.2
    },
    "ammoMaterials": {
       "volatiles": 0.1,
       "metals": 0.5,
-      "nobleMetals": 0.4,
-      "exotics": ""
+      "nobleMetals": 0.4
    },
-   "iconResource": "shipbuildericons/ICO_RailCannonMk1",
-   "modelResource": "shipweapons/medium_railgun_cannon",
+   "iconResource": "shipbuildericons/ICO_LightRailCannonMk2",
+   "modelResource": "shipweapons/small_railgun_cannon",
    "shotModelResource": "spaceCombat/BulletRail",
    "impactVisualFXResource": "spaceCombat/ImpactOrange",
    "fireSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_RailGun_Cannon",
    "impactSoundFXResource": "event:/SFX/Game_SFX/Ship_Fire_Impacts/trig_SFX_BlasterLongLoudMid017MonoRR"
 },
  {
-   "dataName": "HeavyRailCannonMk1",
-   "friendlyName": "Heavy Rail Cannon Mk1",
-   "mount": "ThreeNoseAngle",
-   "crew": 6,
+   "dataName": "LightRailCannonMk3",
+   "friendlyName": "Light Rail Cannon Mk3",
+   "mount": "OneNose",
+   "crew": 4,
    "sort": 12,
-   "requiredProjectName": "Project_HeavyRailCannonMk1",
+   "requiredProjectName": "Project_RailCannonMk3",
    "attackMode": true,
    "defenseMode": false,
-   "baseWeaponMass_tons": 180,
-   "cooldown_s": 81,
-   "salvo_shots": null,
-   "intraSalvoCooldown_s": null,
-   "efficiency": 0.25,
+   "baseWeaponMass_tons": 50,
+   "cooldown_s": 15,
+   "efficiency": 0.35,
    "flatChipping": 0.35,
-   "magazine": 240,
-   "ammoMass_kg": 90,
-   "muzzleVelocity_kps": 4.75,
-   "warheadMass_kg": 67.5,
-   "bombardmentValue": 3,
-   "targetingRange_km": 800,
+   "magazine": 200,
+   "ammoMass_kg": 30,
+   "muzzleVelocity_kps": 5.18,
+   "warheadMass_kg": 26.25,
+   "bombardmentValue": 4,
+   "targetingRange_km": 650,
    "pivotRange_deg": 30,
    "isPointDefenseTargetable": true,
    "weightedBuildMaterials": {
       "volatiles": 0.3,
       "metals": 0.5,
-      "nobleMetals": 0.2,
-      "exotics": null
+      "nobleMetals": 0.2
    },
    "ammoMaterials": {
       "volatiles": 0.1,
       "metals": 0.5,
-      "nobleMetals": 0.4,
-      "exotics": ""
+      "nobleMetals": 0.4
    },
-   "iconResource": "shipbuildericons/ICO_HeavyRailCannonMk1",
-   "modelResource": "shipweapons/large_railgun_cannon",
+   "iconResource": "shipbuildericons/ICO_LightRailCannonMk3",
+   "modelResource": "shipweapons/small_railgun_cannon",
    "shotModelResource": "spaceCombat/BulletRail",
    "impactVisualFXResource": "spaceCombat/ImpactOrange",
    "fireSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_RailGun_Cannon",
    "impactSoundFXResource": "event:/SFX/Game_SFX/Ship_Fire_Impacts/trig_SFX_BlasterLongLoudMid017MonoRR"
 },
  {
-   "dataName": "SpinalRailgunMk1",
-   "friendlyName": "Spinal Railgun Mk1",
-   "mount": "FourNose",
-   "crew": 6,
+   "dataName": "RailCannonMk1",
+   "friendlyName": "Rail Cannon Mk1",
+   "mount": "TwoNoseVert",
+   "crew": 5,
    "sort": 13,
-   "requiredProjectName": "Project_SpinalRailgunMk1",
+   "requiredProjectName": "Project_RailCannonMk1",
    "attackMode": true,
    "defenseMode": false,
-   "baseWeaponMass_tons": 240,
-   "cooldown_s": 108,
-   "salvo_shots": null,
-   "intraSalvoCooldown_s": null,
+   "baseWeaponMass_tons": 120,
+   "cooldown_s": 45,
    "efficiency": 0.25,
    "flatChipping": 0.35,
-   "magazine": 300,
-   "ammoMass_kg": 120,
-   "muzzleVelocity_kps": 5.18,
-   "warheadMass_kg": 90,
-   "bombardmentValue": 4,
-   "targetingRange_km": 900,
-   "pivotRange_deg": 30,
+   "magazine": 240,
+   "ammoMass_kg": 60,
+   "muzzleVelocity_kps": 4.32,
+   "warheadMass_kg": 45,
+   "bombardmentValue": 3,
+   "targetingRange_km": 700,
+   "pivotRange_deg": 30,
    "isPointDefenseTargetable": true,
    "weightedBuildMaterials": {
       "volatiles": 0.3,
       "metals": 0.5,
-      "nobleMetals": 0.2,
-      "exotics": null
+      "nobleMetals": 0.2
    },
    "ammoMaterials": {
       "volatiles": 0.1,
       "metals": 0.5,
-      "nobleMetals": 0.4,
-      "exotics": ""
+      "nobleMetals": 0.4
    },
-   "iconResource": "shipbuildericons/ICO_SpinalRailgunMk1",
-   "modelResource": "shipweapons/huge_railgun_cannon",
+   "iconResource": "shipbuildericons/ICO_RailCannonMk1",
+   "modelResource": "shipweapons/medium_railgun_cannon",
    "shotModelResource": "spaceCombat/BulletRail",
    "impactVisualFXResource": "spaceCombat/ImpactOrange",
    "fireSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_RailGun_Cannon",
    "impactSoundFXResource": "event:/SFX/Game_SFX/Ship_Fire_Impacts/trig_SFX_BlasterLongLoudMid017MonoRR"
 },
  {
-   "dataName": "LightRailCannonMk2",
-   "friendlyName": "Light Rail Cannon Mk2",
-   "mount": "OneNose",
-   "crew": 4,
+   "dataName": "RailCannonMk2",
+   "friendlyName": "Rail Cannon Mk2",
+   "mount": "TwoNoseVert",
+   "crew": 5,
    "sort": 14,
-   "requiredProjectName": "Project_LightRailCannonMk2",
+   "requiredProjectName": "Project_RailCannonMk2",
    "attackMode": true,
    "defenseMode": false,
-   "baseWeaponMass_tons": 55,
+   "baseWeaponMass_tons": 110,
    "cooldown_s": 30,
-   "salvo_shots": null,
-   "intraSalvoCooldown_s": null,
    "efficiency": 0.3,
    "flatChipping": 0.35,
-   "magazine": 200,
-   "ammoMass_kg": 30,
-   "muzzleVelocity_kps": 4.32,
-   "warheadMass_kg": 24,
-   "bombardmentValue": 3,
-   "targetingRange_km": 600,
+   "magazine": 240,
+   "ammoMass_kg": 60,
+   "muzzleVelocity_kps": 5.18,
+   "warheadMass_kg": 48,
+   "bombardmentValue": 4,
+   "targetingRange_km": 750,
    "pivotRange_deg": 30,
    "isPointDefenseTargetable": true,
    "weightedBuildMaterials": {
       "volatiles": 0.3,
       "metals": 0.5,
-      "nobleMetals": 0.2,
-      "exotics": null
+      "nobleMetals": 0.2
    },
    "ammoMaterials": {
       "volatiles": 0.1,
       "metals": 0.5,
-      "nobleMetals": 0.4,
-      "exotics": ""
+      "nobleMetals": 0.4
    },
-   "iconResource": "shipbuildericons/ICO_LightRailCannonMk2",
-   "modelResource": "shipweapons/small_railgun_cannon",
+   "iconResource": "shipbuildericons/ICO_RailCannonMk2",
+   "modelResource": "shipweapons/medium_railgun_cannon",
    "shotModelResource": "spaceCombat/BulletRail",
    "impactVisualFXResource": "spaceCombat/ImpactOrange",
    "fireSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_RailGun_Cannon",
    "impactSoundFXResource": "event:/SFX/Game_SFX/Ship_Fire_Impacts/trig_SFX_BlasterLongLoudMid017MonoRR"
 },
  {
-   "dataName": "RailCannonMk2",
-   "friendlyName": "Rail Cannon Mk2",
+   "dataName": "RailCannonMk3",
+   "friendlyName": "Rail Cannon Mk3",
    "mount": "TwoNoseVert",
    "crew": 5,
    "sort": 15,
-   "requiredProjectName": "Project_RailCannonMk2",
+   "requiredProjectName": "Project_RailCannonMk3",
    "attackMode": true,
    "defenseMode": false,
-   "baseWeaponMass_tons": 110,
-   "cooldown_s": 36,
-   "salvo_shots": null,
-   "intraSalvoCooldown_s": null,
-   "efficiency": 0.3,
+   "baseWeaponMass_tons": 100,
+   "cooldown_s": 15,
+   "efficiency": 0.35,
    "flatChipping": 0.35,
    "magazine": 240,
    "ammoMass_kg": 60,
-   "muzzleVelocity_kps": 5.18,
-   "warheadMass_kg": 48,
-   "bombardmentValue": 4,
-   "targetingRange_km": 750,
+   "muzzleVelocity_kps": 6.48,
+   "warheadMass_kg": 52.5,
+   "bombardmentValue": 5,
+   "targetingRange_km": 800,
    "pivotRange_deg": 30,
    "isPointDefenseTargetable": true,
    "weightedBuildMaterials": {
       "volatiles": 0.3,
       "metals": 0.5,
-      "nobleMetals": 0.2,
-      "exotics": null
+      "nobleMetals": 0.2
    },
    "ammoMaterials": {
       "volatiles": 0.1,
       "metals": 0.5,
-      "nobleMetals": 0.4,
-      "exotics": ""
+      "nobleMetals": 0.4
    },
-   "iconResource": "shipbuildericons/ICO_RailCannonMk2",
+   "iconResource": "shipbuildericons/ICO_RailCannonMk3",
    "modelResource": "shipweapons/medium_railgun_cannon",
    "shotModelResource": "spaceCombat/BulletRail",
    "impactVisualFXResource": "spaceCombat/ImpactOrange",
@@ -630,41 +570,37 @@
    "impactSoundFXResource": "event:/SFX/Game_SFX/Ship_Fire_Impacts/trig_SFX_BlasterLongLoudMid017MonoRR"
 },
  {
-   "dataName": "HeavyRailCannonMk2",
-   "friendlyName": "Heavy Rail Cannon Mk2",
+   "dataName": "HeavyRailCannonMk1",
+   "friendlyName": "Heavy Rail Cannon Mk1",
    "mount": "ThreeNoseAngle",
    "crew": 6,
    "sort": 16,
-   "requiredProjectName": "Project_HeavyRailCannonMk2",
+   "requiredProjectName": "Project_RailCannonMk1",
    "attackMode": true,
    "defenseMode": false,
-   "baseWeaponMass_tons": 165,
-   "cooldown_s": 54,
-   "salvo_shots": null,
-   "intraSalvoCooldown_s": null,
-   "efficiency": 0.3,
+   "baseWeaponMass_tons": 180,
+   "cooldown_s": 45,
+   "efficiency": 0.25,
    "flatChipping": 0.35,
    "magazine": 240,
    "ammoMass_kg": 90,
-   "muzzleVelocity_kps": 5.83,
-   "warheadMass_kg": 72,
-   "bombardmentValue": 4,
-   "targetingRange_km": 850,
+   "muzzleVelocity_kps": 4.75,
+   "warheadMass_kg": 67.5,
+   "bombardmentValue": 3,
+   "targetingRange_km": 800,
    "pivotRange_deg": 30,
    "isPointDefenseTargetable": true,
    "weightedBuildMaterials": {
       "volatiles": 0.3,
       "metals": 0.5,
-      "nobleMetals": 0.2,
-      "exotics": null
+      "nobleMetals": 0.2
    },
    "ammoMaterials": {
       "volatiles": 0.1,
       "metals": 0.5,
-      "nobleMetals": 0.4,
-      "exotics": ""
+      "nobleMetals": 0.4
    },
-   "iconResource": "shipbuildericons/ICO_HeavyRailCannonMk2",
+   "iconResource": "shipbuildericons/ICO_HeavyRailCannonMk1",
    "modelResource": "shipweapons/large_railgun_cannon",
    "shotModelResource": "spaceCombat/BulletRail",
    "impactVisualFXResource": "spaceCombat/ImpactOrange",
@@ -672,168 +608,152 @@
    "impactSoundFXResource": "event:/SFX/Game_SFX/Ship_Fire_Impacts/trig_SFX_BlasterLongLoudMid017MonoRR"
 },
  {
-   "dataName": "SpinalRailgunMk2",
-   "friendlyName": "Spinal Railgun Mk2",
-   "mount": "FourNose",
+   "dataName": "HeavyRailCannonMk2",
+   "friendlyName": "Heavy Rail Cannon Mk2",
+   "mount": "ThreeNoseAngle",
    "crew": 6,
    "sort": 17,
-   "requiredProjectName": "Project_SpinalRailgunMk2",
+   "requiredProjectName": "Project_RailCannonMk2",
    "attackMode": true,
    "defenseMode": false,
-   "baseWeaponMass_tons": 220,
-   "cooldown_s": 72,
-   "salvo_shots": null,
-   "intraSalvoCooldown_s": null,
+   "baseWeaponMass_tons": 165,
+   "cooldown_s": 30,
    "efficiency": 0.3,
    "flatChipping": 0.35,
-   "magazine": 300,
-   "ammoMass_kg": 120,
-   "muzzleVelocity_kps": 6.48,
-   "warheadMass_kg": 96,
-   "bombardmentValue": 5,
-   "targetingRange_km": 950,
+   "magazine": 240,
+   "ammoMass_kg": 90,
+   "muzzleVelocity_kps": 5.83,
+   "warheadMass_kg": 72,
+   "bombardmentValue": 4,
+   "targetingRange_km": 850,
    "pivotRange_deg": 30,
    "isPointDefenseTargetable": true,
    "weightedBuildMaterials": {
       "volatiles": 0.3,
       "metals": 0.5,
-      "nobleMetals": 0.2,
-      "exotics": null
+      "nobleMetals": 0.2
    },
    "ammoMaterials": {
       "volatiles": 0.1,
       "metals": 0.5,
-      "nobleMetals": 0.4,
-      "exotics": ""
+      "nobleMetals": 0.4
    },
-   "iconResource": "shipbuildericons/ICO_SpinalRailgunMk2",
-   "modelResource": "shipweapons/huge_railgun_cannon",
+   "iconResource": "shipbuildericons/ICO_HeavyRailCannonMk2",
+   "modelResource": "shipweapons/large_railgun_cannon",
    "shotModelResource": "spaceCombat/BulletRail",
    "impactVisualFXResource": "spaceCombat/ImpactOrange",
    "fireSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_RailGun_Cannon",
    "impactSoundFXResource": "event:/SFX/Game_SFX/Ship_Fire_Impacts/trig_SFX_BlasterLongLoudMid017MonoRR"
 },
  {
-   "dataName": "LightRailCannonMk3",
-   "friendlyName": "Light Rail Cannon Mk3",
-   "mount": "OneNose",
-   "crew": 4,
+   "dataName": "HeavyRailCannonMk3",
+   "friendlyName": "Heavy Rail Cannon Mk3",
+   "mount": "ThreeNoseAngle",
+   "crew": 6,
    "sort": 18,
-   "requiredProjectName": "Project_LightRailCannonMk3",
+   "requiredProjectName": "Project_RailCannonMk3",
    "attackMode": true,
    "defenseMode": false,
-   "baseWeaponMass_tons": 50,
+   "baseWeaponMass_tons": 150,
    "cooldown_s": 15,
-   "salvo_shots": null,
-   "intraSalvoCooldown_s": null,
    "efficiency": 0.35,
    "flatChipping": 0.35,
-   "magazine": 200,
-   "ammoMass_kg": 30,
-   "muzzleVelocity_kps": 5.18,
-   "warheadMass_kg": 26.25,
-   "bombardmentValue": 4,
-   "targetingRange_km": 650,
+   "magazine": 240,
+   "ammoMass_kg": 90,
+   "muzzleVelocity_kps": 7.125,
+   "warheadMass_kg": 78.75,
+   "bombardmentValue": 5,
+   "targetingRange_km": 900,
    "pivotRange_deg": 30,
    "isPointDefenseTargetable": true,
    "weightedBuildMaterials": {
       "volatiles": 0.3,
       "metals": 0.5,
-      "nobleMetals": 0.2,
-      "exotics": null
+      "nobleMetals": 0.2
    },
    "ammoMaterials": {
       "volatiles": 0.1,
       "metals": 0.5,
-      "nobleMetals": 0.4,
-      "exotics": ""
+      "nobleMetals": 0.4
    },
-   "iconResource": "shipbuildericons/ICO_LightRailCannonMk3",
-   "modelResource": "shipweapons/small_railgun_cannon",
+   "iconResource": "shipbuildericons/ICO_HeavyRailCannonMk3",
+   "modelResource": "shipweapons/large_railgun_cannon",
    "shotModelResource": "spaceCombat/BulletRail",
    "impactVisualFXResource": "spaceCombat/ImpactOrange",
    "fireSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_RailGun_Cannon",
    "impactSoundFXResource": "event:/SFX/Game_SFX/Ship_Fire_Impacts/trig_SFX_BlasterLongLoudMid017MonoRR"
 },
  {
-   "dataName": "RailCannonMk3",
-   "friendlyName": "Rail Cannon Mk3",
-   "mount": "TwoNoseVert",
-   "crew": 5,
+   "dataName": "SpinalRailgunMk1",
+   "friendlyName": "Spinal Railgun Mk1",
+   "mount": "FourNose",
+   "crew": 6,
    "sort": 19,
-   "requiredProjectName": "Project_RailCannonMk3",
+   "requiredProjectName": "Project_RailCannonMk1",
    "attackMode": true,
    "defenseMode": false,
-   "baseWeaponMass_tons": 100,
-   "cooldown_s": 18,
-   "salvo_shots": null,
-   "intraSalvoCooldown_s": null,
-   "efficiency": 0.35,
+   "baseWeaponMass_tons": 240,
+   "cooldown_s": 45,
+   "efficiency": 0.25,
    "flatChipping": 0.35,
-   "magazine": 240,
-   "ammoMass_kg": 60,
-   "muzzleVelocity_kps": 6.48,
-   "warheadMass_kg": 52.5,
-   "bombardmentValue": 5,
-   "targetingRange_km": 800,
+   "magazine": 300,
+   "ammoMass_kg": 120,
+   "muzzleVelocity_kps": 5.18,
+   "warheadMass_kg": 90,
+   "bombardmentValue": 4,
+   "targetingRange_km": 900,
    "pivotRange_deg": 30,
    "isPointDefenseTargetable": true,
    "weightedBuildMaterials": {
       "volatiles": 0.3,
       "metals": 0.5,
-      "nobleMetals": 0.2,
-      "exotics": null
+      "nobleMetals": 0.2
    },
    "ammoMaterials": {
       "volatiles": 0.1,
       "metals": 0.5,
-      "nobleMetals": 0.4,
-      "exotics": ""
+      "nobleMetals": 0.4
    },
-   "iconResource": "shipbuildericons/ICO_RailCannonMk3",
-   "modelResource": "shipweapons/medium_railgun_cannon",
+   "iconResource": "shipbuildericons/ICO_SpinalRailgunMk1",
+   "modelResource": "shipweapons/huge_railgun_cannon",
    "shotModelResource": "spaceCombat/BulletRail",
    "impactVisualFXResource": "spaceCombat/ImpactOrange",
    "fireSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_RailGun_Cannon",
    "impactSoundFXResource": "event:/SFX/Game_SFX/Ship_Fire_Impacts/trig_SFX_BlasterLongLoudMid017MonoRR"
 },
  {
-   "dataName": "HeavyRailCannonMk3",
-   "friendlyName": "Heavy Rail Cannon Mk3",
-   "mount": "ThreeNoseAngle",
+   "dataName": "SpinalRailgunMk2",
+   "friendlyName": "Spinal Railgun Mk2",
+   "mount": "FourNose",
    "crew": 6,
    "sort": 20,
-   "requiredProjectName": "Project_HeavyRailCannonMk3",
+   "requiredProjectName": "Project_RailCannonMk2",
    "attackMode": true,
    "defenseMode": false,
-   "baseWeaponMass_tons": 150,
-   "cooldown_s": 27,
-   "salvo_shots": null,
-   "intraSalvoCooldown_s": null,
-   "efficiency": 0.35,
+   "baseWeaponMass_tons": 220,
+   "cooldown_s": 30,
+   "efficiency": 0.3,
    "flatChipping": 0.35,
-   "magazine": 240,
-   "ammoMass_kg": 90,
-   "muzzleVelocity_kps": 7.125,
-   "warheadMass_kg": 78.75,
+   "magazine": 300,
+   "ammoMass_kg": 120,
+   "muzzleVelocity_kps": 6.48,
+   "warheadMass_kg": 96,
    "bombardmentValue": 5,
-   "targetingRange_km": 900,
+   "targetingRange_km": 950,
    "pivotRange_deg": 30,
    "isPointDefenseTargetable": true,
    "weightedBuildMaterials": {
       "volatiles": 0.3,
       "metals": 0.5,
-      "nobleMetals": 0.2,
-      "exotics": null
+      "nobleMetals": 0.2
    },
    "ammoMaterials": {
       "volatiles": 0.1,
       "metals": 0.5,
-      "nobleMetals": 0.4,
-      "exotics": ""
+      "nobleMetals": 0.4
    },
-   "iconResource": "shipbuildericons/ICO_HeavyRailCannonMk3",
-   "modelResource": "shipweapons/large_railgun_cannon",
+   "iconResource": "shipbuildericons/ICO_SpinalRailgunMk2",
+   "modelResource": "shipweapons/huge_railgun_cannon",
    "shotModelResource": "spaceCombat/BulletRail",
    "impactVisualFXResource": "spaceCombat/ImpactOrange",
    "fireSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_RailGun_Cannon",
@@ -845,13 +765,11 @@
    "mount": "FourNose",
    "crew": 6,
    "sort": 21,
-   "requiredProjectName": "Project_SpinalRailgunMk3",
+   "requiredProjectName": "Project_RailCannonMk3",
    "attackMode": true,
    "defenseMode": false,
    "baseWeaponMass_tons": 200,
-   "cooldown_s": 36,
-   "salvo_shots": null,
-   "intraSalvoCooldown_s": null,
+   "cooldown_s": 15,
    "efficiency": 0.35,
    "flatChipping": 0.35,
    "magazine": 300,
@@ -865,14 +783,12 @@
    "weightedBuildMaterials": {
       "volatiles": 0.3,
       "metals": 0.5,
-      "nobleMetals": 0.2,
-      "exotics": null
+      "nobleMetals": 0.2
    },
    "ammoMaterials": {
       "volatiles": 0.1,
       "metals": 0.5,
-      "nobleMetals": 0.4,
-      "exotics": ""
+      "nobleMetals": 0.4
    },
    "iconResource": "shipbuildericons/ICO_SpinalRailgunMk3",
    "modelResource": "shipweapons/huge_railgun_cannon",
@@ -887,7 +803,7 @@
    "mount": "OneHull",
    "crew": 3,
    "sort": 22,
-   "requiredProjectName": "Project_LightCoilgunBatteryMk1",
+   "requiredProjectName": "Project_CoilgunBatteryMk1",
    "attackMode": true,
    "defenseMode": true,
    "baseWeaponMass_tons": 50,
@@ -907,14 +823,12 @@
    "weightedBuildMaterials": {
       "volatiles": 0.3,
       "metals": 0.35,
-      "nobleMetals": 0.35,
-      "exotics": null
+      "nobleMetals": 0.35
    },
    "ammoMaterials": {
       "volatiles": 0.1,
       "metals": 0.4,
-      "nobleMetals": 0.5,
-      "exotics": ""
+      "nobleMetals": 0.5
    },
    "iconResource": "shipbuildericons/ICO_LightCoilgunBatteryMk1",
    "modelResource": "shipweapons/small_coilgun_battery",
@@ -924,126 +838,121 @@
    "impactSoundFXResource": "event:/SFX/Game_SFX/Ship_Fire_Impacts/trig_SFX_BlasterLongLoudMid012MonoRR"
 },
  {
-   "dataName": "CoilgunBatteryMk1",
-   "friendlyName": "Coilgun Battery Mk1",
-   "mount": "TwoHullHoriz",
-   "crew": 4,
+   "dataName": "LightCoilgunBatteryMk2",
+   "friendlyName": "Light Coilgun Battery Mk2",
+   "mount": "OneHull",
+   "crew": 3,
    "sort": 23,
-   "requiredProjectName": "Project_CoilgunBatteryMk1",
+   "requiredProjectName": "Project_CoilgunBatteryMk2",
    "attackMode": true,
-   "defenseMode": false,
-   "baseWeaponMass_tons": 100,
-   "cooldown_s": 48,
-   "salvo_shots": 3,
-   "intraSalvoCooldown_s": 12,
-   "efficiency": 0.5,
+   "defenseMode": true,
+   "baseWeaponMass_tons": 45,
+   "cooldown_s": 30,
+   "salvo_shots": 4,
+   "intraSalvoCooldown_s": 10,
+   "efficiency": 0.6,
    "flatChipping": 0.25,
-   "magazine": 1800,
-   "ammoMass_kg": 20,
+   "magazine": 1500,
+   "ammoMass_kg": 10,
    "muzzleVelocity_kps": 5.4,
-   "warheadMass_kg": 15,
+   "warheadMass_kg": 8,
    "bombardmentValue": 3,
-   "targetingRange_km": 650,
+   "targetingRange_km": 550,
    "pivotRange_deg": 180,
    "isPointDefenseTargetable": true,
    "weightedBuildMaterials": {
       "volatiles": 0.3,
       "metals": 0.35,
-      "nobleMetals": 0.35,
-      "exotics": null
+      "nobleMetals": 0.35
    },
    "ammoMaterials": {
       "volatiles": 0.1,
       "metals": 0.4,
-      "nobleMetals": 0.5,
-      "exotics": ""
+      "nobleMetals": 0.5
    },
-   "iconResource": "shipbuildericons/ICO_CoilgunBatteryMk1",
-   "modelResource": "shipweapons/medium_coilgun_battery",
+   "iconResource": "shipbuildericons/ICO_LightCoilgunBatteryMk2",
+   "modelResource": "shipweapons/small_coilgun_battery",
    "shotModelResource": "spaceCombat/BulletCoil",
    "impactVisualFXResource": "spaceCombat/ImpactWhite",
    "fireSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_CoilGun_Turret",
    "impactSoundFXResource": "event:/SFX/Game_SFX/Ship_Fire_Impacts/trig_SFX_BlasterLongLoudMid012MonoRR"
 },
  {
-   "dataName": "HeavyCoilgunBatteryMk1",
-   "friendlyName": "Heavy Coilgun Battery Mk1",
-   "mount": "FourHull",
-   "crew": 5,
+   "dataName": "LightCoilgunBatteryMk3",
+   "friendlyName": "Light Coilgun Battery Mk3",
+   "mount": "OneHull",
+   "crew": 3,
    "sort": 24,
-   "requiredProjectName": "Project_HeavyCoilgunBatteryMk1",
+   "requiredProjectName": "Project_CoilgunBatteryMk3",
    "attackMode": true,
-   "defenseMode": false,
-   "baseWeaponMass_tons": 200,
-   "cooldown_s": 57.6,
-   "salvo_shots": 3,
-   "intraSalvoCooldown_s": 14.4,
-   "efficiency": 0.5,
+   "defenseMode": true,
+   "baseWeaponMass_tons": 40,
+   "cooldown_s": 20,
+   "salvo_shots": 5,
+   "intraSalvoCooldown_s": 10,
+   "efficiency": 0.7,
    "flatChipping": 0.25,
-   "magazine": 2160,
-   "ammoMass_kg": 40,
+   "magazine": 1500,
+   "ammoMass_kg": 10,
    "muzzleVelocity_kps": 6.3,
-   "warheadMass_kg": 30,
+   "warheadMass_kg": 8.75,
    "bombardmentValue": 4,
-   "targetingRange_km": 800,
+   "targetingRange_km": 600,
    "pivotRange_deg": 180,
    "isPointDefenseTargetable": true,
    "weightedBuildMaterials": {
       "volatiles": 0.3,
       "metals": 0.35,
-      "nobleMetals": 0.35,
-      "exotics": null
+      "nobleMetals": 0.34,
+      "exotics": 0.01
    },
    "ammoMaterials": {
       "volatiles": 0.1,
       "metals": 0.4,
-      "nobleMetals": 0.5,
-      "exotics": ""
+      "nobleMetals": 0.5
    },
-   "iconResource": "shipbuildericons/ICO_HeavyCoilgunBatteryMk1",
-   "modelResource": "shipweapons/large_coilgun_battery",
+   "iconResource": "shipbuildericons/ICO_LightCoilgunBatteryMk3",
+   "modelResource": "shipweapons/small_coilgun_battery",
    "shotModelResource": "spaceCombat/BulletCoil",
    "impactVisualFXResource": "spaceCombat/ImpactWhite",
    "fireSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_CoilGun_Turret",
    "impactSoundFXResource": "event:/SFX/Game_SFX/Ship_Fire_Impacts/trig_SFX_BlasterLongLoudMid012MonoRR"
 },
  {
-   "dataName": "LightCoilgunBatteryMk2",
-   "friendlyName": "Light Coilgun Battery Mk2",
-   "mount": "OneHull",
-   "crew": 3,
+   "dataName": "CoilgunBatteryMk1",
+   "friendlyName": "Coilgun Battery Mk1",
+   "mount": "TwoHullHoriz",
+   "crew": 4,
    "sort": 25,
-   "requiredProjectName": "Project_LightCoilgunBatteryMk2",
+   "requiredProjectName": "Project_CoilgunBatteryMk1",
    "attackMode": true,
-   "defenseMode": true,
-   "baseWeaponMass_tons": 45,
-   "cooldown_s": 30,
-   "salvo_shots": 4,
+   "defenseMode": false,
+   "baseWeaponMass_tons": 100,
+   "cooldown_s": 40,
+   "salvo_shots": 3,
    "intraSalvoCooldown_s": 10,
-   "efficiency": 0.6,
+   "efficiency": 0.5,
    "flatChipping": 0.25,
-   "magazine": 1500,
-   "ammoMass_kg": 10,
+   "magazine": 1800,
+   "ammoMass_kg": 20,
    "muzzleVelocity_kps": 5.4,
-   "warheadMass_kg": 8,
+   "warheadMass_kg": 15,
    "bombardmentValue": 3,
-   "targetingRange_km": 550,
+   "targetingRange_km": 650,
    "pivotRange_deg": 180,
    "isPointDefenseTargetable": true,
    "weightedBuildMaterials": {
       "volatiles": 0.3,
       "metals": 0.35,
-      "nobleMetals": 0.35,
-      "exotics": null
+      "nobleMetals": 0.35
    },
    "ammoMaterials": {
       "volatiles": 0.1,
       "metals": 0.4,
-      "nobleMetals": 0.5,
-      "exotics": ""
+      "nobleMetals": 0.5
    },
-   "iconResource": "shipbuildericons/ICO_LightCoilgunBatteryMk2",
-   "modelResource": "shipweapons/small_coilgun_battery",
+   "iconResource": "shipbuildericons/ICO_CoilgunBatteryMk1",
+   "modelResource": "shipweapons/medium_coilgun_battery",
    "shotModelResource": "spaceCombat/BulletCoil",
    "impactVisualFXResource": "spaceCombat/ImpactWhite",
    "fireSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_CoilGun_Turret",
@@ -1059,9 +968,9 @@
    "attackMode": true,
    "defenseMode": false,
    "baseWeaponMass_tons": 90,
-   "cooldown_s": 36,
+   "cooldown_s": 30,
    "salvo_shots": 4,
-   "intraSalvoCooldown_s": 12,
+   "intraSalvoCooldown_s": 10,
    "efficiency": 0.6,
    "flatChipping": 0.25,
    "magazine": 1800,
@@ -1075,14 +984,12 @@
    "weightedBuildMaterials": {
       "volatiles": 0.3,
       "metals": 0.35,
-      "nobleMetals": 0.35,
-      "exotics": null
+      "nobleMetals": 0.35
    },
    "ammoMaterials": {
       "volatiles": 0.1,
       "metals": 0.4,
-      "nobleMetals": 0.5,
-      "exotics": ""
+      "nobleMetals": 0.5
    },
    "iconResource": "shipbuildericons/ICO_CoilgunBatteryMk2",
    "modelResource": "shipweapons/medium_coilgun_battery",
@@ -1092,126 +999,121 @@
    "impactSoundFXResource": "event:/SFX/Game_SFX/Ship_Fire_Impacts/trig_SFX_BlasterLongLoudMid012MonoRR"
 },
  {
-   "dataName": "HeavyCoilgunBatteryMk2",
-   "friendlyName": "Heavy Coilgun Battery Mk2",
-   "mount": "FourHull",
-   "crew": 5,
+   "dataName": "CoilgunBatteryMk3",
+   "friendlyName": "Coilgun Battery Mk3",
+   "mount": "TwoHullHoriz",
+   "crew": 4,
    "sort": 27,
-   "requiredProjectName": "Project_HeavyCoilgunBatteryMk2",
+   "requiredProjectName": "Project_CoilgunBatteryMk3",
    "attackMode": true,
    "defenseMode": false,
-   "baseWeaponMass_tons": 180,
-   "cooldown_s": 43.2,
-   "salvo_shots": 4,
-   "intraSalvoCooldown_s": 14.4,
-   "efficiency": 0.6,
+   "baseWeaponMass_tons": 80,
+   "cooldown_s": 20,
+   "salvo_shots": 5,
+   "intraSalvoCooldown_s": 10,
+   "efficiency": 0.7,
    "flatChipping": 0.25,
-   "magazine": 2160,
-   "ammoMass_kg": 40,
+   "magazine": 1800,
+   "ammoMass_kg": 20,
    "muzzleVelocity_kps": 7.2,
-   "warheadMass_kg": 32,
+   "warheadMass_kg": 17.5,
    "bombardmentValue": 5,
-   "targetingRange_km": 850,
+   "targetingRange_km": 750,
    "pivotRange_deg": 180,
    "isPointDefenseTargetable": true,
    "weightedBuildMaterials": {
       "volatiles": 0.3,
       "metals": 0.35,
-      "nobleMetals": 0.35,
-      "exotics": null
+      "nobleMetals": 0.33,
+      "exotics": 0.02
    },
    "ammoMaterials": {
       "volatiles": 0.1,
       "metals": 0.4,
-      "nobleMetals": 0.5,
-      "exotics": ""
+      "nobleMetals": 0.5
    },
-   "iconResource": "shipbuildericons/ICO_HeavyCoilgunBatteryMk2",
-   "modelResource": "shipweapons/large_coilgun_battery",
+   "iconResource": "shipbuildericons/ICO_CoilgunBatteryMk3",
+   "modelResource": "shipweapons/medium_coilgun_battery",
    "shotModelResource": "spaceCombat/BulletCoil",
    "impactVisualFXResource": "spaceCombat/ImpactWhite",
    "fireSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_CoilGun_Turret",
    "impactSoundFXResource": "event:/SFX/Game_SFX/Ship_Fire_Impacts/trig_SFX_BlasterLongLoudMid012MonoRR"
 },
  {
-   "dataName": "LightCoilgunBatteryMk3",
-   "friendlyName": "Light Coilgun Battery Mk3",
-   "mount": "OneHull",
-   "crew": 3,
+   "dataName": "HeavyCoilgunBatteryMk1",
+   "friendlyName": "Heavy Coilgun Battery Mk1",
+   "mount": "FourHull",
+   "crew": 5,
    "sort": 28,
-   "requiredProjectName": "Project_LightCoilgunBatteryMk3",
+   "requiredProjectName": "Project_CoilgunBatteryMk1",
    "attackMode": true,
-   "defenseMode": true,
-   "baseWeaponMass_tons": 40,
-   "cooldown_s": 20,
-   "salvo_shots": 5,
+   "defenseMode": false,
+   "baseWeaponMass_tons": 200,
+   "cooldown_s": 40,
+   "salvo_shots": 3,
    "intraSalvoCooldown_s": 10,
-   "efficiency": 0.7,
+   "efficiency": 0.5,
    "flatChipping": 0.25,
-   "magazine": 1500,
-   "ammoMass_kg": 10,
+   "magazine": 2160,
+   "ammoMass_kg": 40,
    "muzzleVelocity_kps": 6.3,
-   "warheadMass_kg": 8.75,
+   "warheadMass_kg": 30,
    "bombardmentValue": 4,
-   "targetingRange_km": 600,
+   "targetingRange_km": 800,
    "pivotRange_deg": 180,
    "isPointDefenseTargetable": true,
    "weightedBuildMaterials": {
       "volatiles": 0.3,
       "metals": 0.35,
-      "nobleMetals": 0.34,
-      "exotics": 0.01
+      "nobleMetals": 0.35
    },
    "ammoMaterials": {
       "volatiles": 0.1,
       "metals": 0.4,
-      "nobleMetals": 0.5,
-      "exotics": ""
+      "nobleMetals": 0.5
    },
-   "iconResource": "shipbuildericons/ICO_LightCoilgunBatteryMk3",
-   "modelResource": "shipweapons/small_coilgun_battery",
+   "iconResource": "shipbuildericons/ICO_HeavyCoilgunBatteryMk1",
+   "modelResource": "shipweapons/large_coilgun_battery",
    "shotModelResource": "spaceCombat/BulletCoil",
    "impactVisualFXResource": "spaceCombat/ImpactWhite",
    "fireSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_CoilGun_Turret",
    "impactSoundFXResource": "event:/SFX/Game_SFX/Ship_Fire_Impacts/trig_SFX_BlasterLongLoudMid012MonoRR"
 },
  {
-   "dataName": "CoilgunBatteryMk3",
-   "friendlyName": "Coilgun Battery Mk3",
-   "mount": "TwoHullHoriz",
-   "crew": 4,
+   "dataName": "HeavyCoilgunBatteryMk2",
+   "friendlyName": "Heavy Coilgun Battery Mk2",
+   "mount": "FourHull",
+   "crew": 5,
    "sort": 29,
-   "requiredProjectName": "Project_CoilgunBatteryMk3",
+   "requiredProjectName": "Project_CoilgunBatteryMk2",
    "attackMode": true,
    "defenseMode": false,
-   "baseWeaponMass_tons": 80,
-   "cooldown_s": 24,
-   "salvo_shots": 5,
-   "intraSalvoCooldown_s": 12,
-   "efficiency": 0.7,
+   "baseWeaponMass_tons": 180,
+   "cooldown_s": 30,
+   "salvo_shots": 4,
+   "intraSalvoCooldown_s": 10,
+   "efficiency": 0.6,
    "flatChipping": 0.25,
-   "magazine": 1800,
-   "ammoMass_kg": 20,
+   "magazine": 2160,
+   "ammoMass_kg": 40,
    "muzzleVelocity_kps": 7.2,
-   "warheadMass_kg": 17.5,
+   "warheadMass_kg": 32,
    "bombardmentValue": 5,
-   "targetingRange_km": 750,
+   "targetingRange_km": 850,
    "pivotRange_deg": 180,
    "isPointDefenseTargetable": true,
    "weightedBuildMaterials": {
       "volatiles": 0.3,
       "metals": 0.35,
-      "nobleMetals": 0.33,
-      "exotics": 0.02
+      "nobleMetals": 0.35
    },
    "ammoMaterials": {
       "volatiles": 0.1,
       "metals": 0.4,
-      "nobleMetals": 0.5,
-      "exotics": ""
+      "nobleMetals": 0.5
    },
-   "iconResource": "shipbuildericons/ICO_CoilgunBatteryMk3",
-   "modelResource": "shipweapons/medium_coilgun_battery",
+   "iconResource": "shipbuildericons/ICO_HeavyCoilgunBatteryMk2",
+   "modelResource": "shipweapons/large_coilgun_battery",
    "shotModelResource": "spaceCombat/BulletCoil",
    "impactVisualFXResource": "spaceCombat/ImpactWhite",
    "fireSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_CoilGun_Turret",
@@ -1223,13 +1125,13 @@
    "mount": "FourHull",
    "crew": 5,
    "sort": 30,
-   "requiredProjectName": "Project_HeavyCoilgunBatteryMk3",
+   "requiredProjectName": "Project_CoilgunBatteryMk3",
    "attackMode": true,
    "defenseMode": false,
    "baseWeaponMass_tons": 160,
-   "cooldown_s": 28.8,
+   "cooldown_s": 20,
    "salvo_shots": 5,
-   "intraSalvoCooldown_s": 14.4,
+   "intraSalvoCooldown_s": 10,
    "efficiency": 0.7,
    "flatChipping": 0.25,
    "magazine": 2160,
@@ -1249,8 +1151,7 @@
    "ammoMaterials": {
       "volatiles": 0.1,
       "metals": 0.4,
-      "nobleMetals": 0.5,
-      "exotics": ""
+      "nobleMetals": 0.5
    },
    "iconResource": "shipbuildericons/ICO_HeavyCoilgunBatteryMk3",
    "modelResource": "shipweapons/large_coilgun_battery",
@@ -1265,13 +1166,13 @@
    "mount": "OneNose",
    "crew": 4,
    "sort": 31,
-   "requiredProjectName": "Project_LightCoilCannonMk1",
+   "requiredProjectName": "Project_CoilCannonMk1",
    "attackMode": true,
    "defenseMode": false,
    "baseWeaponMass_tons": 60,
-   "cooldown_s": 40,
+   "cooldown_s": 48,
    "salvo_shots": 3,
-   "intraSalvoCooldown_s": 10,
+   "intraSalvoCooldown_s": 12,
    "efficiency": 0.5,
    "flatChipping": 0.35,
    "magazine": 300,
@@ -1285,14 +1186,12 @@
    "weightedBuildMaterials": {
       "volatiles": 0.3,
       "metals": 0.35,
-      "nobleMetals": 0.35,
-      "exotics": null
+      "nobleMetals": 0.35
    },
    "ammoMaterials": {
       "volatiles": 0.1,
       "metals": 0.4,
-      "nobleMetals": 0.5,
-      "exotics": ""
+      "nobleMetals": 0.5
    },
    "iconResource": "shipbuildericons/ICO_LightCoilCannonMk1",
    "modelResource": "shipweapons/small_coilgun_cannon",
@@ -1300,13 +1199,94 @@
    "impactVisualFXResource": "spaceCombat/ImpactWhite",
    "fireSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_CoilGun_Cannon",
    "impactSoundFXResource": "event:/SFX/Game_SFX/Ship_Fire_Impacts/trig_SFX_BlasterLongLoudMid019MonoRR"
+},
+ {
+   "dataName": "LightCoilCannonMk2",
+   "friendlyName": "Light Coil Cannon Mk2",
+   "mount": "OneNose",
+   "crew": 4,
+   "sort": 32,
+   "requiredProjectName": "Project_CoilCannonMk2",
+   "attackMode": true,
+   "defenseMode": false,
+   "baseWeaponMass_tons": 55,
+   "cooldown_s": 36,
+   "salvo_shots": 4,
+   "intraSalvoCooldown_s": 12,
+   "efficiency": 0.6,
+   "flatChipping": 0.35,
+   "magazine": 300,
+   "ammoMass_kg": 25,
+   "muzzleVelocity_kps": 6.3,
+   "warheadMass_kg": 20,
+   "bombardmentValue": 4,
+   "targetingRange_km": 600,
+   "pivotRange_deg": 30,
+   "isPointDefenseTargetable": true,
+   "weightedBuildMaterials": {
+      "volatiles": 0.3,
+      "metals": 0.35,
+      "nobleMetals": 0.35
+   },
+   "ammoMaterials": {
+      "volatiles": 0.1,
+      "metals": 0.4,
+      "nobleMetals": 0.5
+   },
+   "iconResource": "shipbuildericons/ICO_LightCoilCannonMk2",
+   "modelResource": "shipweapons/small_coilgun_cannon",
+   "shotModelResource": "spaceCombat/BulletCoil",
+   "impactVisualFXResource": "spaceCombat/ImpactWhite",
+   "fireSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_CoilGun_Cannon",
+   "impactSoundFXResource": "event:/SFX/Game_SFX/Ship_Fire_Impacts/trig_SFX_BlasterLongLoudMid019MonoRR"
+},
+ {
+   "dataName": "LightCoilCannonMk3",
+   "friendlyName": "Light Coil Cannon Mk3",
+   "mount": "OneNose",
+   "crew": 4,
+   "sort": 33,
+   "requiredProjectName": "Project_CoilCannonMk3",
+   "attackMode": true,
+   "defenseMode": false,
+   "baseWeaponMass_tons": 50,
+   "cooldown_s": 24,
+   "salvo_shots": 5,
+   "intraSalvoCooldown_s": 12,
+   "efficiency": 0.7,
+   "flatChipping": 0.35,
+   "magazine": 300,
+   "ammoMass_kg": 25,
+   "muzzleVelocity_kps": 8.1,
+   "warheadMass_kg": 21.875,
+   "bombardmentValue": 5,
+   "targetingRange_km": 650,
+   "pivotRange_deg": 30,
+   "isPointDefenseTargetable": true,
+   "weightedBuildMaterials": {
+      "volatiles": 0.3,
+      "metals": 0.35,
+      "nobleMetals": 0.33,
+      "exotics": 0.02
+   },
+   "ammoMaterials": {
+      "volatiles": 0.1,
+      "metals": 0.4,
+      "nobleMetals": 0.5
+   },
+   "iconResource": "shipbuildericons/ICO_LightCoilCannonMk3",
+   "modelResource": "shipweapons/small_coilgun_cannon",
+   "shotModelResource": "spaceCombat/BulletCoil",
+   "impactVisualFXResource": "spaceCombat/ImpactWhite",
+   "fireSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_CoilGun_Cannon",
+   "impactSoundFXResource": "event:/SFX/Game_SFX/Ship_Fire_Impacts/trig_SFX_BlasterLongLoudMid019MonoRR"
 },
  {
    "dataName": "CoilCannonMk1",
    "friendlyName": "Coil Cannon Mk1",
    "mount": "TwoNoseVert",
    "crew": 5,
-   "sort": 32,
+   "sort": 34,
    "requiredProjectName": "Project_CoilCannonMk1",
    "attackMode": true,
    "defenseMode": false,
@@ -1327,14 +1307,12 @@
    "weightedBuildMaterials": {
       "volatiles": 0.3,
       "metals": 0.35,
-      "nobleMetals": 0.35,
-      "exotics": null
+      "nobleMetals": 0.35
    },
    "ammoMaterials": {
       "volatiles": 0.1,
       "metals": 0.4,
-      "nobleMetals": 0.5,
-      "exotics": ""
+      "nobleMetals": 0.5
    },
    "iconResource": "shipbuildericons/ICO_CoilCannonMk1",
    "modelResource": "shipweapons/medium_coilgun_cannon",
@@ -1342,25 +1320,106 @@
    "impactVisualFXResource": "spaceCombat/ImpactWhite",
    "fireSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_CoilGun_Cannon",
    "impactSoundFXResource": "event:/SFX/Game_SFX/Ship_Fire_Impacts/trig_SFX_BlasterLongLoudMid019MonoRR"
+},
+ {
+   "dataName": "CoilCannonMk2",
+   "friendlyName": "Coil Cannon Mk2",
+   "mount": "TwoNoseVert",
+   "crew": 5,
+   "sort": 35,
+   "requiredProjectName": "Project_CoilCannonMk2",
+   "attackMode": true,
+   "defenseMode": false,
+   "baseWeaponMass_tons": 110,
+   "cooldown_s": 36,
+   "salvo_shots": 4,
+   "intraSalvoCooldown_s": 12,
+   "efficiency": 0.6,
+   "flatChipping": 0.35,
+   "magazine": 360,
+   "ammoMass_kg": 50,
+   "muzzleVelocity_kps": 7.2,
+   "warheadMass_kg": 40,
+   "bombardmentValue": 5,
+   "targetingRange_km": 750,
+   "pivotRange_deg": 30,
+   "isPointDefenseTargetable": true,
+   "weightedBuildMaterials": {
+      "volatiles": 0.3,
+      "metals": 0.35,
+      "nobleMetals": 0.35
+   },
+   "ammoMaterials": {
+      "volatiles": 0.1,
+      "metals": 0.4,
+      "nobleMetals": 0.5
+   },
+   "iconResource": "shipbuildericons/ICO_CoilCannonMk2",
+   "modelResource": "shipweapons/medium_coilgun_cannon",
+   "shotModelResource": "spaceCombat/BulletCoil",
+   "impactVisualFXResource": "spaceCombat/ImpactWhite",
+   "fireSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_CoilGun_Cannon",
+   "impactSoundFXResource": "event:/SFX/Game_SFX/Ship_Fire_Impacts/trig_SFX_BlasterLongLoudMid019MonoRR"
+},
+ {
+   "dataName": "CoilCannonMk3",
+   "friendlyName": "Coil Cannon Mk3",
+   "mount": "TwoNoseVert",
+   "crew": 5,
+   "sort": 36,
+   "requiredProjectName": "Project_CoilCannonMk3",
+   "attackMode": true,
+   "defenseMode": false,
+   "baseWeaponMass_tons": 100,
+   "cooldown_s": 24,
+   "salvo_shots": 5,
+   "intraSalvoCooldown_s": 12,
+   "efficiency": 0.7,
+   "flatChipping": 0.35,
+   "magazine": 360,
+   "ammoMass_kg": 50,
+   "muzzleVelocity_kps": 9,
+   "warheadMass_kg": 43.75,
+   "bombardmentValue": 6,
+   "targetingRange_km": 800,
+   "pivotRange_deg": 30,
+   "isPointDefenseTargetable": true,
+   "weightedBuildMaterials": {
+      "volatiles": 0.3,
+      "metals": 0.35,
+      "nobleMetals": 0.35,
+      "exotics": 0.02
+   },
+   "ammoMaterials": {
+      "volatiles": 0.1,
+      "metals": 0.4,
+      "nobleMetals": 0.5
+   },
+   "iconResource": "shipbuildericons/ICO_CoilCannonMk3",
+   "modelResource": "shipweapons/medium_coilgun_cannon",
+   "shotModelResource": "spaceCombat/BulletCoil",
+   "impactVisualFXResource": "spaceCombat/ImpactWhite",
+   "fireSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_CoilGun_Cannon",
+   "impactSoundFXResource": "event:/SFX/Game_SFX/Ship_Fire_Impacts/trig_SFX_BlasterLongLoudMid019MonoRR"
 },
  {
    "dataName": "HeavyCoilCannonMk1",
    "friendlyName": "Heavy Coil Cannon Mk1",
    "mount": "ThreeNoseAngle",
    "crew": 6,
-   "sort": 33,
-   "requiredProjectName": "Project_HeavyCoilCannonMk1",
+   "sort": 37,
+   "requiredProjectName": "Project_CoilCannonMk1",
    "attackMode": true,
    "defenseMode": false,
    "baseWeaponMass_tons": 180,
-   "cooldown_s": 72,
+   "cooldown_s": 48,
    "salvo_shots": 3,
-   "intraSalvoCooldown_s": 18,
+   "intraSalvoCooldown_s": 12,
    "efficiency": 0.5,
    "flatChipping": 0.35,
    "magazine": 360,
    "ammoMass_kg": 75,
-   "muzzleVelocity_kps": 6.75,
+   "muzzleVelocity_kps": 6.8,
    "warheadMass_kg": 56.25,
    "bombardmentValue": 5,
    "targetingRange_km": 800,
@@ -1369,14 +1428,12 @@
    "weightedBuildMaterials": {
       "volatiles": 0.3,
       "metals": 0.35,
-      "nobleMetals": 0.35,
-      "exotics": null
+      "nobleMetals": 0.35
    },
    "ammoMaterials": {
       "volatiles": 0.1,
       "metals": 0.4,
-      "nobleMetals": 0.5,
-      "exotics": ""
+      "nobleMetals": 0.5
    },
    "iconResource": "shipbuildericons/ICO_HeavyCoilCannonMk1",
    "modelResource": "shipweapons/large_coilgun_cannon",
@@ -1384,20 +1441,101 @@
    "impactVisualFXResource": "spaceCombat/ImpactWhite",
    "fireSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_CoilGun_Cannon",
    "impactSoundFXResource": "event:/SFX/Game_SFX/Ship_Fire_Impacts/trig_SFX_BlasterLongLoudMid019MonoRR"
+},
+ {
+   "dataName": "HeavyCoilCannonMk2",
+   "friendlyName": "Heavy Coil Cannon Mk2",
+   "mount": "ThreeNoseAngle",
+   "crew": 6,
+   "sort": 38,
+   "requiredProjectName": "Project_CoilCannonMk2",
+   "attackMode": true,
+   "defenseMode": false,
+   "baseWeaponMass_tons": 165,
+   "cooldown_s": 36,
+   "salvo_shots": 4,
+   "intraSalvoCooldown_s": 12,
+   "efficiency": 0.6,
+   "flatChipping": 0.35,
+   "magazine": 360,
+   "ammoMass_kg": 75,
+   "muzzleVelocity_kps": 7.7,
+   "warheadMass_kg": 60,
+   "bombardmentValue": 5,
+   "targetingRange_km": 850,
+   "pivotRange_deg": 30,
+   "isPointDefenseTargetable": true,
+   "weightedBuildMaterials": {
+      "volatiles": 0.3,
+      "metals": 0.35,
+      "nobleMetals": 0.35
+   },
+   "ammoMaterials": {
+      "volatiles": 0.1,
+      "metals": 0.4,
+      "nobleMetals": 0.5
+   },
+   "iconResource": "shipbuildericons/ICO_HeavyCoilCannonMk2",
+   "modelResource": "shipweapons/large_coilgun_cannon",
+   "shotModelResource": "spaceCombat/BulletCoil",
+   "impactVisualFXResource": "spaceCombat/ImpactWhite",
+   "fireSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_CoilGun_Cannon",
+   "impactSoundFXResource": "event:/SFX/Game_SFX/Ship_Fire_Impacts/trig_SFX_BlasterLongLoudMid019MonoRR"
+},
+ {
+   "dataName": "HeavyCoilCannonMk3",
+   "friendlyName": "Heavy Coil Cannon Mk3",
+   "mount": "ThreeNoseAngle",
+   "crew": 6,
+   "sort": 39,
+   "requiredProjectName": "Project_CoilCannonMk3",
+   "attackMode": true,
+   "defenseMode": false,
+   "baseWeaponMass_tons": 150,
+   "cooldown_s": 24,
+   "salvo_shots": 5,
+   "intraSalvoCooldown_s": 12,
+   "efficiency": 0.7,
+   "flatChipping": 0.35,
+   "magazine": 360,
+   "ammoMass_kg": 75,
+   "muzzleVelocity_kps": 9.5,
+   "warheadMass_kg": 65.625,
+   "bombardmentValue": 6,
+   "targetingRange_km": 900,
+   "pivotRange_deg": 30,
+   "isPointDefenseTargetable": true,
+   "weightedBuildMaterials": {
+      "volatiles": 0.3,
+      "metals": 0.35,
+      "nobleMetals": 0.35,
+      "exotics": 0.03
+   },
+   "ammoMaterials": {
+      "volatiles": 0.1,
+      "metals": 0.4,
+      "nobleMetals": 0.5
+   },
+   "iconResource": "shipbuildericons/ICO_HeavyCoilCannonMk3",
+   "modelResource": "shipweapons/large_coilgun_cannon",
+   "shotModelResource": "spaceCombat/BulletCoil",
+   "impactVisualFXResource": "spaceCombat/ImpactWhite",
+   "fireSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_CoilGun_Cannon",
+   "impactSoundFXResource": "event:/SFX/Game_SFX/Ship_Fire_Impacts/trig_SFX_BlasterLongLoudMid019MonoRR"
 },
  {
    "dataName": "SpinalCoilerMk1",
    "friendlyName": "Spinal Coiler Mk1",
    "mount": "FourNose",
    "crew": 6,
-   "sort": 34,
-   "requiredProjectName": "Project_SpinalCoilerMk1",
+   "sort": 40,
+   "requiredProjectName": "Project_CoilCannonMk1",
    "attackMode": true,
    "defenseMode": false,
    "baseWeaponMass_tons": 240,
-   "cooldown_s": 96,
+   "cooldown_s": 48,
    "salvo_shots": 3,
-   "intraSalvoCooldown_s": 24,
+   "intraSalvoCooldown_s": 12,
    "efficiency": 0.5,
    "flatChipping": 0.35,
    "magazine": 450,
@@ -1411,14 +1549,12 @@
    "weightedBuildMaterials": {
       "volatiles": 0.3,
       "metals": 0.35,
-      "nobleMetals": 0.35,
-      "exotics": null
+      "nobleMetals": 0.35
    },
    "ammoMaterials": {
       "volatiles": 0.1,
       "metals": 0.4,
-      "nobleMetals": 0.5,
-      "exotics": ""
+      "nobleMetals": 0.5
    },
    "iconResource": "shipbuildericons/ICO_SpinalCoilerMk1",
    "modelResource": "shipweapons/huge_coilgun_cannon",
@@ -1428,125 +1564,118 @@
    "impactSoundFXResource": "event:/SFX/Game_SFX/Ship_Fire_Impacts/trig_SFX_BlasterLongLoudMid019MonoRR"
 },
  {
-   "dataName": "LightCoilCannonMk2",
-   "friendlyName": "Light Coil Cannon Mk2",
-   "mount": "OneNose",
-   "crew": 4,
-   "sort": 35,
-   "requiredProjectName": "Project_LightCoilCannonMk2",
+   "dataName": "SpinalCoilerMk2",
+   "friendlyName": "Spinal Coiler Mk2",
+   "mount": "FourNose",
+   "crew": 6,
+   "sort": 41,
+   "requiredProjectName": "Project_CoilCannonMk2",
    "attackMode": true,
    "defenseMode": false,
-   "baseWeaponMass_tons": 55,
-   "cooldown_s": 30,
+   "baseWeaponMass_tons": 220,
+   "cooldown_s": 36,
    "salvo_shots": 4,
-   "intraSalvoCooldown_s": 10,
+   "intraSalvoCooldown_s": 12,
    "efficiency": 0.6,
    "flatChipping": 0.35,
-   "magazine": 300,
-   "ammoMass_kg": 25,
-   "muzzleVelocity_kps": 6.3,
-   "warheadMass_kg": 20,
-   "bombardmentValue": 4,
-   "targetingRange_km": 600,
+   "magazine": 450,
+   "ammoMass_kg": 100,
+   "muzzleVelocity_kps": 8.1,
+   "warheadMass_kg": 80,
+   "bombardmentValue": 6,
+   "targetingRange_km": 950,
    "pivotRange_deg": 30,
    "isPointDefenseTargetable": true,
    "weightedBuildMaterials": {
       "volatiles": 0.3,
       "metals": 0.35,
-      "nobleMetals": 0.35,
-      "exotics": null
+      "nobleMetals": 0.35
    },
    "ammoMaterials": {
       "volatiles": 0.1,
       "metals": 0.4,
-      "nobleMetals": 0.5,
-      "exotics": ""
+      "nobleMetals": 0.5
    },
-   "iconResource": "shipbuildericons/ICO_LightCoilCannonMk2",
-   "modelResource": "shipweapons/small_coilgun_cannon",
+   "iconResource": "shipbuildericons/ICO_SpinalCoilerMk2",
+   "modelResource": "shipweapons/huge_coilgun_cannon",
    "shotModelResource": "spaceCombat/BulletCoil",
    "impactVisualFXResource": "spaceCombat/ImpactWhite",
    "fireSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_CoilGun_Cannon",
    "impactSoundFXResource": "event:/SFX/Game_SFX/Ship_Fire_Impacts/trig_SFX_BlasterLongLoudMid019MonoRR"
 },
  {
-   "dataName": "CoilCannonMk2",
-   "friendlyName": "Coil Cannon Mk2",
-   "mount": "TwoNoseVert",
-   "crew": 5,
-   "sort": 36,
-   "requiredProjectName": "Project_CoilCannonMk2",
+   "dataName": "SpinalCoilerMk3",
+   "friendlyName": "Spinal Coiler Mk3",
+   "mount": "FourNose",
+   "crew": 6,
+   "sort": 42,
+   "requiredProjectName": "Project_CoilCannonMk3",
    "attackMode": true,
    "defenseMode": false,
-   "baseWeaponMass_tons": 110,
-   "cooldown_s": 36,
-   "salvo_shots": 4,
+   "baseWeaponMass_tons": 200,
+   "cooldown_s": 24,
+   "salvo_shots": 5,
    "intraSalvoCooldown_s": 12,
-   "efficiency": 0.6,
+   "efficiency": 0.7,
    "flatChipping": 0.35,
-   "magazine": 360,
-   "ammoMass_kg": 50,
-   "muzzleVelocity_kps": 7.2,
-   "warheadMass_kg": 40,
-   "bombardmentValue": 5,
-   "targetingRange_km": 750,
+   "magazine": 450,
+   "ammoMass_kg": 100,
+   "muzzleVelocity_kps": 9.9,
+   "warheadMass_kg": 87.5,
+   "bombardmentValue": 7,
+   "targetingRange_km": 1000,
    "pivotRange_deg": 30,
    "isPointDefenseTargetable": true,
    "weightedBuildMaterials": {
       "volatiles": 0.3,
       "metals": 0.35,
-      "nobleMetals": 0.35,
-      "exotics": null
+      "nobleMetals": 0.31,
+      "exotics": 0.04
    },
    "ammoMaterials": {
       "volatiles": 0.1,
       "metals": 0.4,
-      "nobleMetals": 0.5,
-      "exotics": ""
+      "nobleMetals": 0.5
    },
-   "iconResource": "shipbuildericons/ICO_CoilCannonMk2",
-   "modelResource": "shipweapons/medium_coilgun_cannon",
+   "iconResource": "shipbuildericons/ICO_SpinalCoilerMk3",
+   "modelResource": "shipweapons/huge_coilgun_cannon",
    "shotModelResource": "spaceCombat/BulletCoil",
    "impactVisualFXResource": "spaceCombat/ImpactWhite",
    "fireSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_CoilGun_Cannon",
    "impactSoundFXResource": "event:/SFX/Game_SFX/Ship_Fire_Impacts/trig_SFX_BlasterLongLoudMid019MonoRR"
 },
  {
-   "dataName": "HeavyCoilCannonMk2",
-   "friendlyName": "Heavy Coil Cannon Mk2",
+   "dataName": "HeavySiegeCoilerMk1",
+   "friendlyName": "Heavy Siege Coiler Mk1",
    "mount": "ThreeNoseAngle",
    "crew": 6,
-   "sort": 37,
-   "requiredProjectName": "Project_HeavyCoilCannonMk2",
+   "sort": 43,
+   "requiredProjectName": "Project_CoilCannonMk1",
    "attackMode": true,
    "defenseMode": false,
-   "baseWeaponMass_tons": 165,
-   "cooldown_s": 54,
-   "salvo_shots": 4,
-   "intraSalvoCooldown_s": 18,
-   "efficiency": 0.6,
-   "flatChipping": 0.35,
-   "magazine": 360,
-   "ammoMass_kg": 75,
-   "muzzleVelocity_kps": 7.65,
-   "warheadMass_kg": 60,
-   "bombardmentValue": 5,
-   "targetingRange_km": 850,
-   "pivotRange_deg": 30,
+   "baseWeaponMass_tons": 1000,
+   "cooldown_s": 48,
+   "efficiency": 0.5,
+   "flatChipping": 0.25,
+   "magazine": 100,
+   "ammoMass_kg": 750,
+   "muzzleVelocity_kps": 3.4,
+   "warheadMass_kg": 562.5,
+   "bombardmentValue": 6,
+   "targetingRange_km": 800,
+   "pivotRange_deg": 20,
    "isPointDefenseTargetable": true,
    "weightedBuildMaterials": {
       "volatiles": 0.3,
       "metals": 0.35,
-      "nobleMetals": 0.35,
-      "exotics": null
+      "nobleMetals": 0.35
    },
    "ammoMaterials": {
       "volatiles": 0.1,
       "metals": 0.4,
-      "nobleMetals": 0.5,
-      "exotics": ""
+      "nobleMetals": 0.5
    },
-   "iconResource": "shipbuildericons/ICO_HeavyCoilCannonMk2",
+   "iconResource": "shipbuildericons/ICO_HeavySiegeCoilerMk1",
    "modelResource": "shipweapons/large_coilgun_cannon",
    "shotModelResource": "spaceCombat/BulletCoil",
    "impactVisualFXResource": "spaceCombat/ImpactWhite",
@@ -1554,195 +1683,178 @@
    "impactSoundFXResource": "event:/SFX/Game_SFX/Ship_Fire_Impacts/trig_SFX_BlasterLongLoudMid019MonoRR"
 },
  {
-   "dataName": "SpinalCoilerMk2",
-   "friendlyName": "Spinal Coiler Mk2",
-   "mount": "FourNose",
+   "dataName": "HeavySiegeCoilerMk2",
+   "friendlyName": "Heavy Siege Coiler Mk2",
+   "mount": "ThreeNoseAngle",
    "crew": 6,
-   "sort": 38,
-   "requiredProjectName": "Project_SpinalCoilerMk2",
+   "sort": 44,
+   "requiredProjectName": "Project_CoilCannonMk2",
    "attackMode": true,
    "defenseMode": false,
-   "baseWeaponMass_tons": 220,
-   "cooldown_s": 72,
-   "salvo_shots": 4,
-   "intraSalvoCooldown_s": 24,
+   "baseWeaponMass_tons": 1000,
+   "cooldown_s": 36,
    "efficiency": 0.6,
-   "flatChipping": 0.35,
-   "magazine": 450,
-   "ammoMass_kg": 100,
-   "muzzleVelocity_kps": 8.1,
-   "warheadMass_kg": 80,
-   "bombardmentValue": 6,
-   "targetingRange_km": 950,
-   "pivotRange_deg": 30,
+   "flatChipping": 0.25,
+   "magazine": 100,
+   "ammoMass_kg": 750,
+   "muzzleVelocity_kps": 3.8,
+   "warheadMass_kg": 600,
+   "bombardmentValue": 7,
+   "targetingRange_km": 850,
+   "pivotRange_deg": 20,
    "isPointDefenseTargetable": true,
    "weightedBuildMaterials": {
       "volatiles": 0.3,
       "metals": 0.35,
-      "nobleMetals": 0.35,
-      "exotics": null
+      "nobleMetals": 0.35
    },
    "ammoMaterials": {
       "volatiles": 0.1,
       "metals": 0.4,
-      "nobleMetals": 0.5,
-      "exotics": ""
+      "nobleMetals": 0.5
    },
-   "iconResource": "shipbuildericons/ICO_SpinalCoilerMk2",
-   "modelResource": "shipweapons/huge_coilgun_cannon",
+   "iconResource": "shipbuildericons/ICO_HeavySiegeCoilerMk2",
+   "modelResource": "shipweapons/large_coilgun_cannon",
    "shotModelResource": "spaceCombat/BulletCoil",
    "impactVisualFXResource": "spaceCombat/ImpactWhite",
    "fireSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_CoilGun_Cannon",
    "impactSoundFXResource": "event:/SFX/Game_SFX/Ship_Fire_Impacts/trig_SFX_BlasterLongLoudMid019MonoRR"
 },
  {
-   "dataName": "LightCoilCannonMk3",
-   "friendlyName": "Light Coil Cannon Mk3",
-   "mount": "OneNose",
-   "crew": 4,
-   "sort": 39,
-   "requiredProjectName": "Project_LightCoilCannonMk3",
+   "dataName": "HeavySiegeCoilerMk3",
+   "friendlyName": "Heavy Siege Coiler Mk3",
+   "mount": "ThreeNoseAngle",
+   "crew": 6,
+   "sort": 45,
+   "requiredProjectName": "Project_CoilCannonMk3",
    "attackMode": true,
    "defenseMode": false,
-   "baseWeaponMass_tons": 50,
-   "cooldown_s": 20,
-   "salvo_shots": 5,
-   "intraSalvoCooldown_s": 10,
+   "baseWeaponMass_tons": 1000,
+   "cooldown_s": 24,
    "efficiency": 0.7,
-   "flatChipping": 0.35,
-   "magazine": 300,
-   "ammoMass_kg": 25,
-   "muzzleVelocity_kps": 8.1,
-   "warheadMass_kg": 21.875,
-   "bombardmentValue": 5,
-   "targetingRange_km": 650,
-   "pivotRange_deg": 30,
+   "flatChipping": 0.25,
+   "magazine": 100,
+   "ammoMass_kg": 750,
+   "muzzleVelocity_kps": 4.7,
+   "warheadMass_kg": 656.25,
+   "bombardmentValue": 8,
+   "targetingRange_km": 900,
+   "pivotRange_deg": 20,
    "isPointDefenseTargetable": true,
    "weightedBuildMaterials": {
       "volatiles": 0.3,
       "metals": 0.35,
-      "nobleMetals": 0.33,
-      "exotics": 0.02
+      "nobleMetals": 0.35,
+      "exotics": 0.03
    },
    "ammoMaterials": {
       "volatiles": 0.1,
       "metals": 0.4,
-      "nobleMetals": 0.5,
-      "exotics": ""
+      "nobleMetals": 0.5
    },
-   "iconResource": "shipbuildericons/ICO_LightCoilCannonMk3",
-   "modelResource": "shipweapons/small_coilgun_cannon",
+   "iconResource": "shipbuildericons/ICO_HeavySiegeCoilerMk3",
+   "modelResource": "shipweapons/large_coilgun_cannon",
    "shotModelResource": "spaceCombat/BulletCoil",
    "impactVisualFXResource": "spaceCombat/ImpactWhite",
    "fireSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_CoilGun_Cannon",
    "impactSoundFXResource": "event:/SFX/Game_SFX/Ship_Fire_Impacts/trig_SFX_BlasterLongLoudMid019MonoRR"
 },
  {
-   "dataName": "CoilCannonMk3",
-   "friendlyName": "Coil Cannon Mk3",
-   "mount": "TwoNoseVert",
-   "crew": 5,
-   "sort": 40,
-   "requiredProjectName": "Project_CoilCannonMk3",
+   "dataName": "SpinalSiegeCoilerMk1",
+   "friendlyName": "Spinal Siege Coiler Mk1",
+   "mount": "FourNose",
+   "crew": 6,
+   "sort": 46,
+   "requiredProjectName": "Project_CoilCannonMk1",
    "attackMode": true,
    "defenseMode": false,
-   "baseWeaponMass_tons": 100,
-   "cooldown_s": 24,
-   "salvo_shots": 5,
-   "intraSalvoCooldown_s": 12,
-   "efficiency": 0.7,
-   "flatChipping": 0.35,
-   "magazine": 360,
-   "ammoMass_kg": 50,
-   "muzzleVelocity_kps": 9,
-   "warheadMass_kg": 43.75,
-   "bombardmentValue": 6,
-   "targetingRange_km": 800,
-   "pivotRange_deg": 30,
+   "baseWeaponMass_tons": 1500,
+   "cooldown_s": 48,
+   "efficiency": 0.5,
+   "flatChipping": 0.25,
+   "magazine": 120,
+   "ammoMass_kg": 1000,
+   "muzzleVelocity_kps": 3.6,
+   "warheadMass_kg": 750,
+   "bombardmentValue": 7,
+   "targetingRange_km": 900,
+   "pivotRange_deg": 20,
    "isPointDefenseTargetable": true,
    "weightedBuildMaterials": {
       "volatiles": 0.3,
       "metals": 0.35,
-      "nobleMetals": 0.35,
-      "exotics": 0.02
+      "nobleMetals": 0.35
    },
    "ammoMaterials": {
       "volatiles": 0.1,
       "metals": 0.4,
-      "nobleMetals": 0.5,
-      "exotics": ""
+      "nobleMetals": 0.5
    },
-   "iconResource": "shipbuildericons/ICO_CoilCannonMk3",
-   "modelResource": "shipweapons/medium_coilgun_cannon",
+   "iconResource": "shipbuildericons/ICO_SpinalSiegeCoilerMk1",
+   "modelResource": "shipweapons/huge_coilgun_cannon",
    "shotModelResource": "spaceCombat/BulletCoil",
    "impactVisualFXResource": "spaceCombat/ImpactWhite",
    "fireSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_CoilGun_Cannon",
    "impactSoundFXResource": "event:/SFX/Game_SFX/Ship_Fire_Impacts/trig_SFX_BlasterLongLoudMid019MonoRR"
 },
  {
-   "dataName": "HeavyCoilCannonMk3",
-   "friendlyName": "Heavy Coil Cannon Mk3",
-   "mount": "ThreeNoseAngle",
+   "dataName": "SpinalSiegeCoilerMk2",
+   "friendlyName": "Spinal Siege Coiler Mk2",
+   "mount": "FourNose",
    "crew": 6,
-   "sort": 41,
-   "requiredProjectName": "Project_HeavyCoilCannonMk3",
+   "sort": 47,
+   "requiredProjectName": "Project_CoilCannonMk2",
    "attackMode": true,
    "defenseMode": false,
-   "baseWeaponMass_tons": 150,
+   "baseWeaponMass_tons": 1500,
    "cooldown_s": 36,
-   "salvo_shots": 5,
-   "intraSalvoCooldown_s": 18,
-   "efficiency": 0.7,
-   "flatChipping": 0.35,
-   "magazine": 360,
-   "ammoMass_kg": 75,
-   "muzzleVelocity_kps": 9.45,
-   "warheadMass_kg": 65.625,
-   "bombardmentValue": 6,
-   "targetingRange_km": 900,
-   "pivotRange_deg": 30,
+   "efficiency": 0.6,
+   "flatChipping": 0.25,
+   "magazine": 120,
+   "ammoMass_kg": 1000,
+   "muzzleVelocity_kps": 4.1,
+   "warheadMass_kg": 800,
+   "bombardmentValue": 8,
+   "targetingRange_km": 950,
+   "pivotRange_deg": 20,
    "isPointDefenseTargetable": true,
    "weightedBuildMaterials": {
       "volatiles": 0.3,
       "metals": 0.35,
-      "nobleMetals": 0.35,
-      "exotics": 0.03
+      "nobleMetals": 0.35
    },
    "ammoMaterials": {
       "volatiles": 0.1,
       "metals": 0.4,
-      "nobleMetals": 0.5,
-      "exotics": ""
+      "nobleMetals": 0.5
    },
-   "iconResource": "shipbuildericons/ICO_HeavyCoilCannonMk3",
-   "modelResource": "shipweapons/large_coilgun_cannon",
+   "iconResource": "shipbuildericons/ICO_SpinalSiegeCoilerMk2",
+   "modelResource": "shipweapons/huge_coilgun_cannon",
    "shotModelResource": "spaceCombat/BulletCoil",
    "impactVisualFXResource": "spaceCombat/ImpactWhite",
    "fireSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_CoilGun_Cannon",
    "impactSoundFXResource": "event:/SFX/Game_SFX/Ship_Fire_Impacts/trig_SFX_BlasterLongLoudMid019MonoRR"
 },
  {
-   "dataName": "SpinalCoilerMk3",
-   "friendlyName": "Spinal Coiler Mk3",
+   "dataName": "SpinalSiegeCoilerMk3",
+   "friendlyName": "Spinal Siege Coiler Mk3",
    "mount": "FourNose",
    "crew": 6,
-   "sort": 42,
-   "requiredProjectName": "Project_SpinalCoilerMk3",
+   "sort": 48,
+   "requiredProjectName": "Project_CoilCannonMk3",
    "attackMode": true,
    "defenseMode": false,
-   "baseWeaponMass_tons": 200,
-   "cooldown_s": 48,
-   "salvo_shots": 5,
-   "intraSalvoCooldown_s": 24,
+   "baseWeaponMass_tons": 1500,
+   "cooldown_s": 24,
    "efficiency": 0.7,
-   "flatChipping": 0.35,
-   "magazine": 450,
-   "ammoMass_kg": 100,
-   "muzzleVelocity_kps": 9.9,
-   "warheadMass_kg": 87.5,
-   "bombardmentValue": 7,
+   "flatChipping": 0.25,
+   "magazine": 120,
+   "ammoMass_kg": 1000,
+   "muzzleVelocity_kps": 5,
+   "warheadMass_kg": 875,
+   "bombardmentValue": 9,
    "targetingRange_km": 1000,
-   "pivotRange_deg": 30,
+   "pivotRange_deg": 20,
    "isPointDefenseTargetable": true,
    "weightedBuildMaterials": {
       "volatiles": 0.3,
@@ -1753,10 +1865,9 @@
    "ammoMaterials": {
       "volatiles": 0.1,
       "metals": 0.4,
-      "nobleMetals": 0.5,
-      "exotics": ""
+      "nobleMetals": 0.5
    },
-   "iconResource": "shipbuildericons/ICO_SpinalCoilerMk3",
+   "iconResource": "shipbuildericons/ICO_SpinalSiegeCoilerMk3",
    "modelResource": "shipweapons/huge_coilgun_cannon",
    "shotModelResource": "spaceCombat/BulletCoil",
    "impactVisualFXResource": "spaceCombat/ImpactWhite",
@@ -1768,7 +1879,7 @@
    "friendlyName": "Alien Light Mag Battery",
    "mount": "OneHull",
    "crew": 1,
-   "sort": 43,
+   "sort": 49,
    "requiredProjectName": "Project_AlienMasterProject",
    "attackMode": true,
    "defenseMode": false,
@@ -1789,14 +1900,12 @@
    "weightedBuildMaterials": {
       "volatiles": 0.15,
       "metals": 0.6,
-      "nobleMetals": 0.25,
-      "exotics": null
+      "nobleMetals": 0.25
    },
    "ammoMaterials": {
       "volatiles": 0.1,
-      "metals": 0.5,
-      "nobleMetals": 0.4,
-      "exotics": ""
+      "metals": 0.6,
+      "nobleMetals": 0.3
    },
    "iconResource": "shipbuildericons/ICO_AlienLightMagBattery",
    "modelResource": "shipweapons/alien_small_coilgun_battery",
@@ -1810,7 +1919,7 @@
    "friendlyName": "Alien Mag Battery",
    "mount": "TwoHullHoriz",
    "crew": 2,
-   "sort": 44,
+   "sort": 50,
    "requiredProjectName": "Project_AlienMasterProject",
    "attackMode": true,
    "defenseMode": false,
@@ -1831,14 +1940,12 @@
    "weightedBuildMaterials": {
       "volatiles": 0.15,
       "metals": 0.6,
-      "nobleMetals": 0.25,
-      "exotics": null
+      "nobleMetals": 0.25
    },
    "ammoMaterials": {
       "volatiles": 0.1,
-      "metals": 0.5,
-      "nobleMetals": 0.4,
-      "exotics": ""
+      "metals": 0.6,
+      "nobleMetals": 0.3
    },
    "iconResource": "shipbuildericons/ICO_AlienMagBattery",
    "modelResource": "shipweapons/alien_medium_coilgun_battery",
@@ -1852,7 +1959,7 @@
    "friendlyName": "Alien Heavy Mag Battery",
    "mount": "FourHull",
    "crew": 3,
-   "sort": 45,
+   "sort": 51,
    "requiredProjectName": "Project_AlienMasterProject",
    "attackMode": true,
    "defenseMode": false,
@@ -1873,14 +1980,12 @@
    "weightedBuildMaterials": {
       "volatiles": 0.15,
       "metals": 0.6,
-      "nobleMetals": 0.25,
-      "exotics": null
+      "nobleMetals": 0.25
    },
    "ammoMaterials": {
       "volatiles": 0.1,
-      "metals": 0.5,
-      "nobleMetals": 0.4,
-      "exotics": ""
+      "metals": 0.6,
+      "nobleMetals": 0.3
    },
    "iconResource": "shipbuildericons/ICO_AlienHeavyMagBattery",
    "modelResource": "shipweapons/alien_large_coilgun_battery",
@@ -1894,7 +1999,7 @@
    "friendlyName": "Alien Light Mag Cannon",
    "mount": "OneNose",
    "crew": 1,
-   "sort": 46,
+   "sort": 52,
    "requiredProjectName": "Project_AlienMasterProject",
    "attackMode": true,
    "defenseMode": false,
@@ -1915,14 +2020,12 @@
    "weightedBuildMaterials": {
       "volatiles": 0.15,
       "metals": 0.6,
-      "nobleMetals": 0.25,
-      "exotics": null
+      "nobleMetals": 0.25
    },
    "ammoMaterials": {
       "volatiles": 0.1,
-      "metals": 0.5,
-      "nobleMetals": 0.4,
-      "exotics": ""
+      "metals": 0.6,
+      "nobleMetals": 0.3
    },
    "iconResource": "shipbuildericons/ICO_AlienLightMagCannon",
    "modelResource": "shipweapons/alien_small_coilgun_cannon",
@@ -1936,7 +2039,7 @@
    "friendlyName": "Alien Mag Cannon",
    "mount": "TwoNoseVert",
    "crew": 2,
-   "sort": 47,
+   "sort": 53,
    "requiredProjectName": "Project_AlienMasterProject",
    "attackMode": true,
    "defenseMode": false,
@@ -1957,14 +2060,12 @@
    "weightedBuildMaterials": {
       "volatiles": 0.15,
       "metals": 0.6,
-      "nobleMetals": 0.25,
-      "exotics": null
+      "nobleMetals": 0.25
    },
    "ammoMaterials": {
       "volatiles": 0.1,
-      "metals": 0.5,
-      "nobleMetals": 0.4,
-      "exotics": ""
+      "metals": 0.6,
+      "nobleMetals": 0.3
    },
    "iconResource": "shipbuildericons/ICO_AlienMagCannon",
    "modelResource": "shipweapons/alien_medium_coilgun_cannon",
@@ -1978,7 +2079,7 @@
    "friendlyName": "Alien Heavy Mag Cannon",
    "mount": "ThreeNoseAngle",
    "crew": 2,
-   "sort": 48,
+   "sort": 54,
    "requiredProjectName": "Project_AlienMasterProject",
    "attackMode": true,
    "defenseMode": false,
@@ -1999,14 +2100,12 @@
    "weightedBuildMaterials": {
       "volatiles": 0.15,
       "metals": 0.6,
-      "nobleMetals": 0.25,
-      "exotics": null
+      "nobleMetals": 0.25
    },
    "ammoMaterials": {
       "volatiles": 0.1,
-      "metals": 0.5,
-      "nobleMetals": 0.4,
-      "exotics": ""
+      "metals": 0.6,
+      "nobleMetals": 0.3
    },
    "iconResource": "shipbuildericons/ICO_AlienHeavyMagCannon",
    "modelResource": "shipweapons/alien_large_coilgun_cannon",
@@ -2020,7 +2119,7 @@
    "friendlyName": "Alien Spinal Mag Cannon",
    "mount": "FourNose",
    "crew": 3,
-   "sort": 49,
+   "sort": 55,
    "requiredProjectName": "Project_AlienMasterProject",
    "attackMode": true,
    "defenseMode": false,
@@ -2041,14 +2140,12 @@
    "weightedBuildMaterials": {
       "volatiles": 0.15,
       "metals": 0.6,
-      "nobleMetals": 0.25,
-      "exotics": null
+      "nobleMetals": 0.25
    },
    "ammoMaterials": {
       "volatiles": 0.1,
-      "metals": 0.5,
-      "nobleMetals": 0.4,
-      "exotics": ""
+      "metals": 0.6,
+      "nobleMetals": 0.3
    },
    "iconResource": "shipbuildericons/ICO_AlienSpinalMagCannon",
    "modelResource": "shipweapons/alien_huge_coilgun_cannon",
@@ -2062,7 +2159,7 @@
    "friendlyName": "Advanced Alien Light Mag Battery",
    "mount": "OneHull",
    "crew": 1,
-   "sort": 50,
+   "sort": 56,
    "requiredProjectName": "Project_AlienMasterProject",
    "attackMode": true,
    "defenseMode": false,
@@ -2088,9 +2185,8 @@
    },
    "ammoMaterials": {
       "volatiles": 0.1,
-      "metals": 0.4,
-      "nobleMetals": 0.5,
-      "exotics": ""
+      "metals": 0.5,
+      "nobleMetals": 0.4
    },
    "iconResource": "shipbuildericons/ICO_AdvancedAlienLightMagBattery",
    "modelResource": "shipweapons/alien_small_coilgun_battery",
@@ -2104,7 +2200,7 @@
    "friendlyName": "Advanced Alien Mag Battery",
    "mount": "TwoHullHoriz",
    "crew": 2,
-   "sort": 51,
+   "sort": 57,
    "requiredProjectName": "Project_AlienMasterProject",
    "attackMode": true,
    "defenseMode": false,
@@ -2125,14 +2221,13 @@
    "weightedBuildMaterials": {
       "volatiles": 0.15,
       "metals": 0.55,
-      "nobleMetals": 0.28,
-      "exotics": 0.02
+      "nobleMetals": 0.29,
+      "exotics": 0.01
    },
    "ammoMaterials": {
       "volatiles": 0.1,
-      "metals": 0.4,
-      "nobleMetals": 0.5,
-      "exotics": ""
+      "metals": 0.5,
+      "nobleMetals": 0.4
    },
    "iconResource": "shipbuildericons/ICO_AdvancedAlienMagBattery",
    "modelResource": "shipweapons/alien_medium_coilgun_battery",
@@ -2146,7 +2241,7 @@
    "friendlyName": "Advanced Alien Heavy Mag Battery",
    "mount": "FourHull",
    "crew": 3,
-   "sort": 52,
+   "sort": 58,
    "requiredProjectName": "Project_AlienMasterProject",
    "attackMode": true,
    "defenseMode": false,
@@ -2167,14 +2262,13 @@
    "weightedBuildMaterials": {
       "volatiles": 0.15,
       "metals": 0.55,
-      "nobleMetals": 0.27,
-      "exotics": 0.03
+      "nobleMetals": 0.28,
+      "exotics": 0.02
    },
    "ammoMaterials": {
       "volatiles": 0.1,
-      "metals": 0.4,
-      "nobleMetals": 0.5,
-      "exotics": ""
+      "metals": 0.5,
+      "nobleMetals": 0.4
    },
    "iconResource": "shipbuildericons/ICO_AdvancedAlienHeavyMagBattery",
    "modelResource": "shipweapons/alien_large_coilgun_battery",
@@ -2188,7 +2282,7 @@
    "friendlyName": "Advanced Alien Light Mag Cannon",
    "mount": "OneNose",
    "crew": 1,
-   "sort": 53,
+   "sort": 59,
    "requiredProjectName": "Project_AlienMasterProject",
    "attackMode": true,
    "defenseMode": false,
@@ -2214,9 +2308,8 @@
    },
    "ammoMaterials": {
       "volatiles": 0.1,
-      "metals": 0.4,
-      "nobleMetals": 0.5,
-      "exotics": ""
+      "metals": 0.5,
+      "nobleMetals": 0.4
    },
    "iconResource": "shipbuildericons/ICO_AdvancedAlienLightMagCannon",
    "modelResource": "shipweapons/alien_small_coilgun_cannon",
@@ -2230,7 +2323,7 @@
    "friendlyName": "Advanced Alien Mag Cannon",
    "mount": "TwoNoseVert",
    "crew": 2,
-   "sort": 54,
+   "sort": 60,
    "requiredProjectName": "Project_AlienMasterProject",
    "attackMode": true,
    "defenseMode": false,
@@ -2251,14 +2344,13 @@
    "weightedBuildMaterials": {
       "volatiles": 0.15,
       "metals": 0.55,
-      "nobleMetals": 0.27,
-      "exotics": 0.03
+      "nobleMetals": 0.28,
+      "exotics": 0.02
    },
    "ammoMaterials": {
       "volatiles": 0.1,
-      "metals": 0.4,
-      "nobleMetals": 0.5,
-      "exotics": ""
+      "metals": 0.5,
+      "nobleMetals": 0.4
    },
    "iconResource": "shipbuildericons/ICO_AdvancedAlienMagCannon",
    "modelResource": "shipweapons/alien_medium_coilgun_cannon",
@@ -2272,7 +2364,7 @@
    "friendlyName": "Advanced Alien Heavy Mag Cannon",
    "mount": "ThreeNoseAngle",
    "crew": 2,
-   "sort": 55,
+   "sort": 61,
    "requiredProjectName": "Project_AlienMasterProject",
    "attackMode": true,
    "defenseMode": false,
@@ -2292,15 +2384,14 @@
    "isPointDefenseTargetable": true,
    "weightedBuildMaterials": {
       "volatiles": 0.15,
-      "metals": 0.6,
-      "nobleMetals": 0.25,
+      "metals": 0.55,
+      "nobleMetals": 0.27,
       "exotics": 0.03
    },
    "ammoMaterials": {
       "volatiles": 0.1,
       "metals": 0.5,
-      "nobleMetals": 0.4,
-      "exotics": ""
+      "nobleMetals": 0.4
    },
    "iconResource": "shipbuildericons/ICO_AdvancedAlienHeavyMagCannon",
    "modelResource": "shipweapons/alien_large_coilgun_cannon",
@@ -2314,7 +2405,7 @@
    "friendlyName": "Advanced Alien Spinal Mag Cannon",
    "mount": "FourNose",
    "crew": 3,
-   "sort": 56,
+   "sort": 62,
    "requiredProjectName": "Project_AlienMasterProject",
    "attackMode": true,
    "defenseMode": false,
@@ -2335,14 +2426,13 @@
    "weightedBuildMaterials": {
       "volatiles": 0.15,
       "metals": 0.55,
-      "nobleMetals": 0.26,
-      "exotics": 0.04
+      "nobleMetals": 0.27,
+      "exotics": 0.03
    },
    "ammoMaterials": {
       "volatiles": 0.1,
-      "metals": 0.4,
-      "nobleMetals": 0.5,
-      "exotics": ""
+      "metals": 0.5,
+      "nobleMetals": 0.4
    },
    "iconResource": "shipbuildericons/ICO_AdvancedAlienSpinalMagCannon",
    "modelResource": "shipweapons/alien_huge_coilgun_cannon",
@@ -2350,5 +2440,292 @@
    "impactVisualFXResource": "spaceCombat/ImpactWhite",
    "fireSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_Alien_Cannon",
    "impactSoundFXResource": "event:/SFX/Game_SFX/Ship_Fire_Impacts/trig_SFX_BlasterLongQuietMid006MonoRR"
+},
+ {
+   "dataName": "Gen3AlienLightMagBattery",
+   "friendlyName": "Gen3 Alien Light Mag Battery",
+   "mount": "OneHull",
+   "crew": 1,
+   "sort": 63,
+   "requiredProjectName": "Project_AlienAdvancedMasterProject",
+   "attackMode": true,
+   "defenseMode": false,
+   "baseWeaponMass_tons": 40,
+   "cooldown_s": 10,
+   "salvo_shots": 6,
+   "intraSalvoCooldown_s": 4,
+   "efficiency": 0.8,
+   "flatChipping": 0.25,
+   "magazine": 1500,
+   "ammoMass_kg": 27.6,
+   "muzzleVelocity_kps": 6.3,
+   "warheadMass_kg": 24,
+   "bombardmentValue": 4,
+   "targetingRange_km": 650,
+   "pivotRange_deg": 180,
+   "isPointDefenseTargetable": true,
+   "weightedBuildMaterials": {
+      "volatiles": 0.15,
+      "metals": 0.55,
+      "nobleMetals": 0.29,
+      "exotics": 0.01
+   },
+   "ammoMaterials": {
+      "volatiles": 0.1,
+      "metals": 0.5,
+      "nobleMetals": 0.4
+   },
+   "iconResource": "shipbuildericons/ICO_Gen3AlienLightMagBattery",
+   "modelResource": "shipweapons/alien_small_coilgun_battery",
+   "shotModelResource": "spaceCombat/BulletMagAlien",
+   "impactVisualFXResource": "spaceCombat/ImpactWhite",
+   "fireSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_Alien_Turrent",
+   "impactSoundFXResource": "event:/SFX/Game_SFX/Ship_Fire_Impacts/trig_SFX_BlasterLongAverageLow001MonoRR"
+},
+ {
+   "dataName": "Gen3AlienMagBattery",
+   "friendlyName": "Gen3 Alien Mag Battery",
+   "mount": "TwoHullHoriz",
+   "crew": 2,
+   "sort": 64,
+   "requiredProjectName": "Project_AlienAdvancedMasterProject",
+   "attackMode": true,
+   "defenseMode": false,
+   "baseWeaponMass_tons": 80,
+   "cooldown_s": 12,
+   "salvo_shots": 6,
+   "intraSalvoCooldown_s": 5,
+   "efficiency": 0.8,
+   "flatChipping": 0.25,
+   "magazine": 1800,
+   "ammoMass_kg": 55,
+   "muzzleVelocity_kps": 7.9,
+   "warheadMass_kg": 48,
+   "bombardmentValue": 5,
+   "targetingRange_km": 750,
+   "pivotRange_deg": 180,
+   "isPointDefenseTargetable": true,
+   "weightedBuildMaterials": {
+      "volatiles": 0.15,
+      "metals": 0.55,
+      "nobleMetals": 0.29,
+      "exotics": 0.01
+   },
+   "ammoMaterials": {
+      "volatiles": 0.1,
+      "metals": 0.5,
+      "nobleMetals": 0.4
+   },
+   "iconResource": "shipbuildericons/ICO_Gen3AlienMagBattery",
+   "modelResource": "shipweapons/alien_medium_coilgun_battery",
+   "shotModelResource": "spaceCombat/BulletMagAlien",
+   "impactVisualFXResource": "spaceCombat/ImpactWhite",
+   "fireSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_Alien_Turrent",
+   "impactSoundFXResource": "event:/SFX/Game_SFX/Ship_Fire_Impacts/trig_SFX_BlasterLongAverageLow001MonoRR"
+},
+ {
+   "dataName": "Gen3AlienHeavyMagBattery",
+   "friendlyName": "Gen3 Alien Heavy Mag Battery",
+   "mount": "FourHull",
+   "crew": 3,
+   "sort": 65,
+   "requiredProjectName": "Project_AlienAdvancedMasterProject",
+   "attackMode": true,
+   "defenseMode": false,
+   "baseWeaponMass_tons": 160,
+   "cooldown_s": 14.4,
+   "salvo_shots": 6,
+   "intraSalvoCooldown_s": 6,
+   "efficiency": 0.8,
+   "flatChipping": 0.25,
+   "magazine": 2160,
+   "ammoMass_kg": 110,
+   "muzzleVelocity_kps": 9.5,
+   "warheadMass_kg": 96,
+   "bombardmentValue": 6,
+   "targetingRange_km": 900,
+   "pivotRange_deg": 180,
+   "isPointDefenseTargetable": true,
+   "weightedBuildMaterials": {
+      "volatiles": 0.15,
+      "metals": 0.55,
+      "nobleMetals": 0.28,
+      "exotics": 0.02
+   },
+   "ammoMaterials": {
+      "volatiles": 0.1,
+      "metals": 0.5,
+      "nobleMetals": 0.4
+   },
+   "iconResource": "shipbuildericons/ICO_Gen3AlienHeavyMagBattery",
+   "modelResource": "shipweapons/alien_large_coilgun_battery",
+   "shotModelResource": "spaceCombat/BulletMagAlien",
+   "impactVisualFXResource": "spaceCombat/ImpactWhite",
+   "fireSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_Alien_Turrent",
+   "impactSoundFXResource": "event:/SFX/Game_SFX/Ship_Fire_Impacts/trig_SFX_BlasterLongAverageLow001MonoRR"
+},
+ {
+   "dataName": "Gen3AlienLightMagCannon",
+   "friendlyName": "Gen3 Alien Light Mag Cannon",
+   "mount": "OneNose",
+   "crew": 1,
+   "sort": 66,
+   "requiredProjectName": "Project_AlienAdvancedMasterProject",
+   "attackMode": true,
+   "defenseMode": false,
+   "baseWeaponMass_tons": 50,
+   "cooldown_s": 12,
+   "salvo_shots": 6,
+   "intraSalvoCooldown_s": 4,
+   "efficiency": 0.8,
+   "flatChipping": 0.35,
+   "magazine": 300,
+   "ammoMass_kg": 74,
+   "muzzleVelocity_kps": 8.3,
+   "warheadMass_kg": 64,
+   "bombardmentValue": 5,
+   "targetingRange_km": 800,
+   "pivotRange_deg": 30,
+   "isPointDefenseTargetable": true,
+   "weightedBuildMaterials": {
+      "volatiles": 0.15,
+      "metals": 0.55,
+      "nobleMetals": 0.28,
+      "exotics": 0.02
+   },
+   "ammoMaterials": {
+      "volatiles": 0.1,
+      "metals": 0.5,
+      "nobleMetals": 0.4
+   },
+   "iconResource": "shipbuildericons/ICO_Gen3AlienLightMagCannon",
+   "modelResource": "shipweapons/alien_small_coilgun_cannon",
+   "shotModelResource": "spaceCombat/BulletMagAlien",
+   "impactVisualFXResource": "spaceCombat/ImpactWhite",
+   "fireSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_Alien_Cannon",
+   "impactSoundFXResource": "event:/SFX/Game_SFX/Ship_Fire_Impacts/trig_SFX_BlasterLongQuietMid006MonoRR"
+},
+ {
+   "dataName": "Gen3AlienMagCannon",
+   "friendlyName": "Gen3 Alien Mag Cannon",
+   "mount": "TwoNoseVert",
+   "crew": 2,
+   "sort": 67,
+   "requiredProjectName": "Project_AlienAdvancedMasterProject",
+   "attackMode": true,
+   "defenseMode": false,
+   "baseWeaponMass_tons": 100,
+   "cooldown_s": 16,
+   "salvo_shots": 6,
+   "intraSalvoCooldown_s": 5,
+   "efficiency": 0.8,
+   "flatChipping": 0.35,
+   "magazine": 360,
+   "ammoMass_kg": 147,
+   "muzzleVelocity_kps": 10.1,
+   "warheadMass_kg": 128,
+   "bombardmentValue": 6,
+   "targetingRange_km": 900,
+   "pivotRange_deg": 30,
+   "isPointDefenseTargetable": true,
+   "weightedBuildMaterials": {
+      "volatiles": 0.15,
+      "metals": 0.55,
+      "nobleMetals": 0.28,
+      "exotics": 0.02
+   },
+   "ammoMaterials": {
+      "volatiles": 0.1,
+      "metals": 0.5,
+      "nobleMetals": 0.4
+   },
+   "iconResource": "shipbuildericons/ICO_Gen3AlienMagCannon",
+   "modelResource": "shipweapons/alien_medium_coilgun_cannon",
+   "shotModelResource": "spaceCombat/BulletMagAlien",
+   "impactVisualFXResource": "spaceCombat/ImpactWhite",
+   "fireSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_Alien_Cannon",
+   "impactSoundFXResource": "event:/SFX/Game_SFX/Ship_Fire_Impacts/trig_SFX_BlasterLongQuietMid006MonoRR"
+},
+ {
+   "dataName": "Gen3AlienHeavyMagCannon",
+   "friendlyName": "Gen3 Alien Heavy Mag Cannon",
+   "mount": "ThreeNoseAngle",
+   "crew": 2,
+   "sort": 68,
+   "requiredProjectName": "Project_AlienAdvancedMasterProject",
+   "attackMode": true,
+   "defenseMode": false,
+   "baseWeaponMass_tons": 150,
+   "cooldown_s": 24,
+   "salvo_shots": 5,
+   "intraSalvoCooldown_s": 6,
+   "efficiency": 0.8,
+   "flatChipping": 0.35,
+   "magazine": 400,
+   "ammoMass_kg": 294,
+   "muzzleVelocity_kps": 12.7,
+   "warheadMass_kg": 256,
+   "bombardmentValue": 7,
+   "targetingRange_km": 1000,
+   "pivotRange_deg": 30,
+   "isPointDefenseTargetable": true,
+   "weightedBuildMaterials": {
+      "volatiles": 0.15,
+      "metals": 0.55,
+      "nobleMetals": 0.27,
+      "exotics": 0.03
+   },
+   "ammoMaterials": {
+      "volatiles": 0.1,
+      "metals": 0.5,
+      "nobleMetals": 0.4
+   },
+   "iconResource": "shipbuildericons/ICO_Gen3AlienHeavyMagCannon",
+   "modelResource": "shipweapons/alien_large_coilgun_cannon",
+   "shotModelResource": "spaceCombat/BulletMagAlien",
+   "impactVisualFXResource": "spaceCombat/ImpactWhite",
+   "fireSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_Alien_Cannon",
+   "impactSoundFXResource": "event:/SFX/Game_SFX/Ship_Fire_Impacts/trig_SFX_BlasterLongQuietMid006MonoRR"
+},
+ {
+   "dataName": "Gen3AlienSpinalMagCannon",
+   "friendlyName": "Gen3 Alien Spinal Mag Cannon",
+   "mount": "FourNose",
+   "crew": 3,
+   "sort": 69,
+   "requiredProjectName": "Project_AlienAdvancedMasterProject",
+   "attackMode": true,
+   "defenseMode": false,
+   "baseWeaponMass_tons": 200,
+   "cooldown_s": 36,
+   "salvo_shots": 5,
+   "intraSalvoCooldown_s": 7.2,
+   "efficiency": 0.8,
+   "flatChipping": 0.35,
+   "magazine": 450,
+   "ammoMass_kg": 589,
+   "muzzleVelocity_kps": 15.2,
+   "warheadMass_kg": 512,
+   "bombardmentValue": 8,
+   "targetingRange_km": 1000,
+   "pivotRange_deg": 30,
+   "isPointDefenseTargetable": true,
+   "weightedBuildMaterials": {
+      "volatiles": 0.15,
+      "metals": 0.55,
+      "nobleMetals": 0.27,
+      "exotics": 0.03
+   },
+   "ammoMaterials": {
+      "volatiles": 0.1,
+      "metals": 0.5,
+      "nobleMetals": 0.4
+   },
+   "iconResource": "shipbuildericons/ICO_Gen3AlienSpinalMagCannon",
+   "modelResource": "shipweapons/alien_huge_coilgun_cannon",
+   "shotModelResource": "spaceCombat/BulletMagAlien",
+   "impactVisualFXResource": "spaceCombat/ImpactWhite",
+   "fireSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_Alien_Cannon",
+   "impactSoundFXResource": "event:/SFX/Game_SFX/Ship_Fire_Impacts/trig_SFX_BlasterLongQuietMid006MonoRR"
 }
 ]
\ No newline at end of file
diff --git a/app/game/templates/TIMissileTemplate.json b/app/game/templates/TIMissileTemplate.json
index 2263477..7bca7c2 100644
--- a/app/game/templates/TIMissileTemplate.json
+++ b/app/game/templates/TIMissileTemplate.json
@@ -7,10 +7,13 @@
    "requiredProjectName": "Project_Warships",
    "attackMode": true,
    "defenseMode": false,
+   "warheadClass": "Explosive",
+   "Rocket Thrust": 69954,
+   "EV_kps": 2.86,
+   "acceleration_g": 4.46,
+   "deltaV_kps": 3.33,
    "baseWeaponMass_tons": 15,
    "cooldown_s": 5,
-   "salvo_shots": "",
-   "intraSalvoCooldown_s": "",
    "efficiency": 1,
    "flatChipping": 0.8,
    "magazine": 10,
@@ -19,13 +22,9 @@
    "systemMass_kg": 300,
    "warheadMass_kg": 200,
    "flatDamage_MJ": 240,
-   "warheadClass": "Explosive",
-   "acceleration_g": 2.5,
-   "EV_kps": 2.86,
-   "deltaV_kps": 3.33,
-   "thrustRamp_s": 3,
-   "rotation_degps": 20,
-   "turnRamp_s": 2,
+   "thrustRamp_s": 4,
+   "rotation_degps": 25,
+   "turnRamp_s": 1,
    "maneuver_angle": 60,
    "bombardmentValue": 0,
    "targetingRange_km": 1000,
@@ -33,16 +32,12 @@
    "isPointDefenseTargetable": true,
    "weightedBuildMaterials": {
       "volatiles": 0.5,
-      "metals": 0.5,
-      "nobleMetals": null
+      "metals": 0.5
    },
    "ammoMaterials": {
       "volatiles": 0.69,
       "metals": 0.3,
-      "nobleMetals": 0.01,
-      "fissiles": null,
-      "antimatter": null,
-      "exotics": ""
+      "nobleMetals": 0.01
    },
    "iconResource": "shipbuildericons/ICO_KraitMissileBay",
    "modelResource": "shipweapons/missile_launcher",
@@ -60,42 +55,37 @@
    "requiredProjectName": "Project_AnacondaMissileBay",
    "attackMode": true,
    "defenseMode": false,
+   "warheadClass": "Explosive",
+   "Rocket Thrust": 234560,
+   "EV_kps": 3.23,
+   "acceleration_g": 14.94,
+   "deltaV_kps": 3.76,
    "baseWeaponMass_tons": 10,
    "cooldown_s": 5,
-   "salvo_shots": "",
-   "intraSalvoCooldown_s": "",
    "efficiency": 1,
    "flatChipping": 0.8,
    "magazine": 16,
-   "ammoMass_kg": 1200,
-   "fuelMass_kg": 820,
-   "systemMass_kg": 280,
-   "warheadMass_kg": 100,
-   "flatDamage_MJ": 180,
-   "warheadClass": "Explosive",
-   "acceleration_g": 5,
-   "EV_kps": 3.23,
-   "deltaV_kps": 3.72,
-   "thrustRamp_s": 3,
-   "rotation_degps": 20,
-   "turnRamp_s": 2,
-   "maneuver_angle": 60,
+   "ammoMass_kg": 1600,
+   "fuelMass_kg": 1100,
+   "systemMass_kg": 300,
+   "warheadMass_kg": 200,
+   "flatDamage_MJ": 360,
+   "thrustRamp_s": 6,
+   "rotation_degps": 30,
+   "turnRamp_s": 1,
+   "maneuver_angle": 50,
    "bombardmentValue": 0,
    "targetingRange_km": 1000,
    "pivotRange_deg": 180,
    "isPointDefenseTargetable": true,
    "weightedBuildMaterials": {
       "volatiles": 0.5,
-      "metals": 0.5,
-      "nobleMetals": null
+      "metals": 0.5
    },
    "ammoMaterials": {
       "volatiles": 0.68,
       "metals": 0.3,
-      "nobleMetals": 0.02,
-      "fissiles": null,
-      "antimatter": null,
-      "exotics": ""
+      "nobleMetals": 0.02
    },
    "iconResource": "shipbuildericons/ICO_AnacondaMissileBay",
    "modelResource": "shipweapons/missile_launcher",
@@ -110,53 +100,95 @@
    "friendlyName": "Cobra Missile Bay",
    "mount": "OneHull",
    "crew": 3,
-   "requiredProjectName": "Project_CobraMissileBay",
+   "requiredProjectName": "Project_AnacondaMissileBay",
    "attackMode": true,
    "defenseMode": false,
+   "warheadClass": "Explosive",
+   "Rocket Thrust": 234560,
+   "EV_kps": 3.23,
+   "acceleration_g": 14.94,
+   "deltaV_kps": 3.45,
    "baseWeaponMass_tons": 10,
    "cooldown_s": 7,
-   "salvo_shots": "",
-   "intraSalvoCooldown_s": "",
    "efficiency": 1,
    "flatChipping": 0.8,
    "magazine": 12,
    "ammoMass_kg": 1600,
-   "fuelMass_kg": 1150,
+   "fuelMass_kg": 1050,
    "systemMass_kg": 300,
-   "warheadMass_kg": 150,
-   "flatDamage_MJ": 270,
-   "warheadClass": "Explosive",
-   "acceleration_g": 3.5,
-   "EV_kps": 3.23,
-   "deltaV_kps": 4.1,
-   "thrustRamp_s": 3,
-   "rotation_degps": 20,
-   "turnRamp_s": 2,
-   "maneuver_angle": 60,
+   "warheadMass_kg": 250,
+   "flatDamage_MJ": 450,
+   "thrustRamp_s": 6,
+   "rotation_degps": 30,
+   "turnRamp_s": 1,
+   "maneuver_angle": 50,
    "bombardmentValue": 0,
    "targetingRange_km": 1000,
    "pivotRange_deg": 180,
    "isPointDefenseTargetable": true,
    "weightedBuildMaterials": {
       "volatiles": 0.5,
-      "metals": 0.5,
-      "nobleMetals": null
+      "metals": 0.5
    },
    "ammoMaterials": {
       "volatiles": 0.68,
       "metals": 0.3,
-      "nobleMetals": 0.02,
-      "fissiles": null,
-      "antimatter": null,
-      "exotics": ""
+      "nobleMetals": 0.02
    },
    "iconResource": "shipbuildericons/ICO_CobraMissileBay",
    "modelResource": "shipweapons/missile_launcher",
    "shotModelResource": "spacecombat/AnacondaMissile",
    "impactVisualFXResource": "spaceCombat/SmallExplosion",
    "fireSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_Missile_Launch",
-   "impactSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_Explosive_Missile_Detonates_Ship",
-   "notes": ""
+   "impactSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_Explosive_Missile_Detonates_Ship"
+},
+ {
+   "dataName": "RacerMissileBay",
+   "friendlyName": "Racer Missile Bay",
+   "mount": "OneHull",
+   "crew": 2,
+   "requiredProjectName": "Project_RattlerMissileBay",
+   "attackMode": true,
+   "defenseMode": true,
+   "warheadClass": "Fragmentation",
+   "Rocket Thrust": 117280,
+   "EV_kps": 3.23,
+   "acceleration_g": 29.89,
+   "deltaV_kps": 2.67,
+   "baseWeaponMass_tons": 10,
+   "cooldown_s": 3,
+   "salvo_shots": 6,
+   "intraSalvoCooldown_s": 1,
+   "efficiency": 1,
+   "flatChipping": 0.5,
+   "magazine": 36,
+   "ammoMass_kg": 400,
+   "fuelMass_kg": 225,
+   "systemMass_kg": 150,
+   "warheadMass_kg": 25,
+   "thrustRamp_s": 2,
+   "rotation_degps": 40,
+   "turnRamp_s": 0.5,
+   "maneuver_angle": 35,
+   "bombardmentValue": 0,
+   "targetingRange_km": 400,
+   "pivotRange_deg": 180,
+   "isPointDefenseTargetable": true,
+   "weightedBuildMaterials": {
+      "volatiles": 0.5,
+      "metals": 0.5
+   },
+   "ammoMaterials": {
+      "volatiles": 0.65,
+      "metals": 0.33,
+      "nobleMetals": 0.02
+   },
+   "iconResource": "shipbuildericons/ICO_RacerMissileBay",
+   "modelResource": "shipweapons/missile_launcher",
+   "shotModelResource": "spacecombat/AnacondaMissile",
+   "impactVisualFXResource": "spaceCombat/TinyExplosion",
+   "fireSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_Missile_Launch",
+   "impactSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_Fragmentation_Missile_Detonates_Ship"
 },
  {
    "dataName": "RattlerMissileBay",
@@ -166,103 +198,89 @@
    "requiredProjectName": "Project_RattlerMissileBay",
    "attackMode": true,
    "defenseMode": true,
+   "warheadClass": "Fragmentation",
+   "Rocket Thrust": 234560,
+   "EV_kps": 3.23,
+   "acceleration_g": 14.94,
+   "deltaV_kps": 4.48,
    "baseWeaponMass_tons": 5,
    "cooldown_s": 5,
-   "salvo_shots": "",
-   "intraSalvoCooldown_s": "",
    "efficiency": 1,
    "flatChipping": 0.5,
    "magazine": 24,
-   "ammoMass_kg": 1200,
-   "fuelMass_kg": 785,
-   "systemMass_kg": 365,
+   "ammoMass_kg": 1600,
+   "fuelMass_kg": 1200,
+   "systemMass_kg": 350,
    "warheadMass_kg": 50,
-   "flatDamage_MJ": null,
-   "warheadClass": "Fragmentation",
-   "acceleration_g": 4.5,
-   "EV_kps": 3.23,
-   "deltaV_kps": 3.43,
    "thrustRamp_s": 3,
    "rotation_degps": 30,
-   "turnRamp_s": 2,
-   "maneuver_angle": 75,
+   "turnRamp_s": 0.75,
+   "maneuver_angle": 55,
    "bombardmentValue": 0,
    "targetingRange_km": 1000,
    "pivotRange_deg": 180,
    "isPointDefenseTargetable": true,
    "weightedBuildMaterials": {
       "volatiles": 0.5,
-      "metals": 0.5,
-      "nobleMetals": null
+      "metals": 0.5
    },
    "ammoMaterials": {
       "volatiles": 0.65,
       "metals": 0.33,
-      "nobleMetals": 0.02,
-      "fissiles": null,
-      "antimatter": null,
-      "exotics": ""
+      "nobleMetals": 0.02
    },
    "iconResource": "shipbuildericons/ICO_RattlerMissileBay",
    "modelResource": "shipweapons/missile_launcher",
    "shotModelResource": "spacecombat/AnacondaMissile",
    "impactVisualFXResource": "spaceCombat/TinyExplosion",
    "fireSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_Missile_Launch",
-   "impactSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_Fragmentation_Missile_Detonates_Ship",
-   "notes": ""
+   "impactSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_Fragmentation_Missile_Detonates_Ship"
 },
  {
    "dataName": "RiverjackMissileBay",
    "friendlyName": "Riverjack Missile Bay",
    "mount": "OneHull",
    "crew": 2,
-   "requiredProjectName": "Project_RiverjackMissileBay",
+   "requiredProjectName": "Project_RattlerMissileBay",
    "attackMode": true,
    "defenseMode": true,
+   "warheadClass": "Fragmentation",
+   "Rocket Thrust": 234560,
+   "EV_kps": 3.23,
+   "acceleration_g": 14.94,
+   "deltaV_kps": 4.1,
    "baseWeaponMass_tons": 5,
    "cooldown_s": 7,
-   "salvo_shots": "",
-   "intraSalvoCooldown_s": "",
    "efficiency": 1,
    "flatChipping": 0.5,
    "magazine": 18,
    "ammoMass_kg": 1600,
-   "fuelMass_kg": 1120,
-   "systemMass_kg": 380,
+   "fuelMass_kg": 1150,
+   "systemMass_kg": 350,
    "warheadMass_kg": 100,
-   "flatDamage_MJ": null,
-   "warheadClass": "Fragmentation",
-   "acceleration_g": 4.25,
-   "EV_kps": 3.23,
-   "deltaV_kps": 3.89,
    "thrustRamp_s": 3,
    "rotation_degps": 30,
-   "turnRamp_s": 2,
-   "maneuver_angle": 75,
+   "turnRamp_s": 0.75,
+   "maneuver_angle": 55,
    "bombardmentValue": 0,
    "targetingRange_km": 1000,
    "pivotRange_deg": 180,
    "isPointDefenseTargetable": true,
    "weightedBuildMaterials": {
       "volatiles": 0.5,
-      "metals": 0.5,
-      "nobleMetals": null
+      "metals": 0.5
    },
    "ammoMaterials": {
       "volatiles": 0.65,
       "metals": 0.33,
-      "nobleMetals": 0.02,
-      "fissiles": null,
-      "antimatter": null,
-      "exotics": ""
+      "nobleMetals": 0.02
    },
    "iconResource": "shipbuildericons/ICO_RiverjackMissileBay",
    "modelResource": "shipweapons/missile_launcher",
    "shotModelResource": "spacecombat/AnacondaMissile",
    "impactVisualFXResource": "spaceCombat/TinyExplosion",
    "fireSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_Missile_Launch",
-   "impactSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_Fragmentation_Missile_Detonates_Ship",
-   "notes": ""
+   "impactSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_Fragmentation_Missile_Detonates_Ship"
 },
  {
    "dataName": "HarlequinMissileBay",
@@ -272,25 +290,23 @@
    "requiredProjectName": "Project_HarlequinMissileBay",
    "attackMode": true,
    "defenseMode": false,
+   "warheadClass": "Penetrator",
+   "Rocket Thrust": 234560,
+   "EV_kps": 3.23,
+   "acceleration_g": 14.94,
+   "deltaV_kps": 4.48,
    "baseWeaponMass_tons": 5,
    "cooldown_s": 5,
-   "salvo_shots": "",
-   "intraSalvoCooldown_s": "",
    "efficiency": 1,
    "flatChipping": 0.6,
    "magazine": 16,
-   "ammoMass_kg": 1200,
-   "fuelMass_kg": 870,
-   "systemMass_kg": 280,
+   "ammoMass_kg": 1600,
+   "fuelMass_kg": 1200,
+   "systemMass_kg": 350,
    "warheadMass_kg": 50,
-   "flatDamage_MJ": null,
-   "warheadClass": "Penetrator",
-   "acceleration_g": 5,
-   "EV_kps": 3.23,
-   "deltaV_kps": 4.17,
-   "thrustRamp_s": 3,
-   "rotation_degps": 20,
-   "turnRamp_s": 2,
+   "thrustRamp_s": 6,
+   "rotation_degps": 25,
+   "turnRamp_s": 1,
    "maneuver_angle": 45,
    "bombardmentValue": 0,
    "targetingRange_km": 1000,
@@ -298,52 +314,45 @@
    "isPointDefenseTargetable": true,
    "weightedBuildMaterials": {
       "volatiles": 0.5,
-      "metals": 0.5,
-      "nobleMetals": null
+      "metals": 0.5
    },
    "ammoMaterials": {
       "volatiles": 0.65,
       "metals": 0.33,
-      "nobleMetals": 0.02,
-      "fissiles": null,
-      "antimatter": null,
-      "exotics": ""
+      "nobleMetals": 0.02
    },
    "iconResource": "shipbuildericons/ICO_HarlequinMissileBay",
    "modelResource": "shipweapons/missile_launcher",
    "shotModelResource": "spacecombat/AnacondaMissile",
    "impactVisualFXResource": "spaceCombat/ImpactWhite",
    "fireSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_Missile_Launch",
-   "impactSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_Penetrator_Missile_Strikes_Ship",
-   "notes": ""
+   "impactSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_Penetrator_Missile_Strikes_Ship"
 },
  {
    "dataName": "KeelbackMissileBay",
    "friendlyName": "Keelback Missile Bay",
    "mount": "OneHull",
    "crew": 2,
-   "requiredProjectName": "Project_KeelbackMissileBay",
+   "requiredProjectName": "Project_HarlequinMissileBay",
    "attackMode": true,
    "defenseMode": false,
+   "warheadClass": "Penetrator",
+   "Rocket Thrust": 234560,
+   "EV_kps": 3.23,
+   "acceleration_g": 14.94,
+   "deltaV_kps": 4.1,
    "baseWeaponMass_tons": 5,
    "cooldown_s": 5,
-   "salvo_shots": "",
-   "intraSalvoCooldown_s": "",
    "efficiency": 1,
    "flatChipping": 0.6,
    "magazine": 12,
    "ammoMass_kg": 1600,
-   "fuelMass_kg": 1200,
-   "systemMass_kg": 300,
+   "fuelMass_kg": 1150,
+   "systemMass_kg": 350,
    "warheadMass_kg": 100,
-   "flatDamage_MJ": null,
-   "warheadClass": "Penetrator",
-   "acceleration_g": 3.5,
-   "EV_kps": 3.23,
-   "deltaV_kps": 4.48,
-   "thrustRamp_s": 3,
-   "rotation_degps": 20,
-   "turnRamp_s": 2,
+   "thrustRamp_s": 6,
+   "rotation_degps": 25,
+   "turnRamp_s": 1,
    "maneuver_angle": 45,
    "bombardmentValue": 0,
    "targetingRange_km": 1000,
@@ -351,24 +360,19 @@
    "isPointDefenseTargetable": true,
    "weightedBuildMaterials": {
       "volatiles": 0.5,
-      "metals": 0.5,
-      "nobleMetals": null
+      "metals": 0.5
    },
    "ammoMaterials": {
       "volatiles": 0.65,
       "metals": 0.33,
-      "nobleMetals": 0.02,
-      "fissiles": null,
-      "antimatter": null,
-      "exotics": ""
+      "nobleMetals": 0.02
    },
    "iconResource": "shipbuildericons/ICO_KeelbackMissileBay",
    "modelResource": "shipweapons/missile_launcher",
    "shotModelResource": "spacecombat/AnacondaMissile",
    "impactVisualFXResource": "spaceCombat/ImpactWhite",
    "fireSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_Missile_Launch",
-   "impactSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_Penetrator_Missile_Strikes_Ship",
-   "notes": ""
+   "impactSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_Penetrator_Missile_Strikes_Ship"
 },
  {
    "dataName": "CopperheadMissileBay",
@@ -378,42 +382,37 @@
    "requiredProjectName": "Project_CopperheadMissileBay",
    "attackMode": true,
    "defenseMode": false,
+   "warheadClass": "Explosive",
+   "Rocket Thrust": 286810,
+   "EV_kps": 4.45,
+   "acceleration_g": 18.27,
+   "deltaV_kps": 3.68,
    "baseWeaponMass_tons": 15,
    "cooldown_s": 5,
-   "salvo_shots": "",
-   "intraSalvoCooldown_s": "",
    "efficiency": 1,
    "flatChipping": 0.8,
    "magazine": 10,
-   "ammoMass_kg": 2400,
-   "fuelMass_kg": 1750,
-   "systemMass_kg": 500,
-   "warheadMass_kg": 150,
-   "flatDamage_MJ": 360,
-   "warheadClass": "Explosive",
-   "acceleration_g": 3.5,
-   "EV_kps": 4.45,
-   "deltaV_kps": 5.81,
-   "thrustRamp_s": 3,
-   "rotation_degps": 20,
-   "turnRamp_s": 2,
-   "maneuver_angle": 60,
+   "ammoMass_kg": 1600,
+   "fuelMass_kg": 900,
+   "systemMass_kg": 400,
+   "warheadMass_kg": 300,
+   "flatDamage_MJ": 720,
+   "thrustRamp_s": 6,
+   "rotation_degps": 25,
+   "turnRamp_s": 1,
+   "maneuver_angle": 50,
    "bombardmentValue": 0,
    "targetingRange_km": 1000,
    "pivotRange_deg": 180,
    "isPointDefenseTargetable": true,
    "weightedBuildMaterials": {
       "volatiles": 0.5,
-      "metals": 0.5,
-      "nobleMetals": null
+      "metals": 0.5
    },
    "ammoMaterials": {
       "volatiles": 0.65,
       "metals": 0.32,
-      "nobleMetals": 0.03,
-      "fissiles": null,
-      "antimatter": null,
-      "exotics": ""
+      "nobleMetals": 0.03
    },
    "iconResource": "shipbuildericons/ICO_CopperheadMissileBay",
    "modelResource": "shipweapons/missile_launcher",
@@ -431,50 +430,43 @@
    "requiredProjectName": "Project_ViperMissileBay",
    "attackMode": true,
    "defenseMode": true,
+   "warheadClass": "Fragmentation",
+   "Rocket Thrust": 286810,
+   "EV_kps": 4.45,
+   "acceleration_g": 18.27,
+   "deltaV_kps": 5.64,
    "baseWeaponMass_tons": 10,
    "cooldown_s": 5,
-   "salvo_shots": "",
-   "intraSalvoCooldown_s": "",
    "efficiency": 1,
    "flatChipping": 0.5,
    "magazine": 12,
-   "ammoMass_kg": 2400,
-   "fuelMass_kg": 1775,
-   "systemMass_kg": 575,
+   "ammoMass_kg": 1600,
+   "fuelMass_kg": 1150,
+   "systemMass_kg": 400,
    "warheadMass_kg": 50,
-   "flatDamage_MJ": null,
-   "warheadClass": "Fragmentation",
-   "acceleration_g": 4,
-   "EV_kps": 4.45,
-   "deltaV_kps": 5.99,
    "thrustRamp_s": 3,
    "rotation_degps": 35,
-   "turnRamp_s": 2,
-   "maneuver_angle": 75,
+   "turnRamp_s": 1,
+   "maneuver_angle": 55,
    "bombardmentValue": 0,
    "targetingRange_km": 1000,
    "pivotRange_deg": 180,
    "isPointDefenseTargetable": true,
    "weightedBuildMaterials": {
       "volatiles": 0.5,
-      "metals": 0.5,
-      "nobleMetals": null
+      "metals": 0.5
    },
    "ammoMaterials": {
       "volatiles": 0.65,
       "metals": 0.32,
-      "nobleMetals": 0.03,
-      "fissiles": null,
-      "antimatter": null,
-      "exotics": ""
+      "nobleMetals": 0.03
    },
    "iconResource": "shipbuildericons/ICO_ViperMissileBay",
    "modelResource": "shipweapons/missile_launcher",
    "shotModelResource": "spacecombat/AnacondaMissile",
    "impactVisualFXResource": "spaceCombat/TinyExplosion",
    "fireSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_Missile_Launch",
-   "impactSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_Fragmentation_Missile_Detonates_Ship",
-   "notes": ""
+   "impactSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_Fragmentation_Missile_Detonates_Ship"
 },
  {
    "dataName": "LanceheadMissileBay",
@@ -484,25 +476,23 @@
    "requiredProjectName": "Project_LanceheadMissileBay",
    "attackMode": true,
    "defenseMode": false,
+   "warheadClass": "Penetrator",
+   "Rocket Thrust": 286810,
+   "EV_kps": 4.45,
+   "acceleration_g": 18.27,
+   "deltaV_kps": 4.36,
    "baseWeaponMass_tons": 10,
    "cooldown_s": 5,
-   "salvo_shots": "",
-   "intraSalvoCooldown_s": "",
    "efficiency": 1,
    "flatChipping": 0.6,
    "magazine": 10,
-   "ammoMass_kg": 2400,
-   "fuelMass_kg": 1700,
-   "systemMass_kg": 500,
+   "ammoMass_kg": 1600,
+   "fuelMass_kg": 1000,
+   "systemMass_kg": 400,
    "warheadMass_kg": 200,
-   "flatDamage_MJ": null,
-   "warheadClass": "Penetrator",
-   "acceleration_g": 3.5,
-   "EV_kps": 4.45,
-   "deltaV_kps": 5.48,
-   "thrustRamp_s": 3,
-   "rotation_degps": 20,
-   "turnRamp_s": 2,
+   "thrustRamp_s": 6,
+   "rotation_degps": 25,
+   "turnRamp_s": 1,
    "maneuver_angle": 45,
    "bombardmentValue": 0,
    "targetingRange_km": 1000,
@@ -510,52 +500,147 @@
    "isPointDefenseTargetable": true,
    "weightedBuildMaterials": {
       "volatiles": 0.5,
-      "metals": 0.5,
-      "nobleMetals": null
+      "metals": 0.5
    },
    "ammoMaterials": {
       "volatiles": 0.65,
       "metals": 0.32,
-      "nobleMetals": 0.03,
-      "fissiles": null,
-      "antimatter": null,
-      "exotics": ""
+      "nobleMetals": 0.03
    },
    "iconResource": "shipbuildericons/ICO_LanceheadMissileBay",
    "modelResource": "shipweapons/missile_launcher",
    "shotModelResource": "spacecombat/AnacondaMissile",
    "impactVisualFXResource": "spaceCombat/ImpactWhite",
    "fireSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_Missile_Launch",
-   "impactSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_Penetrator_Missile_Strikes_Ship",
-   "notes": ""
+   "impactSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_Penetrator_Missile_Strikes_Ship"
+},
+ {
+   "dataName": "PythonNuclearMissileBay",
+   "friendlyName": "Python Nuclear Missile Bay",
+   "mount": "OneHull",
+   "crew": 6,
+   "requiredProjectName": "Project_HadesNuclearTorpedoBay",
+   "attackMode": true,
+   "defenseMode": true,
+   "warheadClass": "Nuclear",
+   "Rocket Thrust": 286810,
+   "EV_kps": 4.45,
+   "acceleration_g": 18.27,
+   "deltaV_kps": 4.01,
+   "baseWeaponMass_tons": 15,
+   "cooldown_s": 5,
+   "efficiency": 1,
+   "flatChipping": 1,
+   "magazine": 10,
+   "ammoMass_kg": 1600,
+   "fuelMass_kg": 950,
+   "systemMass_kg": 400,
+   "warheadMass_kg": 250,
+   "flatDamage_MJ": 188325000,
+   "thrustRamp_s": 3,
+   "rotation_degps": 30,
+   "turnRamp_s": 1,
+   "maneuver_angle": 55,
+   "bombardmentValue": 50,
+   "targetingRange_km": 1000,
+   "pivotRange_deg": 180,
+   "isPointDefenseTargetable": true,
+   "weightedBuildMaterials": {
+      "volatiles": 0.4,
+      "metals": 0.4,
+      "nobleMetals": 0.2
+   },
+   "ammoMaterials": {
+      "volatiles": 0.65,
+      "metals": 0.27,
+      "nobleMetals": 0.07,
+      "fissiles": 0.01
+   },
+   "iconResource": "shipbuildericons/ICO_PythonNuclearMissileBay",
+   "modelResource": "shipweapons/missile_launcher",
+   "shotModelResource": "spacecombat/AnacondaMissile",
+   "impactVisualFXResource": "spaceCombat/SpaceNuke",
+   "fireSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_Missile_Launch",
+   "impactSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_Nuclear_Warhead_Detonates",
+   "notes": "50 kt"
+},
+ {
+   "dataName": "SidewinderNuclearMissileBay",
+   "friendlyName": "Sidewinder Nuclear Missile Bay",
+   "mount": "OneHull",
+   "crew": 6,
+   "requiredProjectName": "Project_AcheronNuclearTorpedoBay",
+   "attackMode": true,
+   "defenseMode": true,
+   "warheadClass": "ShapedNuclear",
+   "Rocket Thrust": 286810,
+   "EV_kps": 4.45,
+   "acceleration_g": 18.27,
+   "deltaV_kps": 3.37,
+   "baseWeaponMass_tons": 15,
+   "cooldown_s": 5,
+   "efficiency": 1,
+   "flatChipping": 1,
+   "magazine": 10,
+   "ammoMass_kg": 1600,
+   "fuelMass_kg": 850,
+   "systemMass_kg": 450,
+   "warheadMass_kg": 300,
+   "flatDamage_MJ": 418500000,
+   "shapedChargeAngle": 0.15,
+   "thrustRamp_s": 3,
+   "rotation_degps": 30,
+   "turnRamp_s": 1,
+   "maneuver_angle": 55,
+   "bombardmentValue": 50,
+   "targetingRange_km": 1000,
+   "pivotRange_deg": 180,
+   "isPointDefenseTargetable": true,
+   "weightedBuildMaterials": {
+      "volatiles": 0.4,
+      "metals": 0.4,
+      "nobleMetals": 0.2
+   },
+   "ammoMaterials": {
+      "volatiles": 0.62,
+      "metals": 0.29,
+      "nobleMetals": 0.08,
+      "fissiles": 0.01
+   },
+   "iconResource": "shipbuildericons/ICO_SidewinderNuclearMissileBay",
+   "modelResource": "shipweapons/missile_launcher",
+   "shotModelResource": "spacecombat/AnacondaMissile",
+   "impactVisualFXResource": "spaceCombat/CasabaHowitzer",
+   "fireSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_Missile_Launch",
+   "impactSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_Nuclear_Warhead_Detonates",
+   "notes": "100 KT"
 },
  {
    "dataName": "HeraTorpedoBay",
    "friendlyName": "Hera Torpedo Bay",
    "mount": "OneHull",
    "crew": 3,
-   "requiredProjectName": "Project_HeraTorpedoBay",
+   "requiredProjectName": "Project_AnacondaMissileBay",
    "attackMode": true,
    "defenseMode": false,
+   "warheadClass": "Explosive",
+   "Rocket Thrust": 351840,
+   "EV_kps": 3.23,
+   "acceleration_g": 7.47,
+   "deltaV_kps": 6.22,
    "baseWeaponMass_tons": 10,
    "cooldown_s": 7,
-   "salvo_shots": "",
-   "intraSalvoCooldown_s": "",
    "efficiency": 1,
    "flatChipping": 0.8,
    "magazine": 6,
    "ammoMass_kg": 4800,
-   "fuelMass_kg": 4000,
-   "systemMass_kg": 500,
+   "fuelMass_kg": 4100,
+   "systemMass_kg": 400,
    "warheadMass_kg": 300,
    "flatDamage_MJ": 540,
-   "warheadClass": "Explosive",
-   "acceleration_g": 2,
-   "EV_kps": 3.23,
-   "deltaV_kps": 5.79,
-   "thrustRamp_s": 3,
-   "rotation_degps": 15,
-   "turnRamp_s": 2,
+   "thrustRamp_s": 7,
+   "rotation_degps": 20,
+   "turnRamp_s": 1,
    "maneuver_angle": 40,
    "bombardmentValue": 0,
    "targetingRange_km": 1000,
@@ -563,16 +648,12 @@
    "isPointDefenseTargetable": true,
    "weightedBuildMaterials": {
       "volatiles": 0.5,
-      "metals": 0.5,
-      "nobleMetals": null
+      "metals": 0.5
    },
    "ammoMaterials": {
       "volatiles": 0.68,
       "metals": 0.3,
-      "nobleMetals": 0.02,
-      "fissiles": null,
-      "antimatter": null,
-      "exotics": ""
+      "nobleMetals": 0.02
    },
    "iconResource": "shipbuildericons/ICO_HeraTorpedoBay",
    "modelResource": "shipweapons/torpedo_launcher",
@@ -587,28 +668,26 @@
    "friendlyName": "Hermes Torpedo Bay",
    "mount": "OneHull",
    "crew": 2,
-   "requiredProjectName": "Project_HermesTorpedoBay",
+   "requiredProjectName": "Project_HarlequinMissileBay",
    "attackMode": true,
    "defenseMode": false,
+   "warheadClass": "Penetrator",
+   "Rocket Thrust": 351840,
+   "EV_kps": 3.23,
+   "acceleration_g": 7.47,
+   "deltaV_kps": 4.62,
    "baseWeaponMass_tons": 5,
    "cooldown_s": 7,
-   "salvo_shots": "",
-   "intraSalvoCooldown_s": "",
    "efficiency": 1,
    "flatChipping": 0.6,
    "magazine": 6,
    "ammoMass_kg": 4800,
-   "fuelMass_kg": 3550,
-   "systemMass_kg": 500,
+   "fuelMass_kg": 3650,
+   "systemMass_kg": 400,
    "warheadMass_kg": 750,
-   "flatDamage_MJ": null,
-   "warheadClass": "Penetrator",
-   "acceleration_g": 2,
-   "EV_kps": 3.23,
-   "deltaV_kps": 4.35,
-   "thrustRamp_s": 3,
-   "rotation_degps": 15,
-   "turnRamp_s": 2,
+   "thrustRamp_s": 7,
+   "rotation_degps": 20,
+   "turnRamp_s": 1,
    "maneuver_angle": 30,
    "bombardmentValue": 0,
    "targetingRange_km": 1000,
@@ -616,52 +695,46 @@
    "isPointDefenseTargetable": true,
    "weightedBuildMaterials": {
       "volatiles": 0.5,
-      "metals": 0.5,
-      "nobleMetals": null
+      "metals": 0.5
    },
    "ammoMaterials": {
       "volatiles": 0.68,
       "metals": 0.3,
-      "nobleMetals": 0.02,
-      "fissiles": null,
-      "antimatter": null,
-      "exotics": ""
+      "nobleMetals": 0.02
    },
    "iconResource": "shipbuildericons/ICO_HermesTorpedoBay",
    "modelResource": "shipweapons/torpedo_launcher",
    "shotModelResource": "spacecombat/HeraTorpedo",
    "impactVisualFXResource": "spaceCombat/ImpactWhite",
    "fireSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_Torpedo_Launch",
-   "impactSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_Penetrator_Missile_Strikes_Ship",
-   "notes": ""
+   "impactSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_Penetrator_Missile_Strikes_Ship"
 },
  {
    "dataName": "ArtemisTorpedoBay",
    "friendlyName": "Artemis Torpedo Bay",
    "mount": "OneHull",
    "crew": 3,
-   "requiredProjectName": "Project_ArtemisTorpedoBay",
+   "requiredProjectName": "Project_CopperheadMissileBay",
    "attackMode": true,
    "defenseMode": false,
+   "warheadClass": "Explosive",
+   "Rocket Thrust": 430215,
+   "EV_kps": 4.45,
+   "acceleration_g": 9.14,
+   "deltaV_kps": 7.97,
    "baseWeaponMass_tons": 15,
    "cooldown_s": 7,
-   "salvo_shots": "",
-   "intraSalvoCooldown_s": "",
    "efficiency": 1,
    "flatChipping": 0.8,
    "magazine": 6,
    "ammoMass_kg": 4800,
-   "fuelMass_kg": 3950,
-   "systemMass_kg": 450,
+   "fuelMass_kg": 4000,
+   "systemMass_kg": 400,
    "warheadMass_kg": 400,
    "flatDamage_MJ": 960,
-   "warheadClass": "Explosive",
-   "acceleration_g": 2.5,
-   "EV_kps": 4.45,
-   "deltaV_kps": 7.7,
-   "thrustRamp_s": 3,
-   "rotation_degps": 15,
-   "turnRamp_s": 2,
+   "thrustRamp_s": 7,
+   "rotation_degps": 20,
+   "turnRamp_s": 1,
    "maneuver_angle": 40,
    "bombardmentValue": 0,
    "targetingRange_km": 1000,
@@ -669,16 +742,12 @@
    "isPointDefenseTargetable": true,
    "weightedBuildMaterials": {
       "volatiles": 0.5,
-      "metals": 0.5,
-      "nobleMetals": null
+      "metals": 0.5
    },
    "ammoMaterials": {
       "volatiles": 0.65,
       "metals": 0.32,
-      "nobleMetals": 0.03,
-      "fissiles": null,
-      "antimatter": null,
-      "exotics": ""
+      "nobleMetals": 0.03
    },
    "iconResource": "shipbuildericons/ICO_ArtemisTorpedoBay",
    "modelResource": "shipweapons/torpedo_launcher",
@@ -693,28 +762,26 @@
    "friendlyName": "Vulcan Torpedo Bay",
    "mount": "OneHull",
    "crew": 2,
-   "requiredProjectName": "Project_VulcanTorpedoBay",
+   "requiredProjectName": "Project_LanceheadMissileBay",
    "attackMode": true,
    "defenseMode": false,
+   "warheadClass": "Penetrator",
+   "Rocket Thrust": 430215,
+   "EV_kps": 4.45,
+   "acceleration_g": 9.14,
+   "deltaV_kps": 5.99,
    "baseWeaponMass_tons": 10,
    "cooldown_s": 7,
-   "salvo_shots": "",
-   "intraSalvoCooldown_s": "",
    "efficiency": 1,
    "flatChipping": 0.6,
    "magazine": 6,
    "ammoMass_kg": 4800,
-   "fuelMass_kg": 3500,
-   "systemMass_kg": 450,
+   "fuelMass_kg": 3550,
+   "systemMass_kg": 400,
    "warheadMass_kg": 850,
-   "flatDamage_MJ": null,
-   "warheadClass": "Penetrator",
-   "acceleration_g": 2.5,
-   "EV_kps": 4.45,
-   "deltaV_kps": 5.81,
-   "thrustRamp_s": 3,
-   "rotation_degps": 15,
-   "turnRamp_s": 2,
+   "thrustRamp_s": 7,
+   "rotation_degps": 20,
+   "turnRamp_s": 1,
    "maneuver_angle": 30,
    "bombardmentValue": 0,
    "targetingRange_km": 1000,
@@ -722,24 +789,19 @@
    "isPointDefenseTargetable": true,
    "weightedBuildMaterials": {
       "volatiles": 0.5,
-      "metals": 0.5,
-      "nobleMetals": null
+      "metals": 0.5
    },
    "ammoMaterials": {
       "volatiles": 0.65,
       "metals": 0.32,
-      "nobleMetals": 0.03,
-      "fissiles": null,
-      "antimatter": null,
-      "exotics": ""
+      "nobleMetals": 0.03
    },
    "iconResource": "shipbuildericons/ICO_VulcanTorpedoBay",
    "modelResource": "shipweapons/torpedo_launcher",
    "shotModelResource": "spacecombat/HeraTorpedo",
    "impactVisualFXResource": "spaceCombat/ImpactWhite",
    "fireSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_Torpedo_Launch",
-   "impactSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_Penetrator_Missile_Strikes_Ship",
-   "notes": ""
+   "impactSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_Penetrator_Missile_Strikes_Ship"
 },
  {
    "dataName": "AthenaTorpedoBay",
@@ -749,25 +811,24 @@
    "requiredProjectName": "Project_AthenaTorpedoBay",
    "attackMode": true,
    "defenseMode": false,
+   "warheadClass": "Explosive",
+   "Rocket Thrust": 230300,
+   "EV_kps": 8.18,
+   "acceleration_g": 4.89,
+   "deltaV_kps": 12.83,
    "baseWeaponMass_tons": 15,
    "cooldown_s": 7,
-   "salvo_shots": "",
-   "intraSalvoCooldown_s": "",
    "efficiency": 1,
    "flatChipping": 0.8,
    "magazine": 6,
    "ammoMass_kg": 4800,
-   "fuelMass_kg": 3450,
-   "systemMass_kg": 750,
+   "fuelMass_kg": 3800,
+   "systemMass_kg": 400,
    "warheadMass_kg": 600,
    "flatDamage_MJ": 1800,
-   "warheadClass": "Explosive",
-   "acceleration_g": 3,
-   "EV_kps": 8.72,
-   "deltaV_kps": 11.06,
-   "thrustRamp_s": 4,
-   "rotation_degps": 15,
-   "turnRamp_s": 2,
+   "thrustRamp_s": 5,
+   "rotation_degps": 20,
+   "turnRamp_s": 1,
    "maneuver_angle": 40,
    "bombardmentValue": 0,
    "targetingRange_km": 1000,
@@ -775,16 +836,13 @@
    "isPointDefenseTargetable": true,
    "weightedBuildMaterials": {
       "volatiles": 0.5,
-      "metals": 0.5,
-      "nobleMetals": null
+      "metals": 0.5
    },
    "ammoMaterials": {
       "volatiles": 0.6,
       "metals": 0.29,
       "nobleMetals": 0.1,
-      "fissiles": 0.01,
-      "antimatter": null,
-      "exotics": ""
+      "fissiles": 0.01
    },
    "iconResource": "shipbuildericons/ICO_AthenaTorpedoBay",
    "modelResource": "shipweapons/torpedo_launcher",
@@ -802,25 +860,23 @@
    "requiredProjectName": "Project_AresTorpedoBay",
    "attackMode": true,
    "defenseMode": false,
+   "warheadClass": "Penetrator",
+   "Rocket Thrust": 230300,
+   "EV_kps": 8.18,
+   "acceleration_g": 4.89,
+   "deltaV_kps": 8.99,
    "baseWeaponMass_tons": 10,
    "cooldown_s": 7,
-   "salvo_shots": "",
-   "intraSalvoCooldown_s": "",
    "efficiency": 1,
    "flatChipping": 0.6,
    "magazine": 6,
    "ammoMass_kg": 4800,
-   "fuelMass_kg": 2850,
-   "systemMass_kg": 750,
+   "fuelMass_kg": 3200,
+   "systemMass_kg": 400,
    "warheadMass_kg": 1200,
-   "flatDamage_MJ": null,
-   "warheadClass": "Penetrator",
-   "acceleration_g": 3,
-   "EV_kps": 8.72,
-   "deltaV_kps": 7.86,
-   "thrustRamp_s": 4,
-   "rotation_degps": 15,
-   "turnRamp_s": 2,
+   "thrustRamp_s": 5,
+   "rotation_degps": 20,
+   "turnRamp_s": 1,
    "maneuver_angle": 30,
    "bombardmentValue": 0,
    "targetingRange_km": 1000,
@@ -828,24 +884,67 @@
    "isPointDefenseTargetable": true,
    "weightedBuildMaterials": {
       "volatiles": 0.5,
-      "metals": 0.5,
-      "nobleMetals": null
+      "metals": 0.5
    },
    "ammoMaterials": {
       "volatiles": 0.6,
       "metals": 0.29,
       "nobleMetals": 0.1,
-      "fissiles": 0.01,
-      "antimatter": null,
-      "exotics": ""
+      "fissiles": 0.01
    },
    "iconResource": "shipbuildericons/ICO_AresTorpedoBay",
    "modelResource": "shipweapons/torpedo_launcher",
    "shotModelResource": "spacecombat/HeraTorpedo",
    "impactVisualFXResource": "spaceCombat/ImpactWhite",
    "fireSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_Torpedo_Launch",
-   "impactSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_Penetrator_Missile_Strikes_Ship",
-   "notes": ""
+   "impactSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_Penetrator_Missile_Strikes_Ship"
+},
+ {
+   "dataName": "PoseidonTorpedoBay",
+   "friendlyName": "Poseidon Torpedo Bay",
+   "mount": "OneHull",
+   "crew": 2,
+   "requiredProjectName": "Project_AresTorpedoBay",
+   "attackMode": true,
+   "defenseMode": false,
+   "warheadClass": "Penetrator",
+   "Rocket Thrust": 230300,
+   "EV_kps": 8.18,
+   "acceleration_g": 4.89,
+   "deltaV_kps": 18.5,
+   "baseWeaponMass_tons": 10,
+   "cooldown_s": 7,
+   "efficiency": 1,
+   "flatChipping": 0.6,
+   "magazine": 6,
+   "ammoMass_kg": 4800,
+   "fuelMass_kg": 4300,
+   "systemMass_kg": 400,
+   "warheadMass_kg": 100,
+   "thrustRamp_s": 5,
+   "rotation_degps": 20,
+   "turnRamp_s": 1,
+   "maneuver_angle": 30,
+   "bombardmentValue": 0,
+   "targetingRange_km": 1000,
+   "pivotRange_deg": 180,
+   "isPointDefenseTargetable": true,
+   "weightedBuildMaterials": {
+      "volatiles": 0.5,
+      "metals": 0.5
+   },
+   "ammoMaterials": {
+      "volatiles": 0.6,
+      "metals": 0.29,
+      "nobleMetals": 0.1,
+      "fissiles": 0.01
+   },
+   "iconResource": "shipbuildericons/ICO_PoseidonTorpedoBay",
+   "modelResource": "shipweapons/torpedo_launcher",
+   "shotModelResource": "spacecombat/HeraTorpedo",
+   "impactVisualFXResource": "spaceCombat/ImpactWhite",
+   "fireSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_Torpedo_Launch",
+   "impactSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_Penetrator_Missile_Strikes_Ship"
 },
  {
    "dataName": "CerebrusNuclearTorpedoBay",
@@ -855,25 +954,24 @@
    "requiredProjectName": "Project_CerebrusNuclearTorpedoBay",
    "attackMode": true,
    "defenseMode": false,
+   "warheadClass": "Nuclear",
+   "Rocket Thrust": 351840,
+   "EV_kps": 3.23,
+   "acceleration_g": 7.47,
+   "deltaV_kps": 6.41,
    "baseWeaponMass_tons": 25,
    "cooldown_s": 7,
-   "salvo_shots": "",
-   "intraSalvoCooldown_s": "",
    "efficiency": 1,
    "flatChipping": 1,
    "magazine": 5,
-   "ammoMass_kg": 5400,
-   "fuelMass_kg": 3000,
-   "systemMass_kg": 1200,
-   "warheadMass_kg": 1200,
+   "ammoMass_kg": 4800,
+   "fuelMass_kg": 4140,
+   "systemMass_kg": 400,
+   "warheadMass_kg": 260,
    "flatDamage_MJ": 1129950000,
-   "warheadClass": "Nuclear",
-   "acceleration_g": 1.5,
-   "EV_kps": 3.23,
-   "deltaV_kps": 2.62,
-   "thrustRamp_s": 4,
-   "rotation_degps": 10,
-   "turnRamp_s": 2,
+   "thrustRamp_s": 8,
+   "rotation_degps": 20,
+   "turnRamp_s": 1,
    "maneuver_angle": 40,
    "bombardmentValue": 50,
    "targetingRange_km": 1000,
@@ -886,11 +984,9 @@
    },
    "ammoMaterials": {
       "volatiles": 0.65,
-      "metals": 0.278,
+      "metals": 0.27,
       "nobleMetals": 0.07,
-      "fissiles": 0.002,
-      "antimatter": null,
-      "exotics": ""
+      "fissiles": 0.01
    },
    "iconResource": "shipbuildericons/ICO_CerebrusNuclearTorpedoBay",
    "modelResource": "shipweapons/torpedo_launcher",
@@ -908,25 +1004,24 @@
    "requiredProjectName": "Project_HadesNuclearTorpedoBay",
    "attackMode": true,
    "defenseMode": false,
+   "warheadClass": "Nuclear",
+   "Rocket Thrust": 430215,
+   "EV_kps": 4.45,
+   "acceleration_g": 9.14,
+   "deltaV_kps": 7.7,
    "baseWeaponMass_tons": 20,
    "cooldown_s": 7,
-   "salvo_shots": "",
-   "intraSalvoCooldown_s": "",
    "efficiency": 1,
    "flatChipping": 1,
    "magazine": 5,
-   "ammoMass_kg": 5400,
-   "fuelMass_kg": 3000,
-   "systemMass_kg": 1200,
-   "warheadMass_kg": 1200,
+   "ammoMass_kg": 4800,
+   "fuelMass_kg": 3950,
+   "systemMass_kg": 400,
+   "warheadMass_kg": 450,
    "flatDamage_MJ": 2448225000,
-   "warheadClass": "Nuclear",
-   "acceleration_g": 2,
-   "EV_kps": 4.45,
-   "deltaV_kps": 3.61,
-   "thrustRamp_s": 4,
-   "rotation_degps": 10,
-   "turnRamp_s": 2,
+   "thrustRamp_s": 8,
+   "rotation_degps": 20,
+   "turnRamp_s": 1,
    "maneuver_angle": 40,
    "bombardmentValue": 100,
    "targetingRange_km": 1000,
@@ -939,11 +1034,9 @@
    },
    "ammoMaterials": {
       "volatiles": 0.62,
-      "metals": 0.298,
+      "metals": 0.29,
       "nobleMetals": 0.08,
-      "fissiles": 0.002,
-      "antimatter": null,
-      "exotics": ""
+      "fissiles": 0.01
    },
    "iconResource": "shipbuildericons/ICO_HadesNuclearTorpedoBay",
    "modelResource": "shipweapons/torpedo_launcher",
@@ -961,25 +1054,24 @@
    "requiredProjectName": "Project_NemesisNuclearTorpedoBay",
    "attackMode": true,
    "defenseMode": false,
+   "warheadClass": "Nuclear",
+   "Rocket Thrust": 230300,
+   "EV_kps": 8.18,
+   "acceleration_g": 4.89,
+   "deltaV_kps": 10.69,
    "baseWeaponMass_tons": 20,
    "cooldown_s": 7,
-   "salvo_shots": "",
-   "intraSalvoCooldown_s": "",
    "efficiency": 1,
    "flatChipping": 1,
    "magazine": 5,
-   "ammoMass_kg": 5400,
-   "fuelMass_kg": 2400,
-   "systemMass_kg": 1200,
-   "warheadMass_kg": 1800,
+   "ammoMass_kg": 4800,
+   "fuelMass_kg": 3500,
+   "systemMass_kg": 400,
+   "warheadMass_kg": 900,
    "flatDamage_MJ": 4519800000,
-   "warheadClass": "Nuclear",
-   "acceleration_g": 2.5,
-   "EV_kps": 8.72,
-   "deltaV_kps": 5.13,
    "thrustRamp_s": 5,
-   "rotation_degps": 10,
-   "turnRamp_s": 2,
+   "rotation_degps": 20,
+   "turnRamp_s": 1,
    "maneuver_angle": 40,
    "bombardmentValue": 500,
    "targetingRange_km": 1000,
@@ -994,9 +1086,7 @@
       "volatiles": 0.52,
       "metals": 0.29,
       "nobleMetals": 0.18,
-      "fissiles": 0.01,
-      "antimatter": null,
-      "exotics": ""
+      "fissiles": 0.01
    },
    "iconResource": "shipbuildericons/ICO_NemesisNuclearTorpedoBay",
    "modelResource": "shipweapons/torpedo_launcher",
@@ -1004,7 +1094,7 @@
    "impactVisualFXResource": "spaceCombat/SpaceNuke",
    "fireSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_Torpedo_Launch",
    "impactSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_Nuclear_Warhead_Detonates",
-   "notes": "1.2 KT * NTR"
+   "notes": "1.2 MT * NTR"
 },
  {
    "dataName": "OlympusNuclearTorpedoBay",
@@ -1014,25 +1104,76 @@
    "requiredProjectName": "Project_OlympusNuclearTorpedoBay",
    "attackMode": true,
    "defenseMode": false,
+   "warheadClass": "ShapedNuclear",
+   "Rocket Thrust": 230300,
+   "EV_kps": 8.18,
+   "acceleration_g": 4.89,
+   "deltaV_kps": 10.69,
    "baseWeaponMass_tons": 20,
    "cooldown_s": 7,
-   "salvo_shots": "",
-   "intraSalvoCooldown_s": "",
    "efficiency": 1,
    "flatChipping": 1,
    "magazine": 5,
-   "ammoMass_kg": 5400,
-   "fuelMass_kg": 2400,
-   "systemMass_kg": 1800,
-   "warheadMass_kg": 1200,
-   "flatDamage_MJ": 3766500000,
+   "ammoMass_kg": 4800,
+   "fuelMass_kg": 3500,
+   "systemMass_kg": 500,
+   "warheadMass_kg": 800,
+   "flatDamage_MJ": 4185000000,
+   "shapedChargeAngle": 0.2,
+   "thrustRamp_s": 5,
+   "rotation_degps": 20,
+   "turnRamp_s": 1,
+   "maneuver_angle": 40,
+   "bombardmentValue": 500,
+   "targetingRange_km": 1000,
+   "pivotRange_deg": 180,
+   "isPointDefenseTargetable": true,
+   "weightedBuildMaterials": {
+      "volatiles": 0.4,
+      "metals": 0.4,
+      "nobleMetals": 0.2
+   },
+   "ammoMaterials": {
+      "volatiles": 0.5,
+      "metals": 0.22,
+      "nobleMetals": 0.26,
+      "fissiles": 0.02
+   },
+   "iconResource": "shipbuildericons/ICO_OlympusNuclearTorpedoBay",
+   "modelResource": "shipweapons/torpedo_launcher",
+   "shotModelResource": "spacecombat/HeraTorpedo",
+   "impactVisualFXResource": "spaceCombat/CasabaHowitzer",
+   "fireSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_Torpedo_Launch",
+   "impactSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_Nuclear_Warhead_Detonates",
+   "notes": "1 MT shaped"
+},
+ {
+   "dataName": "AcheronNuclearTorpedoBay",
+   "friendlyName": "Acheron Nuclear Torpedo Bay",
+   "mount": "OneHull",
+   "crew": 6,
+   "requiredProjectName": "Project_AcheronNuclearTorpedoBay",
+   "attackMode": true,
+   "defenseMode": false,
    "warheadClass": "ShapedNuclear",
-   "acceleration_g": 2.5,
-   "EV_kps": 8.72,
-   "deltaV_kps": 5.13,
+   "Rocket Thrust": 230300,
+   "EV_kps": 8.18,
+   "acceleration_g": 4.89,
+   "deltaV_kps": 10.08,
+   "baseWeaponMass_tons": 20,
+   "cooldown_s": 7,
+   "efficiency": 1,
+   "flatChipping": 1,
+   "magazine": 5,
+   "ammoMass_kg": 4800,
+   "fuelMass_kg": 3400,
+   "systemMass_kg": 600,
+   "warheadMass_kg": 800,
+   "flatDamage_MJ": 4185000000,
+   "shapedChargeAngle": 0.15,
    "thrustRamp_s": 5,
-   "rotation_degps": 10,
-   "turnRamp_s": 2,
+   "rotation_degps": 20,
+   "turnRamp_s": 1,
    "maneuver_angle": 40,
    "bombardmentValue": 500,
    "targetingRange_km": 1000,
@@ -1044,17 +1185,118 @@
       "nobleMetals": 0.2
    },
    "ammoMaterials": {
-      "volatiles": 0.51,
-      "metals": 0.29,
-      "nobleMetals": 0.18,
+      "volatiles": 0.5,
+      "metals": 0.2,
+      "nobleMetals": 0.28,
+      "fissiles": 0.02
+   },
+   "iconResource": "shipbuildericons/ICO_AcheronNuclearTorpedoBay",
+   "modelResource": "shipweapons/torpedo_launcher",
+   "shotModelResource": "spacecombat/HeraTorpedo",
+   "impactVisualFXResource": "spaceCombat/CasabaHowitzer",
+   "fireSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_Torpedo_Launch",
+   "impactSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_Nuclear_Warhead_Detonates",
+   "notes": "1 MT shaped"
+},
+ {
+   "dataName": "TartarusNuclearTorpedoBay",
+   "friendlyName": "Tartarus Nuclear Torpedo Bay",
+   "mount": "OneHull",
+   "crew": 6,
+   "requiredProjectName": "Project_TartarusNuclearTorpedoBay",
+   "attackMode": true,
+   "defenseMode": false,
+   "warheadClass": "ShapedNuclear",
+   "Rocket Thrust": 230300,
+   "EV_kps": 8.18,
+   "acceleration_g": 4.89,
+   "deltaV_kps": 9.51,
+   "baseWeaponMass_tons": 20,
+   "cooldown_s": 7,
+   "efficiency": 1,
+   "flatChipping": 1,
+   "magazine": 5,
+   "ammoMass_kg": 4800,
+   "fuelMass_kg": 3300,
+   "systemMass_kg": 700,
+   "warheadMass_kg": 800,
+   "flatDamage_MJ": 4185000000,
+   "shapedChargeAngle": 0.125,
+   "thrustRamp_s": 5,
+   "rotation_degps": 20,
+   "turnRamp_s": 1,
+   "maneuver_angle": 40,
+   "bombardmentValue": 500,
+   "targetingRange_km": 1000,
+   "pivotRange_deg": 180,
+   "isPointDefenseTargetable": true,
+   "weightedBuildMaterials": {
+      "volatiles": 0.4,
+      "metals": 0.4,
+      "nobleMetals": 0.2
+   },
+   "ammoMaterials": {
+      "volatiles": 0.5,
+      "metals": 0.17,
+      "nobleMetals": 0.31,
+      "fissiles": 0.02
+   },
+   "iconResource": "shipbuildericons/ICO_TartarusNuclearTorpedoBay",
+   "modelResource": "shipweapons/torpedo_launcher",
+   "shotModelResource": "spacecombat/HeraTorpedo",
+   "impactVisualFXResource": "spaceCombat/CasabaHowitzer",
+   "fireSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_Torpedo_Launch",
+   "impactSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_Nuclear_Warhead_Detonates",
+   "notes": "1 MT shaped"
+},
+ {
+   "dataName": "StyxNuclearTorpedoBay",
+   "friendlyName": "Styx Nuclear Torpedo Bay",
+   "mount": "OneHull",
+   "crew": 6,
+   "requiredProjectName": "Project_StyxNuclearTorpedoBay",
+   "attackMode": true,
+   "defenseMode": false,
+   "warheadClass": "ShapedNuclear",
+   "Rocket Thrust": 230300,
+   "EV_kps": 8.18,
+   "acceleration_g": 4.89,
+   "deltaV_kps": 8.99,
+   "baseWeaponMass_tons": 20,
+   "cooldown_s": 7,
+   "efficiency": 1,
+   "flatChipping": 1,
+   "magazine": 5,
+   "ammoMass_kg": 4800,
+   "fuelMass_kg": 3200,
+   "systemMass_kg": 800,
+   "warheadMass_kg": 800,
+   "flatDamage_MJ": 4185000000,
+   "shapedChargeAngle": 0.085,
+   "thrustRamp_s": 5,
+   "rotation_degps": 20,
+   "turnRamp_s": 1,
+   "maneuver_angle": 40,
+   "bombardmentValue": 500,
+   "targetingRange_km": 1000,
+   "pivotRange_deg": 180,
+   "isPointDefenseTargetable": true,
+   "weightedBuildMaterials": {
+      "volatiles": 0.4,
+      "metals": 0.4,
+      "nobleMetals": 0.2
+   },
+   "ammoMaterials": {
+      "volatiles": 0.5,
+      "metals": 0.169,
+      "nobleMetals": 0.31,
       "fissiles": 0.02,
-      "antimatter": null,
-      "exotics": ""
+      "exotics": 0.001
    },
-   "iconResource": "shipbuildericons/ICO_OlympusNuclearTorpedoBay",
+   "iconResource": "shipbuildericons/ICO_StyxNuclearTorpedoBay",
    "modelResource": "shipweapons/torpedo_launcher",
    "shotModelResource": "spacecombat/HeraTorpedo",
-   "impactVisualFXResource": "spaceCombat/SpaceNuke",
+   "impactVisualFXResource": "spaceCombat/CasabaHowitzer",
    "fireSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_Torpedo_Launch",
    "impactSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_Nuclear_Warhead_Detonates",
    "notes": "1 MT shaped"
@@ -1062,30 +1304,29 @@
  {
    "dataName": "AntimatterTorpedoLauncher",
    "friendlyName": "Antimatter Torpedo Launcher",
-   "mount": "TwoHullHoriz",
+   "mount": "OneHull",
    "crew": 6,
    "requiredProjectName": "Project_AntimatterTorpedoLauncher",
    "attackMode": true,
    "defenseMode": false,
+   "warheadClass": "Antimatter",
+   "Rocket Thrust": 230300,
+   "EV_kps": 8.18,
+   "acceleration_g": 4.89,
+   "deltaV_kps": 14.64,
    "baseWeaponMass_tons": 50,
    "cooldown_s": 7,
-   "salvo_shots": "",
-   "intraSalvoCooldown_s": "",
    "efficiency": 1,
    "flatChipping": 0.25,
    "magazine": 5,
-   "ammoMass_kg": 5401.5,
-   "fuelMass_kg": 2499.5,
-   "systemMass_kg": 2900,
+   "ammoMass_kg": 4800,
+   "fuelMass_kg": 3998,
+   "systemMass_kg": 800,
    "warheadMass_kg": 2,
    "flatDamage_MJ": 22470010000,
-   "warheadClass": "Antimatter",
-   "acceleration_g": 2.5,
-   "EV_kps": 8.72,
-   "deltaV_kps": 5.42,
    "thrustRamp_s": 5,
-   "rotation_degps": 15,
-   "turnRamp_s": 2,
+   "rotation_degps": 20,
+   "turnRamp_s": 1,
    "maneuver_angle": 40,
    "bombardmentValue": 1000,
    "targetingRange_km": 1000,
@@ -1097,12 +1338,11 @@
       "nobleMetals": 0.2
    },
    "ammoMaterials": {
-      "volatiles": 0.51,
+      "volatiles": 0.5,
       "metals": 0.299975,
       "nobleMetals": 0.18,
       "fissiles": 0.01,
-      "antimatter": 0.000025,
-      "exotics": ""
+      "antimatter": 0.000025
    },
    "iconResource": "shipbuildericons/ICO_AntimatterTorpedoLauncher",
    "modelResource": "shipweapons/torpedo_launcher",
@@ -1120,10 +1360,13 @@
    "requiredProjectName": "Project_AlienMasterProject",
    "attackMode": true,
    "defenseMode": false,
+   "warheadClass": "Penetrator",
+   "Rocket Thrust": 300000,
+   "EV_kps": 4.45,
+   "acceleration_g": 23.89,
+   "deltaV_kps": 7.16,
    "baseWeaponMass_tons": 3,
    "cooldown_s": 6,
-   "salvo_shots": "",
-   "intraSalvoCooldown_s": "",
    "efficiency": 1,
    "flatChipping": 0.6,
    "magazine": 16,
@@ -1131,14 +1374,9 @@
    "fuelMass_kg": 1024,
    "systemMass_kg": 128,
    "warheadMass_kg": 128,
-   "flatDamage_MJ": null,
-   "warheadClass": "Penetrator",
-   "acceleration_g": 6.4,
-   "EV_kps": 4.45,
-   "deltaV_kps": 7.16,
-   "thrustRamp_s": 3,
-   "rotation_degps": 32,
-   "turnRamp_s": 2,
+   "thrustRamp_s": 5,
+   "rotation_degps": 36,
+   "turnRamp_s": 0.5,
    "maneuver_angle": 45,
    "bombardmentValue": 0,
    "targetingRange_km": 1000,
@@ -1146,24 +1384,19 @@
    "isPointDefenseTargetable": true,
    "weightedBuildMaterials": {
       "volatiles": 0.5,
-      "metals": 0.5,
-      "nobleMetals": null
+      "metals": 0.5
    },
    "ammoMaterials": {
       "volatiles": 0.7,
-      "metals": 0.15,
-      "nobleMetals": 0.15,
-      "fissiles": null,
-      "antimatter": null,
-      "exotics": ""
+      "metals": 0.2,
+      "nobleMetals": 0.1
    },
    "iconResource": "shipbuildericons/ICO_GlitteringJewelMissileBay",
    "modelResource": "shipweapons/alien_missile_launcher",
    "shotModelResource": "spacecombat/GlitteringJewelMissile",
    "impactVisualFXResource": "spaceCombat/SmallExplosion",
    "fireSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_Alien_Missile_Launch",
-   "impactSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_Penetrator_Missile_Strikes_Ship",
-   "notes": ""
+   "impactSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_Penetrator_Missile_Strikes_Ship"
 },
  {
    "dataName": "IridescentStarTorpedoBay",
@@ -1173,10 +1406,13 @@
    "requiredProjectName": "Project_AlienMasterProject",
    "attackMode": true,
    "defenseMode": false,
+   "warheadClass": "Penetrator",
+   "Rocket Thrust": 290000,
+   "EV_kps": 8.83,
+   "acceleration_g": 11.55,
+   "deltaV_kps": 14.21,
    "baseWeaponMass_tons": 10,
    "cooldown_s": 8,
-   "salvo_shots": "",
-   "intraSalvoCooldown_s": "",
    "efficiency": 1,
    "flatChipping": 0.8,
    "magazine": 8,
@@ -1184,38 +1420,156 @@
    "fuelMass_kg": 2048,
    "systemMass_kg": 256,
    "warheadMass_kg": 256,
-   "flatDamage_MJ": null,
-   "warheadClass": "Penetrator",
-   "acceleration_g": 3.2,
-   "EV_kps": 8.72,
-   "deltaV_kps": 14.03,
-   "thrustRamp_s": 3,
-   "rotation_degps": 24,
-   "turnRamp_s": 2,
-   "maneuver_angle": 40,
+   "thrustRamp_s": 5,
+   "rotation_degps": 32,
+   "turnRamp_s": 1,
+   "maneuver_angle": 35,
    "bombardmentValue": 0,
    "targetingRange_km": 1000,
    "pivotRange_deg": 180,
    "isPointDefenseTargetable": true,
    "weightedBuildMaterials": {
       "volatiles": 0.5,
-      "metals": 0.5,
-      "nobleMetals": null
+      "metals": 0.5
    },
    "ammoMaterials": {
       "volatiles": 0.85,
       "metals": 0.1,
-      "nobleMetals": 0.05,
-      "fissiles": null,
-      "antimatter": null,
-      "exotics": ""
+      "nobleMetals": 0.05
    },
    "iconResource": "shipbuildericons/ICO_IridescentStarTorpedoBay",
    "modelResource": "shipweapons/alien_torpedo_launcher",
    "shotModelResource": "spaceCombat/IridescentStarTorpedo",
    "impactVisualFXResource": "spaceCombat/BigExplosion",
    "fireSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_Alien_Torpedo_Launch",
-   "impactSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_Penetrator_Missile_Strikes_Ship",
-   "notes": ""
+   "impactSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_Penetrator_Missile_Strikes_Ship"
+},
+ {
+   "dataName": "LuminousSwarmMissileBay",
+   "friendlyName": "Luminous Swarm Missile Bay",
+   "mount": "OneHull",
+   "crew": 1,
+   "requiredProjectName": "Project_AlienMasterProject",
+   "attackMode": true,
+   "defenseMode": true,
+   "warheadClass": "Penetrator",
+   "Rocket Thrust": 145000,
+   "EV_kps": 4.45,
+   "acceleration_g": 41.99,
+   "deltaV_kps": 5.78,
+   "baseWeaponMass_tons": 10,
+   "cooldown_s": 3,
+   "salvo_shots": 8,
+   "intraSalvoCooldown_s": 1,
+   "efficiency": 1,
+   "flatChipping": 0.6,
+   "magazine": 36,
+   "ammoMass_kg": 352,
+   "fuelMass_kg": 256,
+   "systemMass_kg": 64,
+   "warheadMass_kg": 32,
+   "thrustRamp_s": 1,
+   "rotation_degps": 48,
+   "turnRamp_s": 0.25,
+   "maneuver_angle": 35,
+   "bombardmentValue": 0,
+   "targetingRange_km": 500,
+   "pivotRange_deg": 180,
+   "isPointDefenseTargetable": true,
+   "ammoMaterials": {
+      "volatiles": 0.7,
+      "metals": 0.25,
+      "nobleMetals": 0.05
+   },
+   "iconResource": "shipbuildericons/ICO_LuminousSwarmMissileBay",
+   "modelResource": "shipweapons/alien_missile_launcher",
+   "shotModelResource": "spacecombat/GlitteringJewelMissile",
+   "impactVisualFXResource": "spaceCombat/SmallExplosion",
+   "fireSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_Alien_Missile_Launch",
+   "impactSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_Penetrator_Missile_Strikes_Ship"
+},
+ {
+   "dataName": "BrilliantSkyMissileBay",
+   "friendlyName": "Brilliant Sky Missile Bay",
+   "mount": "OneHull",
+   "crew": 1,
+   "requiredProjectName": "Project_AlienAdvancedMasterProject",
+   "attackMode": true,
+   "defenseMode": false,
+   "warheadClass": "Penetrator",
+   "Rocket Thrust": 420000,
+   "EV_kps": 16,
+   "acceleration_g": 41.81,
+   "deltaV_kps": 22.18,
+   "baseWeaponMass_tons": 10,
+   "cooldown_s": 5,
+   "efficiency": 1,
+   "flatChipping": 0.6,
+   "magazine": 16,
+   "ammoMass_kg": 1024,
+   "fuelMass_kg": 768,
+   "systemMass_kg": 128,
+   "warheadMass_kg": 128,
+   "thrustRamp_s": 3,
+   "rotation_degps": 36,
+   "turnRamp_s": 0.5,
+   "maneuver_angle": 55,
+   "bombardmentValue": 0,
+   "targetingRange_km": 1200,
+   "pivotRange_deg": 180,
+   "isPointDefenseTargetable": true,
+   "ammoMaterials": {
+      "volatiles": 0.7,
+      "metals": 0.15,
+      "nobleMetals": 0.15
+   },
+   "iconResource": "shipbuildericons/ICO_BrilliantSkyMissileBay",
+   "modelResource": "shipweapons/alien_missile_launcher",
+   "shotModelResource": "spacecombat/GlitteringJewelMissile",
+   "impactVisualFXResource": "spaceCombat/SmallExplosion",
+   "fireSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_Alien_Missile_Launch",
+   "impactSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_Penetrator_Missile_Strikes_Ship"
+},
+ {
+   "dataName": "PredatoryStarTorpedoBay",
+   "friendlyName": "Predatory Star Torpedo Bay",
+   "mount": "OneHull",
+   "crew": 1,
+   "requiredProjectName": "Project_AlienAdvancedMasterProject",
+   "attackMode": true,
+   "defenseMode": false,
+   "warheadClass": "Penetrator",
+   "Rocket Thrust": 420000,
+   "EV_kps": 16,
+   "acceleration_g": 24.95,
+   "deltaV_kps": 19.35,
+   "baseWeaponMass_tons": 20,
+   "cooldown_s": 7,
+   "efficiency": 1,
+   "flatChipping": 0.8,
+   "magazine": 8,
+   "ammoMass_kg": 1716,
+   "fuelMass_kg": 1204,
+   "systemMass_kg": 256,
+   "warheadMass_kg": 256,
+   "thrustRamp_s": 4,
+   "rotation_degps": 32,
+   "turnRamp_s": 1,
+   "maneuver_angle": 30,
+   "bombardmentValue": 0,
+   "targetingRange_km": 1200,
+   "pivotRange_deg": 180,
+   "isPointDefenseTargetable": true,
+   "ammoMaterials": {
+      "volatiles": 0.85,
+      "metals": 0.1,
+      "nobleMetals": 0.05
+   },
+   "iconResource": "shipbuildericons/ICO_PredatoryStarTorpedoBay",
+   "modelResource": "shipweapons/alien_torpedo_launcher",
+   "shotModelResource": "spaceCombat/IridescentStarTorpedo",
+   "impactVisualFXResource": "spaceCombat/BigExplosion",
+   "fireSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_Alien_Torpedo_Launch",
+   "impactSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_Penetrator_Missile_Strikes_Ship"
 }
 ]
\ No newline at end of file
diff --git a/app/game/templates/TIParticleWeaponTemplate.json b/app/game/templates/TIParticleWeaponTemplate.json
index 1b90fcf..480e14a 100644
--- a/app/game/templates/TIParticleWeaponTemplate.json
+++ b/app/game/templates/TIParticleWeaponTemplate.json
@@ -1,293 +1,829 @@
 [
  {
-   "dataName": "PointDefenseParticleBeam",
-   "displayName": "Point Defense Particle Beam",
+   "dataName": "PointDefenseE-Beamer",
+   "displayName": "Point Defense E-Beamer",
    "mount": "OneHull",
    "crew": 1,
-   "requiredProjectName": "Project_PointDefenseParticleBeam",
+   "requiredProjectName": "Project_EBeamBatteries",
    "attackMode": false,
    "defenseMode": true,
-   "baseWeaponMass_tons": 3,
+   "baseWeaponMass_tons": 5,
    "cooldown_s": 4,
-   "efficiency": 0.15,
-   "shotPower_MJ": 30,
+   "efficiency": 0.2,
+   "shotPower_MJ": 5,
+   "heatFraction": 0.1,
+   "xRayFraction": 0.9,
+   "baryonFraction": 0,
    "bombardmentValue": 0,
    "targetingRange_km": 200,
-   "doublingRange_km": 100,
+   "lensRadius_cm": 5,
+   "dispersionModel": "Charged",
+   "doublingRange_km": 50,
    "pivotRange_deg": 180,
    "isPointDefenseTargetable": false,
    "weightedBuildMaterials": {
-      "water": 0.01,
-      "volatiles": 0.05,
-      "metals": 0.78,
-      "nobleMetals": 0.16,
-      "exotics": null
+      "water": 0.05,
+      "volatiles": 0.1,
+      "metals": 0.8,
+      "nobleMetals": 0.05
    },
-   "iconResource": "shipbuildericons/ICO_PointDefenseParticleBeam",
-   "effectResource": "spaceCombat/Particle Beam Cyan",
+   "iconResource": "shipbuildericons/ICO_PointDefenseE-Beamer",
+   "effectResource": "spaceCombat/Particle Beam Yellow",
    "modelResource": "shipweapons/point_defense_particle_beam_battery",
    "fireSoundFXResource": "event:/SFX/Game_SFX/Lasers/trig_SFX_Charged_Particle_Turret"
 },
  {
-   "dataName": "ParticleCannonMk1",
-   "displayName": "Particle Cannon Mk1",
+   "dataName": "LightE-BeamBattery",
+   "displayName": "Light E-Beam Battery",
+   "mount": "OneHull",
+   "crew": 1,
+   "requiredProjectName": "Project_EBeamBatteries",
+   "attackMode": true,
+   "defenseMode": true,
+   "baseWeaponMass_tons": 10,
+   "cooldown_s": 20,
+   "efficiency": 0.15,
+   "shotPower_MJ": 20,
+   "heatFraction": 0.1,
+   "xRayFraction": 0.9,
+   "baryonFraction": 0,
+   "bombardmentValue": 0,
+   "targetingRange_km": 300,
+   "lensRadius_cm": 10,
+   "dispersionModel": "Charged",
+   "doublingRange_km": 100,
+   "pivotRange_deg": 180,
+   "isPointDefenseTargetable": false,
+   "weightedBuildMaterials": {
+      "water": 0.05,
+      "volatiles": 0.1,
+      "metals": 0.8,
+      "nobleMetals": 0.05
+   },
+   "iconResource": "shipbuildericons/ICO_LightE-BeamBattery",
+   "effectResource": "spaceCombat/Particle Beam Yellow",
+   "modelResource": "shipweapons/60_generic_battery",
+   "fireSoundFXResource": "event:/SFX/Game_SFX/Lasers/trig_SFX_Charged_Particle_Turret"
+},
+ {
+   "dataName": "E-BeamBattery",
+   "displayName": "E-Beam Battery",
+   "mount": "TwoHullHoriz",
+   "crew": 2,
+   "requiredProjectName": "Project_EBeamBatteries",
+   "attackMode": true,
+   "defenseMode": true,
+   "baseWeaponMass_tons": 20,
+   "cooldown_s": 20,
+   "efficiency": 0.15,
+   "shotPower_MJ": 40,
+   "heatFraction": 0.1,
+   "xRayFraction": 0.9,
+   "baryonFraction": 0,
+   "bombardmentValue": 0,
+   "targetingRange_km": 400,
+   "lensRadius_cm": 20,
+   "dispersionModel": "Charged",
+   "doublingRange_km": 100,
+   "pivotRange_deg": 180,
+   "isPointDefenseTargetable": false,
+   "weightedBuildMaterials": {
+      "water": 0.05,
+      "volatiles": 0.1,
+      "metals": 0.8,
+      "nobleMetals": 0.05
+   },
+   "iconResource": "shipbuildericons/ICO_E-BeamBattery",
+   "effectResource": "spaceCombat/Particle Beam Yellow",
+   "modelResource": "shipweapons/120_generic_battery",
+   "fireSoundFXResource": "event:/SFX/Game_SFX/Lasers/trig_SFX_Charged_Particle_Turret"
+},
+ {
+   "dataName": "HeavyE-BeamBattery",
+   "displayName": "Heavy E-Beam Battery",
+   "mount": "FourHull",
+   "crew": 2,
+   "requiredProjectName": "Project_EBeamBatteries",
+   "attackMode": true,
+   "defenseMode": true,
+   "baseWeaponMass_tons": 40,
+   "cooldown_s": 20,
+   "efficiency": 0.15,
+   "shotPower_MJ": 80,
+   "heatFraction": 0.1,
+   "xRayFraction": 0.9,
+   "baryonFraction": 0,
+   "bombardmentValue": 0,
+   "targetingRange_km": 500,
+   "lensRadius_cm": 40,
+   "dispersionModel": "Charged",
+   "doublingRange_km": 100,
+   "pivotRange_deg": 180,
+   "isPointDefenseTargetable": false,
+   "weightedBuildMaterials": {
+      "water": 0.05,
+      "volatiles": 0.1,
+      "metals": 0.8,
+      "nobleMetals": 0.05
+   },
+   "iconResource": "shipbuildericons/ICO_HeavyE-BeamBattery",
+   "effectResource": "spaceCombat/Particle Beam Yellow",
+   "modelResource": "shipweapons/240_generic_battery",
+   "fireSoundFXResource": "event:/SFX/Game_SFX/Lasers/trig_SFX_Charged_Particle_Turret"
+},
+ {
+   "dataName": "ElectronLance",
+   "displayName": "Electron Lance",
    "mount": "TwoNoseVert",
    "crew": 2,
-   "requiredProjectName": "Project_ParticleCannonMk1",
+   "requiredProjectName": "Project_ElectronLance",
    "attackMode": true,
-   "defenseMode": false,
-   "baseWeaponMass_tons": 100,
-   "cooldown_s": 60,
-   "efficiency": 0.1,
-   "shotPower_MJ": 90,
+   "defenseMode": true,
+   "baseWeaponMass_tons": 30,
+   "cooldown_s": 20,
+   "efficiency": 0.15,
+   "shotPower_MJ": 60,
+   "heatFraction": 0.1,
+   "xRayFraction": 0.9,
+   "baryonFraction": 0,
    "bombardmentValue": 0,
-   "targetingRange_km": 250,
+   "targetingRange_km": 500,
+   "lensRadius_cm": 40,
+   "dispersionModel": "Charged",
    "doublingRange_km": 150,
    "pivotRange_deg": 30,
    "isPointDefenseTargetable": false,
    "weightedBuildMaterials": {
-      "water": 0.01,
-      "volatiles": 0.05,
-      "metals": 0.78,
-      "nobleMetals": 0.16,
-      "exotics": null
+      "water": 0.05,
+      "volatiles": 0.1,
+      "metals": 0.8,
+      "nobleMetals": 0.05
    },
-   "iconResource": "shipbuildericons/ICO_ParticleCannonMk1",
-   "effectResource": "spaceCombat/Particle Beam Cyan",
-   "modelResource": "shipweapons/particle_cannon",
+   "iconResource": "shipbuildericons/ICO_ElectronLance",
+   "effectResource": "spaceCombat/Particle Beam Yellow",
+   "modelResource": "shipweapons/960_generic_cannon",
    "fireSoundFXResource": "event:/SFX/Game_SFX/Lasers/trig_SFX_Charged_Particle_Cannon"
 },
  {
-   "dataName": "HeavyParticleCannonMk1",
-   "displayName": "Heavy Particle Cannon Mk1",
+   "dataName": "HeavyElectronLance",
+   "displayName": "Heavy Electron Lance",
    "mount": "ThreeNoseAngle",
-   "crew": 3,
-   "requiredProjectName": "Project_HeavyParticleCannonMk1",
+   "crew": 2,
+   "requiredProjectName": "Project_ElectronLance",
    "attackMode": true,
-   "defenseMode": false,
-   "baseWeaponMass_tons": 500,
-   "cooldown_s": 72,
-   "efficiency": 0.1,
+   "defenseMode": true,
+   "baseWeaponMass_tons": 60,
+   "cooldown_s": 20,
+   "efficiency": 0.15,
    "shotPower_MJ": 120,
+   "heatFraction": 0.1,
+   "xRayFraction": 0.9,
+   "baryonFraction": 0,
    "bombardmentValue": 0,
-   "targetingRange_km": 325,
+   "targetingRange_km": 600,
+   "lensRadius_cm": 80,
+   "dispersionModel": "Charged",
    "doublingRange_km": 150,
    "pivotRange_deg": 30,
    "isPointDefenseTargetable": false,
    "weightedBuildMaterials": {
-      "water": 0.01,
-      "volatiles": 0.05,
-      "metals": 0.78,
-      "nobleMetals": 0.16,
-      "exotics": null
+      "water": 0.05,
+      "volatiles": 0.1,
+      "metals": 0.8,
+      "nobleMetals": 0.05
    },
-   "iconResource": "shipbuildericons/ICO_HeavyParticleCannonMk1",
-   "effectResource": "spaceCombat/Particle Beam Cyan",
-   "modelResource": "shipweapons/particle_cannon",
+   "iconResource": "shipbuildericons/ICO_HeavyElectronLance",
+   "effectResource": "spaceCombat/Particle Beam Yellow",
+   "modelResource": "shipweapons/1440_generic_cannon",
    "fireSoundFXResource": "event:/SFX/Game_SFX/Lasers/trig_SFX_Charged_Particle_Cannon"
 },
  {
-   "dataName": "SpinalParticleCannonMk1",
-   "displayName": "Spinal Particle Cannon Mk1",
+   "dataName": "SpinalElectronLance",
+   "displayName": "Spinal Electron Lance",
    "mount": "FourNose",
-   "crew": 4,
-   "requiredProjectName": "Project_SpinalParticleCannonMk1",
+   "crew": 2,
+   "requiredProjectName": "Project_ElectronLance",
    "attackMode": true,
    "defenseMode": false,
-   "baseWeaponMass_tons": 1000,
-   "cooldown_s": 90,
-   "efficiency": 0.1,
-   "shotPower_MJ": 180,
+   "baseWeaponMass_tons": 120,
+   "cooldown_s": 20,
+   "efficiency": 0.15,
+   "shotPower_MJ": 240,
+   "heatFraction": 0.1,
+   "xRayFraction": 0.9,
+   "baryonFraction": 0,
    "bombardmentValue": 0,
-   "targetingRange_km": 400,
+   "targetingRange_km": 800,
+   "lensRadius_cm": 120,
+   "dispersionModel": "Charged",
    "doublingRange_km": 150,
    "pivotRange_deg": 30,
    "isPointDefenseTargetable": false,
    "weightedBuildMaterials": {
-      "water": 0.01,
-      "volatiles": 0.05,
-      "metals": 0.78,
-      "nobleMetals": 0.16,
-      "exotics": null
+      "water": 0.05,
+      "volatiles": 0.1,
+      "metals": 0.8,
+      "nobleMetals": 0.05
+   },
+   "iconResource": "shipbuildericons/ICO_SpinalElectronLance",
+   "effectResource": "spaceCombat/Particle Beam Yellow",
+   "modelResource": "shipweapons/1920_generic_cannon",
+   "fireSoundFXResource": "event:/SFX/Game_SFX/Lasers/trig_SFX_Charged_Particle_Cannon"
+},
+ {
+   "dataName": "PointDefenseIonBattery",
+   "displayName": "Point Defense Ion Battery",
+   "mount": "OneHull",
+   "crew": 1,
+   "requiredProjectName": "Project_IonBatteries",
+   "attackMode": false,
+   "defenseMode": true,
+   "baseWeaponMass_tons": 5,
+   "cooldown_s": 3,
+   "efficiency": 0.2,
+   "shotPower_MJ": 5,
+   "heatFraction": 0.55,
+   "xRayFraction": 0.34,
+   "baryonFraction": 0.11,
+   "bombardmentValue": 0,
+   "targetingRange_km": 200,
+   "lensRadius_cm": 5,
+   "dispersionModel": "Charged",
+   "doublingRange_km": 100,
+   "pivotRange_deg": 180,
+   "isPointDefenseTargetable": false,
+   "weightedBuildMaterials": {
+      "water": 0.05,
+      "volatiles": 0.1,
+      "metals": 0.75,
+      "nobleMetals": 0.1
    },
-   "iconResource": "shipbuildericons/ICO_SpinalParticleCannonMk1",
+   "iconResource": "shipbuildericons/ICO_PointDefenseIonBattery",
    "effectResource": "spaceCombat/Particle Beam Cyan",
-   "modelResource": "shipweapons/particle_cannon",
+   "modelResource": "shipweapons/point_defense_particle_beam_battery",
+   "fireSoundFXResource": "event:/SFX/Game_SFX/Lasers/trig_SFX_Charged_Particle_Turret"
+},
+ {
+   "dataName": "LightIonBattery",
+   "displayName": "Light Ion Battery",
+   "mount": "OneHull",
+   "crew": 1,
+   "requiredProjectName": "Project_IonBatteries",
+   "attackMode": true,
+   "defenseMode": true,
+   "baseWeaponMass_tons": 10,
+   "cooldown_s": 30,
+   "efficiency": 0.15,
+   "shotPower_MJ": 20,
+   "heatFraction": 0.55,
+   "xRayFraction": 0.34,
+   "baryonFraction": 0.11,
+   "bombardmentValue": 0,
+   "targetingRange_km": 500,
+   "lensRadius_cm": 10,
+   "dispersionModel": "Charged",
+   "doublingRange_km": 200,
+   "pivotRange_deg": 180,
+   "isPointDefenseTargetable": false,
+   "weightedBuildMaterials": {
+      "water": 0.05,
+      "volatiles": 0.1,
+      "metals": 0.75,
+      "nobleMetals": 0.1
+   },
+   "iconResource": "shipbuildericons/ICO_LightIonBattery",
+   "effectResource": "spaceCombat/Particle Beam Cyan",
+   "modelResource": "shipweapons/60_generic_battery",
+   "fireSoundFXResource": "event:/SFX/Game_SFX/Lasers/trig_SFX_Charged_Particle_Turret"
+},
+ {
+   "dataName": "IonBattery",
+   "displayName": "Ion Battery",
+   "mount": "TwoHullHoriz",
+   "crew": 2,
+   "requiredProjectName": "Project_IonBatteries",
+   "attackMode": true,
+   "defenseMode": true,
+   "baseWeaponMass_tons": 20,
+   "cooldown_s": 30,
+   "efficiency": 0.15,
+   "shotPower_MJ": 40,
+   "heatFraction": 0.55,
+   "xRayFraction": 0.34,
+   "baryonFraction": 0.11,
+   "bombardmentValue": 0,
+   "targetingRange_km": 600,
+   "lensRadius_cm": 20,
+   "dispersionModel": "Charged",
+   "doublingRange_km": 200,
+   "pivotRange_deg": 180,
+   "isPointDefenseTargetable": false,
+   "weightedBuildMaterials": {
+      "water": 0.05,
+      "volatiles": 0.1,
+      "metals": 0.75,
+      "nobleMetals": 0.1
+   },
+   "iconResource": "shipbuildericons/ICO_IonBattery",
+   "effectResource": "spaceCombat/Particle Beam Cyan",
+   "modelResource": "shipweapons/120_generic_battery",
+   "fireSoundFXResource": "event:/SFX/Game_SFX/Lasers/trig_SFX_Charged_Particle_Turret"
+},
+ {
+   "dataName": "HeavyIonBattery",
+   "displayName": "Heavy Ion Battery",
+   "mount": "FourHull",
+   "crew": 2,
+   "requiredProjectName": "Project_IonBatteries",
+   "attackMode": true,
+   "defenseMode": true,
+   "baseWeaponMass_tons": 40,
+   "cooldown_s": 30,
+   "efficiency": 0.15,
+   "shotPower_MJ": 80,
+   "heatFraction": 0.55,
+   "xRayFraction": 0.34,
+   "baryonFraction": 0.11,
+   "bombardmentValue": 0,
+   "targetingRange_km": 700,
+   "lensRadius_cm": 40,
+   "dispersionModel": "Charged",
+   "doublingRange_km": 200,
+   "pivotRange_deg": 180,
+   "isPointDefenseTargetable": false,
+   "weightedBuildMaterials": {
+      "water": 0.05,
+      "volatiles": 0.1,
+      "metals": 0.75,
+      "nobleMetals": 0.1
+   },
+   "iconResource": "shipbuildericons/ICO_HeavyIonBattery",
+   "effectResource": "spaceCombat/Particle Beam Cyan",
+   "modelResource": "shipweapons/240_generic_battery",
+   "fireSoundFXResource": "event:/SFX/Game_SFX/Lasers/trig_SFX_Charged_Particle_Turret"
+},
+ {
+   "dataName": "LightIonCannon",
+   "displayName": "Light Ion Cannon",
+   "mount": "OneNose",
+   "crew": 2,
+   "requiredProjectName": "Project_IonCannon",
+   "attackMode": true,
+   "defenseMode": true,
+   "baseWeaponMass_tons": 15,
+   "cooldown_s": 30,
+   "efficiency": 0.15,
+   "shotPower_MJ": 30,
+   "heatFraction": 0.55,
+   "xRayFraction": 0.34,
+   "baryonFraction": 0.11,
+   "bombardmentValue": 0,
+   "targetingRange_km": 500,
+   "lensRadius_cm": 20,
+   "dispersionModel": "Charged",
+   "doublingRange_km": 300,
+   "pivotRange_deg": 30,
+   "isPointDefenseTargetable": false,
+   "weightedBuildMaterials": {
+      "water": 0.05,
+      "volatiles": 0.1,
+      "metals": 0.75,
+      "nobleMetals": 0.1
+   },
+   "iconResource": "shipbuildericons/ICO_LightIonCannon",
+   "effectResource": "spaceCombat/Particle Beam Cyan",
+   "modelResource": "shipweapons/480_generic_cannon",
    "fireSoundFXResource": "event:/SFX/Game_SFX/Lasers/trig_SFX_Charged_Particle_Cannon"
 },
  {
-   "dataName": "ParticleCannonMk2",
-   "displayName": "Particle Cannon Mk2",
+   "dataName": "IonCannon",
+   "displayName": "Ion Cannon",
    "mount": "TwoNoseVert",
    "crew": 2,
-   "requiredProjectName": "Project_ParticleCannonMk2",
+   "requiredProjectName": "Project_IonCannon",
    "attackMode": true,
-   "defenseMode": false,
-   "baseWeaponMass_tons": 100,
-   "cooldown_s": 50,
+   "defenseMode": true,
+   "baseWeaponMass_tons": 30,
+   "cooldown_s": 30,
    "efficiency": 0.15,
-   "shotPower_MJ": 120,
+   "shotPower_MJ": 60,
+   "heatFraction": 0.55,
+   "xRayFraction": 0.34,
+   "baryonFraction": 0.11,
    "bombardmentValue": 0,
-   "targetingRange_km": 350,
-   "doublingRange_km": 225,
+   "targetingRange_km": 600,
+   "lensRadius_cm": 40,
+   "dispersionModel": "Charged",
+   "doublingRange_km": 300,
    "pivotRange_deg": 30,
    "isPointDefenseTargetable": false,
    "weightedBuildMaterials": {
-      "water": 0.01,
-      "volatiles": 0.05,
-      "metals": 0.78,
-      "nobleMetals": 0.16,
-      "exotics": null
+      "water": 0.05,
+      "volatiles": 0.1,
+      "metals": 0.75,
+      "nobleMetals": 0.1
    },
-   "iconResource": "shipbuildericons/ICO_ParticleCannonMk2",
+   "iconResource": "shipbuildericons/ICO_IonCannon",
    "effectResource": "spaceCombat/Particle Beam Cyan",
-   "modelResource": "shipweapons/particle_cannon",
+   "modelResource": "shipweapons/960_generic_cannon",
    "fireSoundFXResource": "event:/SFX/Game_SFX/Lasers/trig_SFX_Charged_Particle_Cannon"
 },
  {
-   "dataName": "HeavyParticleCannonMk2",
-   "displayName": "Heavy Particle Cannon Mk2",
+   "dataName": "HeavyIonCannon",
+   "displayName": "Heavy Ion Cannon",
    "mount": "ThreeNoseAngle",
-   "crew": 3,
-   "requiredProjectName": "Project_HeavyParticleCannonMk2",
+   "crew": 2,
+   "requiredProjectName": "Project_IonCannon",
    "attackMode": true,
-   "defenseMode": false,
-   "baseWeaponMass_tons": 500,
-   "cooldown_s": 60,
+   "defenseMode": true,
+   "baseWeaponMass_tons": 60,
+   "cooldown_s": 30,
    "efficiency": 0.15,
-   "shotPower_MJ": 180,
+   "shotPower_MJ": 120,
+   "heatFraction": 0.55,
+   "xRayFraction": 0.34,
+   "baryonFraction": 0.11,
    "bombardmentValue": 0,
-   "targetingRange_km": 425,
-   "doublingRange_km": 225,
+   "targetingRange_km": 700,
+   "lensRadius_cm": 80,
+   "dispersionModel": "Charged",
+   "doublingRange_km": 300,
    "pivotRange_deg": 30,
    "isPointDefenseTargetable": false,
    "weightedBuildMaterials": {
-      "water": 0.01,
-      "volatiles": 0.05,
-      "metals": 0.78,
-      "nobleMetals": 0.16,
-      "exotics": null
+      "water": 0.05,
+      "volatiles": 0.1,
+      "metals": 0.75,
+      "nobleMetals": 0.1
    },
-   "iconResource": "shipbuildericons/ICO_HeavyParticleCannonMk2",
+   "iconResource": "shipbuildericons/ICO_HeavyIonCannon",
    "effectResource": "spaceCombat/Particle Beam Cyan",
-   "modelResource": "shipweapons/particle_cannon",
+   "modelResource": "shipweapons/1440_generic_cannon",
    "fireSoundFXResource": "event:/SFX/Game_SFX/Lasers/trig_SFX_Charged_Particle_Cannon"
 },
  {
-   "dataName": "SpinalParticleCannonMk2",
-   "displayName": "Spinal Particle Cannon Mk2",
+   "dataName": "SpinalIonCannon",
+   "displayName": "Spinal Ion Cannon",
    "mount": "FourNose",
-   "crew": 4,
-   "requiredProjectName": "Project_SpinalParticleCannonMk2",
+   "crew": 2,
+   "requiredProjectName": "Project_IonCannon",
    "attackMode": true,
    "defenseMode": false,
-   "baseWeaponMass_tons": 1000,
-   "cooldown_s": 75,
+   "baseWeaponMass_tons": 120,
+   "cooldown_s": 30,
    "efficiency": 0.15,
    "shotPower_MJ": 240,
+   "heatFraction": 0.55,
+   "xRayFraction": 0.34,
+   "baryonFraction": 0.11,
    "bombardmentValue": 0,
-   "targetingRange_km": 500,
-   "doublingRange_km": 225,
+   "targetingRange_km": 850,
+   "lensRadius_cm": 160,
+   "dispersionModel": "Charged",
+   "doublingRange_km": 300,
    "pivotRange_deg": 30,
    "isPointDefenseTargetable": false,
    "weightedBuildMaterials": {
-      "water": 0.01,
-      "volatiles": 0.05,
-      "metals": 0.78,
-      "nobleMetals": 0.16,
-      "exotics": null
+      "water": 0.05,
+      "volatiles": 0.1,
+      "metals": 0.75,
+      "nobleMetals": 0.1
    },
-   "iconResource": "shipbuildericons/ICO_SpinalParticleCannonMk2",
+   "iconResource": "shipbuildericons/ICO_SpinalIonCannon",
    "effectResource": "spaceCombat/Particle Beam Cyan",
-   "modelResource": "shipweapons/particle_cannon",
+   "modelResource": "shipweapons/1920_generic_cannon",
    "fireSoundFXResource": "event:/SFX/Game_SFX/Lasers/trig_SFX_Charged_Particle_Cannon"
 },
  {
-   "dataName": "ParticleCannonMk3",
-   "displayName": "Particle Cannon Mk3",
-   "mount": "TwoNoseVert",
+   "dataName": "ParticleBeamBattery",
+   "displayName": "Particle Beam Battery",
+   "mount": "TwoHullHoriz",
    "crew": 2,
-   "requiredProjectName": "Project_ParticleCannonMk3",
+   "requiredProjectName": "Project_ParticleBeamBatteries",
    "attackMode": true,
-   "defenseMode": false,
-   "baseWeaponMass_tons": 100,
-   "cooldown_s": 40,
-   "efficiency": 0.2,
-   "shotPower_MJ": 180,
+   "defenseMode": true,
+   "baseWeaponMass_tons": 25,
+   "cooldown_s": 30,
+   "efficiency": 0.15,
+   "shotPower_MJ": 40,
+   "heatFraction": 0.55,
+   "xRayFraction": 0.34,
+   "baryonFraction": 0.11,
    "bombardmentValue": 0,
-   "targetingRange_km": 450,
-   "doublingRange_km": 300,
+   "targetingRange_km": 600,
+   "lensRadius_cm": 20,
+   "dispersionModel": "Neutral",
+   "emittance_mrad": 0.2,
+   "pivotRange_deg": 180,
+   "isPointDefenseTargetable": false,
+   "weightedBuildMaterials": {
+      "water": 0.05,
+      "volatiles": 0.1,
+      "metals": 0.7,
+      "nobleMetals": 0.15
+   },
+   "iconResource": "shipbuildericons/ICO_ParticleBeamBattery",
+   "effectResource": "spaceCombat/Particle Beam Dark Blue",
+   "modelResource": "shipweapons/120_generic_battery",
+   "fireSoundFXResource": "event:/SFX/Game_SFX/Lasers/trig_SFX_Neutral_Particle_Turret"
+},
+ {
+   "dataName": "HeavyParticleBeamBattery",
+   "displayName": "Heavy Particle Beam Battery",
+   "mount": "FourHull",
+   "crew": 2,
+   "requiredProjectName": "Project_ParticleBeamBatteries",
+   "attackMode": true,
+   "defenseMode": true,
+   "baseWeaponMass_tons": 50,
+   "cooldown_s": 30,
+   "efficiency": 0.15,
+   "shotPower_MJ": 80,
+   "heatFraction": 0.55,
+   "xRayFraction": 0.34,
+   "baryonFraction": 0.11,
+   "bombardmentValue": 0,
+   "targetingRange_km": 700,
+   "lensRadius_cm": 40,
+   "dispersionModel": "Neutral",
+   "emittance_mrad": 0.18,
+   "pivotRange_deg": 180,
+   "isPointDefenseTargetable": false,
+   "weightedBuildMaterials": {
+      "water": 0.05,
+      "volatiles": 0.1,
+      "metals": 0.7,
+      "nobleMetals": 0.15
+   },
+   "iconResource": "shipbuildericons/ICO_HeavyParticleBeamBattery",
+   "effectResource": "spaceCombat/Particle Beam Dark Blue",
+   "modelResource": "shipweapons/240_generic_battery",
+   "fireSoundFXResource": "event:/SFX/Game_SFX/Lasers/trig_SFX_Neutral_Particle_Turret"
+},
+ {
+   "dataName": "LightParticleLance",
+   "displayName": "Light Particle Lance",
+   "mount": "OneNose",
+   "crew": 3,
+   "requiredProjectName": "Project_ParticleLance",
+   "attackMode": true,
+   "defenseMode": true,
+   "baseWeaponMass_tons": 20,
+   "cooldown_s": 30,
+   "efficiency": 0.15,
+   "shotPower_MJ": 30,
+   "heatFraction": 0.55,
+   "xRayFraction": 0.34,
+   "baryonFraction": 0.11,
+   "bombardmentValue": 0,
+   "targetingRange_km": 700,
+   "lensRadius_cm": 20,
+   "dispersionModel": "Neutral",
+   "emittance_mrad": 0.2,
    "pivotRange_deg": 30,
    "isPointDefenseTargetable": false,
    "weightedBuildMaterials": {
-      "water": 0.01,
-      "volatiles": 0.05,
-      "metals": 0.78,
-      "nobleMetals": 0.16,
-      "exotics": null
+      "water": 0.05,
+      "volatiles": 0.1,
+      "metals": 0.7,
+      "nobleMetals": 0.15
    },
-   "iconResource": "shipbuildericons/ICO_ParticleCannonMk3",
-   "effectResource": "spaceCombat/Particle Beam Cyan",
-   "modelResource": "shipweapons/particle_cannon",
-   "fireSoundFXResource": "event:/SFX/Game_SFX/Lasers/trig_SFX_Charged_Particle_Cannon"
+   "iconResource": "shipbuildericons/ICO_LightParticleLance",
+   "effectResource": "spaceCombat/Particle Beam Dark Blue",
+   "modelResource": "shipweapons/480_generic_cannon",
+   "fireSoundFXResource": "event:/SFX/Game_SFX/Lasers/trig_SFX_Neutral_Particle_Cannon"
+},
+ {
+   "dataName": "ParticleLance",
+   "displayName": "Particle Lance",
+   "mount": "TwoNoseVert",
+   "crew": 3,
+   "requiredProjectName": "Project_ParticleLance",
+   "attackMode": true,
+   "defenseMode": true,
+   "baseWeaponMass_tons": 40,
+   "cooldown_s": 30,
+   "efficiency": 0.15,
+   "shotPower_MJ": 60,
+   "heatFraction": 0.55,
+   "xRayFraction": 0.34,
+   "baryonFraction": 0.11,
+   "bombardmentValue": 0,
+   "targetingRange_km": 800,
+   "lensRadius_cm": 40,
+   "dispersionModel": "Neutral",
+   "emittance_mrad": 0.18,
+   "pivotRange_deg": 30,
+   "isPointDefenseTargetable": false,
+   "weightedBuildMaterials": {
+      "water": 0.05,
+      "volatiles": 0.1,
+      "metals": 0.7,
+      "nobleMetals": 0.15
+   },
+   "iconResource": "shipbuildericons/ICO_ParticleLance",
+   "effectResource": "spaceCombat/Particle Beam Dark Blue",
+   "modelResource": "shipweapons/960_generic_cannon",
+   "fireSoundFXResource": "event:/SFX/Game_SFX/Lasers/trig_SFX_Neutral_Particle_Cannon"
 },
  {
-   "dataName": "HeavyParticleCannonMk3",
-   "displayName": "Heavy Particle Cannon Mk3",
+   "dataName": "HeavyParticleLance",
+   "displayName": "Heavy Particle Lance",
    "mount": "ThreeNoseAngle",
    "crew": 3,
-   "requiredProjectName": "Project_HeavyParticleCannonMk3",
+   "requiredProjectName": "Project_ParticleLance",
+   "attackMode": true,
+   "defenseMode": true,
+   "baseWeaponMass_tons": 80,
+   "cooldown_s": 30,
+   "efficiency": 0.15,
+   "shotPower_MJ": 120,
+   "heatFraction": 0.55,
+   "xRayFraction": 0.34,
+   "baryonFraction": 0.11,
+   "bombardmentValue": 0,
+   "targetingRange_km": 900,
+   "lensRadius_cm": 80,
+   "dispersionModel": "Neutral",
+   "emittance_mrad": 0.14,
+   "pivotRange_deg": 30,
+   "isPointDefenseTargetable": false,
+   "weightedBuildMaterials": {
+      "water": 0.05,
+      "volatiles": 0.1,
+      "metals": 0.7,
+      "nobleMetals": 0.15
+   },
+   "iconResource": "shipbuildericons/ICO_HeavyParticleLance",
+   "effectResource": "spaceCombat/Particle Beam Dark Blue",
+   "modelResource": "shipweapons/1440_generic_cannon",
+   "fireSoundFXResource": "event:/SFX/Game_SFX/Lasers/trig_SFX_Neutral_Particle_Cannon"
+},
+ {
+   "dataName": "SpinalParticleLance",
+   "displayName": "Spinal Particle Lance",
+   "mount": "FourNose",
+   "crew": 3,
+   "requiredProjectName": "Project_ParticleLance",
    "attackMode": true,
    "defenseMode": false,
-   "baseWeaponMass_tons": 500,
-   "cooldown_s": 48,
-   "efficiency": 0.2,
+   "baseWeaponMass_tons": 160,
+   "cooldown_s": 30,
+   "efficiency": 0.15,
    "shotPower_MJ": 240,
+   "heatFraction": 0.55,
+   "xRayFraction": 0.34,
+   "baryonFraction": 0.11,
    "bombardmentValue": 0,
-   "targetingRange_km": 525,
-   "doublingRange_km": 300,
+   "targetingRange_km": 1000,
+   "lensRadius_cm": 160,
+   "dispersionModel": "Neutral",
+   "emittance_mrad": 0.1,
    "pivotRange_deg": 30,
    "isPointDefenseTargetable": false,
    "weightedBuildMaterials": {
-      "water": 0.01,
-      "volatiles": 0.05,
-      "metals": 0.78,
-      "nobleMetals": 0.16,
-      "exotics": null
+      "water": 0.05,
+      "volatiles": 0.1,
+      "metals": 0.7,
+      "nobleMetals": 0.15
    },
-   "iconResource": "shipbuildericons/ICO_HeavyParticleCannonMk3",
-   "effectResource": "spaceCombat/Particle Beam Cyan",
+   "iconResource": "shipbuildericons/ICO_SpinalParticleLance",
+   "effectResource": "spaceCombat/Particle Beam Dark Blue",
+   "modelResource": "shipweapons/1920_generic_cannon",
+   "fireSoundFXResource": "event:/SFX/Game_SFX/Lasers/trig_SFX_Neutral_Particle_Cannon"
+},
+ {
+   "dataName": "AntimatterParticleCannon",
+   "displayName": "Antimatter Particle Cannon",
+   "mount": "TwoNoseVert",
+   "crew": 4,
+   "requiredProjectName": "Project_AntimatterParticleCannon",
+   "attackMode": true,
+   "defenseMode": true,
+   "baseWeaponMass_tons": 40,
+   "cooldown_s": 40,
+   "efficiency": 0.15,
+   "shotPower_MJ": 80,
+   "heatFraction": 1,
+   "xRayFraction": 1.34,
+   "baryonFraction": 0.66,
+   "bombardmentValue": 0,
+   "targetingRange_km": 800,
+   "lensRadius_cm": 40,
+   "dispersionModel": "Neutral",
+   "emittance_mrad": 0.1,
+   "pivotRange_deg": 30,
+   "isPointDefenseTargetable": false,
+   "weightedBuildMaterials": {
+      "volatiles": 0.1,
+      "metals": 0.7,
+      "nobleMetals": 0.19999999998,
+      "antimatter": 2e-11
+   },
+   "iconResource": "shipbuildericons/ICO_AntimatterParticleCannon",
+   "effectResource": "spaceCombat/Particle Beam Purple",
    "modelResource": "shipweapons/particle_cannon",
-   "fireSoundFXResource": "event:/SFX/Game_SFX/Lasers/trig_SFX_Charged_Particle_Cannon"
+   "fireSoundFXResource": "event:/SFX/Game_SFX/Lasers/trig_SFX_Neutral_Particle_Cannon"
+},
+ {
+   "dataName": "HeavyAntimatterParticleCannon",
+   "displayName": "Heavy Antimatter Particle Cannon",
+   "mount": "ThreeNoseAngle",
+   "crew": 4,
+   "requiredProjectName": "Project_AntimatterParticleCannon",
+   "attackMode": true,
+   "defenseMode": true,
+   "baseWeaponMass_tons": 120,
+   "cooldown_s": 40,
+   "efficiency": 0.15,
+   "shotPower_MJ": 160,
+   "heatFraction": 1,
+   "xRayFraction": 1.34,
+   "baryonFraction": 0.66,
+   "bombardmentValue": 0,
+   "targetingRange_km": 900,
+   "lensRadius_cm": 80,
+   "dispersionModel": "Neutral",
+   "emittance_mrad": 0.1,
+   "pivotRange_deg": 30,
+   "isPointDefenseTargetable": false,
+   "weightedBuildMaterials": {
+      "volatiles": 0.1,
+      "metals": 0.7,
+      "nobleMetals": 0.1999999999867,
+      "antimatter": 1.33e-11
+   },
+   "iconResource": "shipbuildericons/ICO_HeavyAntimatterParticleCannon",
+   "effectResource": "spaceCombat/Particle Beam Purple",
+   "modelResource": "shipweapons/particle_cannon",
+   "fireSoundFXResource": "event:/SFX/Game_SFX/Lasers/trig_SFX_Neutral_Particle_Cannon"
 },
  {
-   "dataName": "SpinalParticleCannonMk3",
-   "displayName": "Spinal Particle Cannon Mk3",
+   "dataName": "SpinalAntimatterParticleCannon",
+   "displayName": "Spinal Antimatter Particle Cannon",
    "mount": "FourNose",
    "crew": 4,
-   "requiredProjectName": "Project_SpinalParticleCannonMk3",
+   "requiredProjectName": "Project_AntimatterParticleCannon",
    "attackMode": true,
    "defenseMode": false,
-   "baseWeaponMass_tons": 1000,
+   "baseWeaponMass_tons": 240,
+   "cooldown_s": 40,
+   "efficiency": 0.15,
+   "shotPower_MJ": 320,
+   "heatFraction": 1,
+   "xRayFraction": 1.34,
+   "baryonFraction": 0.66,
+   "bombardmentValue": 0,
+   "targetingRange_km": 1000,
+   "lensRadius_cm": 160,
+   "dispersionModel": "Neutral",
+   "emittance_mrad": 0.1,
+   "pivotRange_deg": 30,
+   "isPointDefenseTargetable": false,
+   "weightedBuildMaterials": {
+      "volatiles": 0.1,
+      "metals": 0.7,
+      "nobleMetals": 0.1999999999867,
+      "antimatter": 1.33e-11
+   },
+   "iconResource": "shipbuildericons/ICO_SpinalAntimatterParticleCannon",
+   "effectResource": "spaceCombat/Particle Beam Purple",
+   "modelResource": "shipweapons/particle_cannon",
+   "fireSoundFXResource": "event:/SFX/Game_SFX/Lasers/trig_SFX_Neutral_Particle_Cannon"
+},
+ {
+   "dataName": "SpinalNeutronLance",
+   "displayName": "Spinal Neutron Lance",
+   "mount": "FourNose",
+   "crew": 8,
+   "requiredProjectName": "Project_SpinalNeutronLance",
+   "attackMode": true,
+   "defenseMode": false,
+   "baseWeaponMass_tons": 360,
    "cooldown_s": 60,
-   "efficiency": 0.2,
-   "shotPower_MJ": 360,
+   "efficiency": 0.15,
+   "shotPower_MJ": 560,
+   "heatFraction": 0,
+   "xRayFraction": 0,
+   "baryonFraction": 1,
    "bombardmentValue": 0,
-   "targetingRange_km": 600,
-   "doublingRange_km": 300,
+   "targetingRange_km": 1000,
+   "lensRadius_cm": 160,
+   "dispersionModel": "Neutral",
+   "emittance_mrad": 0.05,
    "pivotRange_deg": 30,
    "isPointDefenseTargetable": false,
    "weightedBuildMaterials": {
-      "water": 0.01,
-      "volatiles": 0.05,
-      "metals": 0.78,
-      "nobleMetals": 0.16,
-      "exotics": null
+      "water": 0.05,
+      "volatiles": 0.1,
+      "metals": 0.45,
+      "nobleMetals": 0.3,
+      "exotics": 0.1
    },
-   "iconResource": "shipbuildericons/ICO_SpinalParticleCannonMk3",
+   "iconResource": "shipbuildericons/ICO_SpinalNeutronLance",
    "effectResource": "spaceCombat/Particle Beam Cyan",
-   "modelResource": "shipweapons/particle_cannon",
-   "fireSoundFXResource": "event:/SFX/Game_SFX/Lasers/trig_SFX_Charged_Particle_Cannon"
+   "modelResource": "shipweapons/1920_generic_cannon",
+   "fireSoundFXResource": "event:/SFX/Game_SFX/Lasers/trig_SFX_Neutral_Particle_Cannon"
 },
  {
    "dataName": "AlienPointDefenseParticleBeam",
@@ -301,20 +837,24 @@
    "cooldown_s": 2,
    "efficiency": 0.2,
    "shotPower_MJ": 32,
+   "heatFraction": 0.6,
+   "xRayFraction": 0.34,
+   "baryonFraction": 0.16,
    "bombardmentValue": 0,
    "targetingRange_km": 300,
-   "doublingRange_km": 150,
+   "lensRadius_cm": 8,
+   "dispersionModel": "Neutral",
+   "emittance_mrad": 0.16,
    "pivotRange_deg": 180,
    "isPointDefenseTargetable": false,
    "weightedBuildMaterials": {
       "water": 0.01,
       "volatiles": 0.05,
       "metals": 0.8,
-      "nobleMetals": 0.14,
-      "exotics": null
+      "nobleMetals": 0.14
    },
    "iconResource": "shipbuildericons/ICO_AlienPointDefenseParticleBeam",
-   "effectResource": "spaceCombat/Particle Beam Yellow-Green",
+   "effectResource": "spaceCombat/Particle Beam White",
    "modelResource": "shipweapons/alien_point_defense_particle_beam_battery",
    "fireSoundFXResource": "event:/SFX/Game_SFX/Lasers/trig_SFX_Alien_Neutral_Particle_Turret"
 },
@@ -327,20 +867,24 @@
    "attackMode": true,
    "defenseMode": false,
    "baseWeaponMass_tons": 150,
-   "cooldown_s": 32,
+   "cooldown_s": 16,
    "efficiency": 0.2,
    "shotPower_MJ": 96,
+   "heatFraction": 0.6,
+   "xRayFraction": 0.34,
+   "baryonFraction": 0.16,
    "bombardmentValue": 0,
    "targetingRange_km": 400,
-   "doublingRange_km": 300,
+   "lensRadius_cm": 16,
+   "dispersionModel": "Neutral",
+   "emittance_mrad": 0.16,
    "pivotRange_deg": 30,
    "isPointDefenseTargetable": false,
    "weightedBuildMaterials": {
       "water": 0.01,
       "volatiles": 0.05,
       "metals": 0.8,
-      "nobleMetals": 0.14,
-      "exotics": null
+      "nobleMetals": 0.14
    },
    "iconResource": "shipbuildericons/ICO_AlienLightParticleCannon",
    "effectResource": "spaceCombat/Particle Beam Yellow-Green",
@@ -356,20 +900,24 @@
    "attackMode": true,
    "defenseMode": false,
    "baseWeaponMass_tons": 80,
-   "cooldown_s": 40,
+   "cooldown_s": 16,
    "efficiency": 0.2,
    "shotPower_MJ": 144,
+   "heatFraction": 0.6,
+   "xRayFraction": 0.34,
+   "baryonFraction": 0.16,
    "bombardmentValue": 0,
    "targetingRange_km": 450,
-   "doublingRange_km": 300,
+   "lensRadius_cm": 32,
+   "dispersionModel": "Neutral",
+   "emittance_mrad": 0.08,
    "pivotRange_deg": 30,
    "isPointDefenseTargetable": false,
    "weightedBuildMaterials": {
       "water": 0.01,
       "volatiles": 0.05,
       "metals": 0.8,
-      "nobleMetals": 0.14,
-      "exotics": null
+      "nobleMetals": 0.14
    },
    "iconResource": "shipbuildericons/ICO_AlienParticleCannon",
    "effectResource": "spaceCombat/Particle Beam Yellow-Green",
@@ -385,20 +933,24 @@
    "attackMode": true,
    "defenseMode": false,
    "baseWeaponMass_tons": 400,
-   "cooldown_s": 48,
+   "cooldown_s": 16,
    "efficiency": 0.2,
    "shotPower_MJ": 216,
+   "heatFraction": 0.6,
+   "xRayFraction": 0.34,
+   "baryonFraction": 0.16,
    "bombardmentValue": 0,
    "targetingRange_km": 525,
-   "doublingRange_km": 300,
+   "lensRadius_cm": 64,
+   "dispersionModel": "Neutral",
+   "emittance_mrad": 0.04,
    "pivotRange_deg": 30,
    "isPointDefenseTargetable": false,
    "weightedBuildMaterials": {
       "water": 0.01,
       "volatiles": 0.05,
       "metals": 0.8,
-      "nobleMetals": 0.14,
-      "exotics": null
+      "nobleMetals": 0.14
    },
    "iconResource": "shipbuildericons/ICO_AlienHeavyParticleCannon",
    "effectResource": "spaceCombat/Particle Beam Yellow-Green",
@@ -414,20 +966,24 @@
    "attackMode": true,
    "defenseMode": false,
    "baseWeaponMass_tons": 800,
-   "cooldown_s": 60,
+   "cooldown_s": 16,
    "efficiency": 0.2,
    "shotPower_MJ": 324,
+   "heatFraction": 0.6,
+   "xRayFraction": 0.34,
+   "baryonFraction": 0.16,
    "bombardmentValue": 0,
    "targetingRange_km": 600,
-   "doublingRange_km": 300,
+   "lensRadius_cm": 128,
+   "dispersionModel": "Neutral",
+   "emittance_mrad": 0.02,
    "pivotRange_deg": 30,
    "isPointDefenseTargetable": false,
    "weightedBuildMaterials": {
       "water": 0.01,
       "volatiles": 0.05,
       "metals": 0.8,
-      "nobleMetals": 0.14,
-      "exotics": null
+      "nobleMetals": 0.14
    },
    "iconResource": "shipbuildericons/ICO_AlienSpinalParticleCannon",
    "effectResource": "spaceCombat/Particle Beam Yellow-Green",
@@ -443,13 +999,18 @@
    "attackMode": true,
    "defenseMode": false,
    "baseWeaponMass_tons": 1200,
-   "cooldown_s": 75,
+   "cooldown_s": 240,
    "efficiency": 0.1,
-   "shotPower_MJ": 360,
+   "shotPower_MJ": 1024,
+   "heatFraction": 0.6,
+   "xRayFraction": 0.34,
+   "baryonFraction": 0.16,
    "bombardmentValue": 0,
    "targetingRange_km": 1200,
-   "doublingRange_km": 1200,
-   "pivotRange_deg": 30,
+   "lensRadius_cm": 256,
+   "dispersionModel": "Neutral",
+   "emittance_mrad": 0.01,
+   "pivotRange_deg": 20,
    "isPointDefenseTargetable": false,
    "weightedBuildMaterials": {
       "water": 0.01,
diff --git a/app/game/templates/TIPlasmaWeaponTemplate.json b/app/game/templates/TIPlasmaWeaponTemplate.json
index c1fdd3f..03d3cb7 100644
--- a/app/game/templates/TIPlasmaWeaponTemplate.json
+++ b/app/game/templates/TIPlasmaWeaponTemplate.json
@@ -10,24 +10,21 @@
    "defenseMode": false,
    "baseWeaponMass_tons": 320,
    "cooldown_s": 30,
-   "salvo_shots": "",
-   "intraSalvoCooldown_s": "",
    "efficiency": 0.3,
-   "flatChipping": 0.2,
+   "flatChipping": 0.8,
    "chargingEnergy_MJ": 20,
    "magazine": 500,
    "ammoMass_kg": 0,
-   "muzzleVelocity_kps": 35,
+   "muzzleVelocity_kps": 30,
    "bombardmentValue": 0,
-   "targetingRange_km": 800,
+   "targetingRange_km": 500,
    "pivotRange_deg": 180,
    "isPointDefenseTargetable": false,
    "warheadMass_kg": 0.3,
    "weightedBuildMaterials": {
       "volatiles": 0.1,
       "metals": 0.5,
-      "nobleMetals": 0.4,
-      "exotics": null
+      "nobleMetals": 0.4
    },
    "iconResource": "shipbuildericons/ICO_PlasmaBatteryMk1",
    "modelResource": "shipweapons/medium_plasma_battery",
@@ -35,189 +32,176 @@
    "impactVisualFXResource": "spaceCombat/ImpactGreen",
    "fireSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_Plasma_Turret",
    "impactSoundFXResource": "event:/SFX/Game_SFX/Ship_Fire_Impacts/trig_SFX_BlasterLongMuffledLow003MonoRR",
-   "expectedDamage_MJ": 183.75
+   "expectedDamage_MJ": 135
 },
  {
-   "dataName": "HeavyPlasmaBatteryMk1",
-   "displayName": "Heavy Plasma Battery Mk 1",
-   "mount": "FourHull",
-   "requiredProjectName": "Project_HeavyPlasmaBatteryMk1",
-   "crew": 5,
-   "sort": 2,
+   "dataName": "PlasmaBatteryMk2",
+   "displayName": "Plasma Battery Mk 2",
+   "mount": "TwoHullHoriz",
+   "requiredProjectName": "Project_PlasmaBatteryMk2",
+   "crew": 4,
+   "sort": 3,
    "attackMode": true,
    "defenseMode": false,
-   "baseWeaponMass_tons": 640,
-   "cooldown_s": 36,
-   "salvo_shots": "",
-   "intraSalvoCooldown_s": "",
-   "efficiency": 0.2,
-   "flatChipping": 0.2,
-   "chargingEnergy_MJ": 40,
-   "magazine": 600,
+   "baseWeaponMass_tons": 280,
+   "cooldown_s": 25,
+   "efficiency": 0.4,
+   "flatChipping": 0.8,
+   "chargingEnergy_MJ": 15,
+   "magazine": 500,
    "ammoMass_kg": 0,
-   "muzzleVelocity_kps": 35,
+   "muzzleVelocity_kps": 30,
    "bombardmentValue": 0,
-   "targetingRange_km": 1000,
+   "targetingRange_km": 600,
    "pivotRange_deg": 180,
    "isPointDefenseTargetable": false,
-   "warheadMass_kg": 0.5,
+   "warheadMass_kg": 0.3,
    "weightedBuildMaterials": {
       "volatiles": 0.1,
       "metals": 0.5,
-      "nobleMetals": 0.4,
-      "exotics": null
+      "nobleMetals": 0.4
    },
-   "iconResource": "shipbuildericons/ICO_HeavyPlasmaBatteryMk1",
-   "modelResource": "shipweapons/large_plasma_battery",
+   "iconResource": "shipbuildericons/ICO_PlasmaBatteryMk2",
+   "modelResource": "shipweapons/medium_plasma_battery",
    "shotModelResource": "spaceCombat/BulletPlasma",
    "impactVisualFXResource": "spaceCombat/ImpactGreen",
    "fireSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_Plasma_Turret",
    "impactSoundFXResource": "event:/SFX/Game_SFX/Ship_Fire_Impacts/trig_SFX_BlasterLongMuffledLow003MonoRR",
-   "expectedDamage_MJ": 306.25
+   "expectedDamage_MJ": 135
 },
  {
-   "dataName": "PlasmaBatteryMk2",
-   "displayName": "Plasma Battery Mk 2",
+   "dataName": "PlasmaBatteryMk3",
+   "displayName": "Plasma Battery Mk 3",
    "mount": "TwoHullHoriz",
-   "requiredProjectName": "Project_PlasmaBatteryMk2",
+   "requiredProjectName": "Project_PlasmaBatteryMk3",
    "crew": 4,
-   "sort": 3,
+   "sort": 5,
    "attackMode": true,
    "defenseMode": false,
-   "baseWeaponMass_tons": 280,
-   "cooldown_s": 25,
-   "salvo_shots": "",
-   "intraSalvoCooldown_s": "",
-   "efficiency": 0.4,
-   "flatChipping": 0.2,
-   "chargingEnergy_MJ": 15,
+   "baseWeaponMass_tons": 240,
+   "cooldown_s": 20,
+   "efficiency": 0.5,
+   "flatChipping": 0.8,
+   "chargingEnergy_MJ": 10,
    "magazine": 500,
    "ammoMass_kg": 0,
-   "muzzleVelocity_kps": 35,
+   "muzzleVelocity_kps": 30,
    "bombardmentValue": 0,
-   "targetingRange_km": 800,
+   "targetingRange_km": 700,
    "pivotRange_deg": 180,
    "isPointDefenseTargetable": false,
    "warheadMass_kg": 0.3,
    "weightedBuildMaterials": {
       "volatiles": 0.1,
       "metals": 0.5,
-      "nobleMetals": 0.4,
-      "exotics": null
+      "nobleMetals": 0.35,
+      "exotics": 0.05
    },
-   "iconResource": "shipbuildericons/ICO_PlasmaBatteryMk2",
+   "iconResource": "shipbuildericons/ICO_PlasmaBatteryMk3",
    "modelResource": "shipweapons/medium_plasma_battery",
    "shotModelResource": "spaceCombat/BulletPlasma",
    "impactVisualFXResource": "spaceCombat/ImpactGreen",
    "fireSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_Plasma_Turret",
    "impactSoundFXResource": "event:/SFX/Game_SFX/Ship_Fire_Impacts/trig_SFX_BlasterLongMuffledLow003MonoRR",
-   "expectedDamage_MJ": 183.75
+   "expectedDamage_MJ": 135
 },
  {
-   "dataName": "HeavyPlasmaBatteryMk2",
-   "displayName": "Heavy Plasma Battery Mk 2",
+   "dataName": "HeavyPlasmaBatteryMk1",
+   "displayName": "Heavy Plasma Battery Mk 1",
    "mount": "FourHull",
-   "requiredProjectName": "Project_HeavyPlasmaBatteryMk2",
+   "requiredProjectName": "Project_PlasmaBatteryMk1",
    "crew": 5,
-   "sort": 4,
+   "sort": 2,
    "attackMode": true,
    "defenseMode": false,
-   "baseWeaponMass_tons": 560,
-   "cooldown_s": 30,
-   "salvo_shots": "",
-   "intraSalvoCooldown_s": "",
-   "efficiency": 0.3,
-   "flatChipping": 0.2,
-   "chargingEnergy_MJ": 30,
+   "baseWeaponMass_tons": 640,
+   "cooldown_s": 36,
+   "efficiency": 0.2,
+   "flatChipping": 0.8,
+   "chargingEnergy_MJ": 40,
    "magazine": 600,
    "ammoMass_kg": 0,
-   "muzzleVelocity_kps": 35,
+   "muzzleVelocity_kps": 32,
    "bombardmentValue": 0,
-   "targetingRange_km": 1000,
+   "targetingRange_km": 600,
    "pivotRange_deg": 180,
    "isPointDefenseTargetable": false,
    "warheadMass_kg": 0.5,
    "weightedBuildMaterials": {
       "volatiles": 0.1,
       "metals": 0.5,
-      "nobleMetals": 0.4,
-      "exotics": null
+      "nobleMetals": 0.4
    },
-   "iconResource": "shipbuildericons/ICO_HeavyPlasmaBatteryMk2",
+   "iconResource": "shipbuildericons/ICO_HeavyPlasmaBatteryMk1",
    "modelResource": "shipweapons/large_plasma_battery",
    "shotModelResource": "spaceCombat/BulletPlasma",
    "impactVisualFXResource": "spaceCombat/ImpactGreen",
    "fireSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_Plasma_Turret",
    "impactSoundFXResource": "event:/SFX/Game_SFX/Ship_Fire_Impacts/trig_SFX_BlasterLongMuffledLow003MonoRR",
-   "expectedDamage_MJ": 306.25
+   "expectedDamage_MJ": 256
 },
  {
-   "dataName": "PlasmaBatteryMk3",
-   "displayName": "Plasma Battery Mk 3",
-   "mount": "TwoHullHoriz",
-   "requiredProjectName": "Project_PlasmaBatteryMk3",
-   "crew": 4,
-   "sort": 5,
+   "dataName": "HeavyPlasmaBatteryMk2",
+   "displayName": "Heavy Plasma Battery Mk 2",
+   "mount": "FourHull",
+   "requiredProjectName": "Project_PlasmaBatteryMk2",
+   "crew": 5,
+   "sort": 4,
    "attackMode": true,
    "defenseMode": false,
-   "baseWeaponMass_tons": 240,
-   "cooldown_s": 20,
-   "salvo_shots": "",
-   "intraSalvoCooldown_s": "",
-   "efficiency": 0.5,
-   "flatChipping": 0.2,
-   "chargingEnergy_MJ": 10,
-   "magazine": 500,
+   "baseWeaponMass_tons": 560,
+   "cooldown_s": 30,
+   "efficiency": 0.3,
+   "flatChipping": 0.8,
+   "chargingEnergy_MJ": 30,
+   "magazine": 600,
    "ammoMass_kg": 0,
-   "muzzleVelocity_kps": 35,
+   "muzzleVelocity_kps": 32,
    "bombardmentValue": 0,
-   "targetingRange_km": 800,
+   "targetingRange_km": 700,
    "pivotRange_deg": 180,
    "isPointDefenseTargetable": false,
-   "warheadMass_kg": 0.3,
+   "warheadMass_kg": 0.5,
    "weightedBuildMaterials": {
       "volatiles": 0.1,
       "metals": 0.5,
-      "nobleMetals": 0.38,
-      "exotics": 0.02
+      "nobleMetals": 0.4
    },
-   "iconResource": "shipbuildericons/ICO_PlasmaBatteryMk3",
-   "modelResource": "shipweapons/medium_plasma_battery",
+   "iconResource": "shipbuildericons/ICO_HeavyPlasmaBatteryMk2",
+   "modelResource": "shipweapons/large_plasma_battery",
    "shotModelResource": "spaceCombat/BulletPlasma",
    "impactVisualFXResource": "spaceCombat/ImpactGreen",
    "fireSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_Plasma_Turret",
    "impactSoundFXResource": "event:/SFX/Game_SFX/Ship_Fire_Impacts/trig_SFX_BlasterLongMuffledLow003MonoRR",
-   "expectedDamage_MJ": 183.75
+   "expectedDamage_MJ": 256
 },
  {
    "dataName": "HeavyPlasmaBatteryMk3",
    "displayName": "Heavy Plasma Battery Mk 3",
    "mount": "FourHull",
-   "requiredProjectName": "Project_HeavyPlasmaBatteryMk3",
+   "requiredProjectName": "Project_PlasmaBatteryMk3",
    "crew": 5,
    "sort": 6,
    "attackMode": true,
    "defenseMode": false,
    "baseWeaponMass_tons": 480,
    "cooldown_s": 24,
-   "salvo_shots": "",
-   "intraSalvoCooldown_s": "",
    "efficiency": 0.4,
-   "flatChipping": 0.2,
+   "flatChipping": 0.8,
    "chargingEnergy_MJ": 20,
    "magazine": 600,
    "ammoMass_kg": 0,
-   "muzzleVelocity_kps": 35,
+   "muzzleVelocity_kps": 32,
    "bombardmentValue": 0,
-   "targetingRange_km": 1000,
+   "targetingRange_km": 800,
    "pivotRange_deg": 180,
    "isPointDefenseTargetable": false,
    "warheadMass_kg": 0.5,
    "weightedBuildMaterials": {
       "volatiles": 0.1,
       "metals": 0.5,
-      "nobleMetals": 0.38,
-      "exotics": 0.02
+      "nobleMetals": 0.35,
+      "exotics": 0.05
    },
    "iconResource": "shipbuildericons/ICO_HeavyPlasmaBatteryMk3",
    "modelResource": "shipweapons/large_plasma_battery",
@@ -225,7 +209,7 @@
    "impactVisualFXResource": "spaceCombat/ImpactGreen",
    "fireSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_Plasma_Turret",
    "impactSoundFXResource": "event:/SFX/Game_SFX/Ship_Fire_Impacts/trig_SFX_BlasterLongMuffledLow003MonoRR",
-   "expectedDamage_MJ": 306.25
+   "expectedDamage_MJ": 256
 },
  {
    "dataName": "PlasmaCannonMk1",
@@ -238,10 +222,8 @@
    "defenseMode": false,
    "baseWeaponMass_tons": 540,
    "cooldown_s": 48,
-   "salvo_shots": "",
-   "intraSalvoCooldown_s": "",
    "efficiency": 0.25,
-   "flatChipping": 0.2,
+   "flatChipping": 0.8,
    "chargingEnergy_MJ": 40,
    "magazine": 300,
    "ammoMass_kg": 0,
@@ -250,12 +232,11 @@
    "targetingRange_km": 800,
    "pivotRange_deg": 30,
    "isPointDefenseTargetable": false,
-   "warheadMass_kg": 0.75,
+   "warheadMass_kg": 0.7,
    "weightedBuildMaterials": {
       "volatiles": 0.1,
       "metals": 0.5,
-      "nobleMetals": 0.4,
-      "exotics": null
+      "nobleMetals": 0.4
    },
    "iconResource": "shipbuildericons/ICO_PlasmaCannonMk1",
    "modelResource": "shipweapons/large_plasma_cannon",
@@ -263,175 +244,162 @@
    "impactVisualFXResource": "spaceCombat/ImpactGreen",
    "fireSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_Plasma_Cannon",
    "impactSoundFXResource": "event:/SFX/Game_SFX/Ship_Fire_Impacts/trig_SFX_BlasterLongMuffledLow008MonoRR",
-   "expectedDamage_MJ": 459.375
+   "expectedDamage_MJ": 428.75
 },
  {
-   "dataName": "HeavyPlasmaCannonMk1",
-   "displayName": "Heavy Plasma Cannon Mk 1",
-   "mount": "FourNose",
-   "requiredProjectName": "Project_HeavyPlasmaCannonMk1",
-   "crew": 6,
-   "sort": 8,
+   "dataName": "PlasmaCannonMk2",
+   "displayName": "Plasma Cannon Mk 2",
+   "mount": "ThreeNoseAngle",
+   "requiredProjectName": "Project_PlasmaCannonMk2",
+   "crew": 5,
+   "sort": 9,
    "attackMode": true,
    "defenseMode": false,
-   "baseWeaponMass_tons": 720,
-   "cooldown_s": 60,
-   "salvo_shots": "",
-   "intraSalvoCooldown_s": "",
-   "efficiency": 0.2,
-   "flatChipping": 0.2,
-   "chargingEnergy_MJ": 60,
+   "baseWeaponMass_tons": 480,
+   "cooldown_s": 40,
+   "efficiency": 0.35,
+   "flatChipping": 0.8,
+   "chargingEnergy_MJ": 30,
    "magazine": 300,
    "ammoMass_kg": 0,
    "muzzleVelocity_kps": 35,
    "bombardmentValue": 0,
-   "targetingRange_km": 1000,
+   "targetingRange_km": 900,
    "pivotRange_deg": 30,
    "isPointDefenseTargetable": false,
-   "warheadMass_kg": 1,
+   "warheadMass_kg": 0.7,
    "weightedBuildMaterials": {
       "volatiles": 0.1,
       "metals": 0.5,
-      "nobleMetals": 0.4,
-      "exotics": null
+      "nobleMetals": 0.4
    },
-   "iconResource": "shipbuildericons/ICO_HeavyPlasmaCannonMk1",
-   "modelResource": "shipweapons/huge_plasma_cannon",
+   "iconResource": "shipbuildericons/ICO_PlasmaCannonMk2",
+   "modelResource": "shipweapons/large_plasma_cannon",
    "shotModelResource": "spaceCombat/BulletPlasma",
    "impactVisualFXResource": "spaceCombat/ImpactGreen",
    "fireSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_Plasma_Cannon",
    "impactSoundFXResource": "event:/SFX/Game_SFX/Ship_Fire_Impacts/trig_SFX_BlasterLongMuffledLow008MonoRR",
-   "expectedDamage_MJ": 612.5
+   "expectedDamage_MJ": 428.75
 },
  {
-   "dataName": "PlasmaCannonMk2",
-   "displayName": "Plasma Cannon Mk 2",
+   "dataName": "PlasmaCannonMk3",
+   "displayName": "Plasma Cannon Mk 3",
    "mount": "ThreeNoseAngle",
-   "requiredProjectName": "Project_PlasmaCannonMk2",
+   "requiredProjectName": "Project_PlasmaCannonMk3",
    "crew": 5,
-   "sort": 9,
+   "sort": 11,
    "attackMode": true,
    "defenseMode": false,
-   "baseWeaponMass_tons": 480,
-   "cooldown_s": 40,
-   "salvo_shots": "",
-   "intraSalvoCooldown_s": "",
-   "efficiency": 0.35,
-   "flatChipping": 0.2,
-   "chargingEnergy_MJ": 30,
+   "baseWeaponMass_tons": 420,
+   "cooldown_s": 32,
+   "efficiency": 0.45,
+   "flatChipping": 0.8,
+   "chargingEnergy_MJ": 20,
    "magazine": 300,
    "ammoMass_kg": 0,
    "muzzleVelocity_kps": 35,
    "bombardmentValue": 0,
-   "targetingRange_km": 800,
+   "targetingRange_km": 1000,
    "pivotRange_deg": 30,
    "isPointDefenseTargetable": false,
-   "warheadMass_kg": 0.75,
+   "warheadMass_kg": 0.7,
    "weightedBuildMaterials": {
       "volatiles": 0.1,
       "metals": 0.5,
-      "nobleMetals": 0.4,
-      "exotics": null
+      "nobleMetals": 0.35,
+      "exotics": 0.05
    },
-   "iconResource": "shipbuildericons/ICO_PlasmaCannonMk2",
+   "iconResource": "shipbuildericons/ICO_PlasmaCannonMk3",
    "modelResource": "shipweapons/large_plasma_cannon",
    "shotModelResource": "spaceCombat/BulletPlasma",
    "impactVisualFXResource": "spaceCombat/ImpactGreen",
    "fireSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_Plasma_Cannon",
    "impactSoundFXResource": "event:/SFX/Game_SFX/Ship_Fire_Impacts/trig_SFX_BlasterLongMuffledLow008MonoRR",
-   "expectedDamage_MJ": 459.375
+   "expectedDamage_MJ": 428.75
 },
  {
-   "dataName": "HeavyPlasmaCannonMk2",
-   "displayName": "Heavy Plasma Cannon Mk 2",
+   "dataName": "HeavyPlasmaCannonMk1",
+   "displayName": "Heavy Plasma Cannon Mk 1",
    "mount": "FourNose",
-   "requiredProjectName": "Project_HeavyPlasmaCannonMk2",
+   "requiredProjectName": "Project_PlasmaCannonMk1",
    "crew": 6,
-   "sort": 10,
+   "sort": 8,
    "attackMode": true,
    "defenseMode": false,
-   "baseWeaponMass_tons": 640,
-   "cooldown_s": 50,
-   "salvo_shots": "",
-   "intraSalvoCooldown_s": "",
-   "efficiency": 0.3,
-   "flatChipping": 0.2,
-   "chargingEnergy_MJ": 45,
+   "baseWeaponMass_tons": 720,
+   "cooldown_s": 60,
+   "efficiency": 0.2,
+   "flatChipping": 0.8,
+   "chargingEnergy_MJ": 60,
    "magazine": 300,
    "ammoMass_kg": 0,
    "muzzleVelocity_kps": 35,
    "bombardmentValue": 0,
-   "targetingRange_km": 1000,
+   "targetingRange_km": 800,
    "pivotRange_deg": 30,
    "isPointDefenseTargetable": false,
-   "warheadMass_kg": 1,
+   "warheadMass_kg": 0.9,
    "weightedBuildMaterials": {
       "volatiles": 0.1,
       "metals": 0.5,
-      "nobleMetals": 0.4,
-      "exotics": null
+      "nobleMetals": 0.4
    },
-   "iconResource": "shipbuildericons/ICO_HeavyPlasmaCannonMk2",
+   "iconResource": "shipbuildericons/ICO_HeavyPlasmaCannonMk1",
    "modelResource": "shipweapons/huge_plasma_cannon",
    "shotModelResource": "spaceCombat/BulletPlasma",
    "impactVisualFXResource": "spaceCombat/ImpactGreen",
    "fireSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_Plasma_Cannon",
    "impactSoundFXResource": "event:/SFX/Game_SFX/Ship_Fire_Impacts/trig_SFX_BlasterLongMuffledLow008MonoRR",
-   "expectedDamage_MJ": 612.5
+   "expectedDamage_MJ": 551.25
 },
  {
-   "dataName": "PlasmaCannonMk3",
-   "displayName": "Plasma Cannon Mk 3",
-   "mount": "ThreeNoseAngle",
-   "requiredProjectName": "Project_PlasmaCannonMk3",
-   "crew": 5,
-   "sort": 11,
+   "dataName": "HeavyPlasmaCannonMk2",
+   "displayName": "Heavy Plasma Cannon Mk 2",
+   "mount": "FourNose",
+   "requiredProjectName": "Project_PlasmaCannonMk2",
+   "crew": 6,
+   "sort": 10,
    "attackMode": true,
    "defenseMode": false,
-   "baseWeaponMass_tons": 420,
-   "cooldown_s": 32,
-   "salvo_shots": "",
-   "intraSalvoCooldown_s": "",
-   "efficiency": 0.45,
-   "flatChipping": 0.2,
-   "chargingEnergy_MJ": 20,
+   "baseWeaponMass_tons": 640,
+   "cooldown_s": 50,
+   "efficiency": 0.3,
+   "flatChipping": 0.8,
+   "chargingEnergy_MJ": 45,
    "magazine": 300,
    "ammoMass_kg": 0,
    "muzzleVelocity_kps": 35,
    "bombardmentValue": 0,
-   "targetingRange_km": 800,
+   "targetingRange_km": 900,
    "pivotRange_deg": 30,
    "isPointDefenseTargetable": false,
-   "warheadMass_kg": 0.75,
+   "warheadMass_kg": 0.9,
    "weightedBuildMaterials": {
       "volatiles": 0.1,
       "metals": 0.5,
-      "nobleMetals": 0.38,
-      "exotics": 0.02
+      "nobleMetals": 0.4
    },
-   "iconResource": "shipbuildericons/ICO_PlasmaCannonMk3",
-   "modelResource": "shipweapons/large_plasma_cannon",
+   "iconResource": "shipbuildericons/ICO_HeavyPlasmaCannonMk2",
+   "modelResource": "shipweapons/huge_plasma_cannon",
    "shotModelResource": "spaceCombat/BulletPlasma",
    "impactVisualFXResource": "spaceCombat/ImpactGreen",
    "fireSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_Plasma_Cannon",
    "impactSoundFXResource": "event:/SFX/Game_SFX/Ship_Fire_Impacts/trig_SFX_BlasterLongMuffledLow008MonoRR",
-   "expectedDamage_MJ": 459.375
+   "expectedDamage_MJ": 551.25
 },
  {
    "dataName": "HeavyPlasmaCannonMk3",
    "displayName": "Heavy Plasma Cannon Mk 3",
    "mount": "FourNose",
-   "requiredProjectName": "Project_HeavyPlasmaCannonMk3",
+   "requiredProjectName": "Project_PlasmaCannonMk3",
    "crew": 6,
    "sort": 12,
    "attackMode": true,
    "defenseMode": false,
    "baseWeaponMass_tons": 560,
    "cooldown_s": 40,
-   "salvo_shots": "",
-   "intraSalvoCooldown_s": "",
    "efficiency": 0.4,
-   "flatChipping": 0.2,
+   "flatChipping": 0.8,
    "chargingEnergy_MJ": 30,
    "magazine": 300,
    "ammoMass_kg": 0,
@@ -440,7 +408,7 @@
    "targetingRange_km": 1000,
    "pivotRange_deg": 30,
    "isPointDefenseTargetable": false,
-   "warheadMass_kg": 1,
+   "warheadMass_kg": 0.9,
    "weightedBuildMaterials": {
       "volatiles": 0.1,
       "metals": 0.5,
@@ -453,7 +421,7 @@
    "impactVisualFXResource": "spaceCombat/ImpactGreen",
    "fireSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_Plasma_Cannon",
    "impactSoundFXResource": "event:/SFX/Game_SFX/Ship_Fire_Impacts/trig_SFX_BlasterLongMuffledLow008MonoRR",
-   "expectedDamage_MJ": 612.5
+   "expectedDamage_MJ": 551.25
 },
  {
    "dataName": "AlienPlasmaBattery",
@@ -466,16 +434,14 @@
    "defenseMode": false,
    "baseWeaponMass_tons": 200,
    "cooldown_s": 20,
-   "salvo_shots": "",
-   "intraSalvoCooldown_s": "",
    "efficiency": 0.5,
-   "flatChipping": 0.2,
+   "flatChipping": 0.8,
    "chargingEnergy_MJ": 10,
    "magazine": 500,
    "ammoMass_kg": 0,
    "muzzleVelocity_kps": 42,
    "bombardmentValue": 0,
-   "targetingRange_km": 1000,
+   "targetingRange_km": 900,
    "pivotRange_deg": 180,
    "isPointDefenseTargetable": false,
    "warheadMass_kg": 0.3,
@@ -504,16 +470,14 @@
    "defenseMode": false,
    "baseWeaponMass_tons": 400,
    "cooldown_s": 24,
-   "salvo_shots": "",
-   "intraSalvoCooldown_s": "",
    "efficiency": 0.4,
-   "flatChipping": 0.2,
+   "flatChipping": 0.8,
    "chargingEnergy_MJ": 20,
    "magazine": 600,
    "ammoMass_kg": 0,
    "muzzleVelocity_kps": 42,
    "bombardmentValue": 0,
-   "targetingRange_km": 1200,
+   "targetingRange_km": 1000,
    "pivotRange_deg": 180,
    "isPointDefenseTargetable": false,
    "warheadMass_kg": 0.5,
@@ -542,10 +506,8 @@
    "defenseMode": false,
    "baseWeaponMass_tons": 390,
    "cooldown_s": 32,
-   "salvo_shots": "",
-   "intraSalvoCooldown_s": "",
    "efficiency": 0.45,
-   "flatChipping": 0.2,
+   "flatChipping": 0.8,
    "chargingEnergy_MJ": 20,
    "magazine": 300,
    "ammoMass_kg": 0,
@@ -554,7 +516,7 @@
    "targetingRange_km": 1100,
    "pivotRange_deg": 30,
    "isPointDefenseTargetable": false,
-   "warheadMass_kg": 0.75,
+   "warheadMass_kg": 0.7,
    "weightedBuildMaterials": {
       "volatiles": 0.1,
       "metals": 0.5,
@@ -567,7 +529,7 @@
    "impactVisualFXResource": "spaceCombat/ImpactGreen",
    "fireSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_Alien_Plasma_Cannon",
    "impactSoundFXResource": "event:/SFX/Game_SFX/Ship_Fire_Impacts/trig_SFX_BlasterLongMuffledLow018MonoRR",
-   "expectedDamage_MJ": 661.5
+   "expectedDamage_MJ": 617.4
 },
  {
    "dataName": "AlienHeavyPlasmaCannon",
@@ -580,10 +542,8 @@
    "defenseMode": false,
    "baseWeaponMass_tons": 520,
    "cooldown_s": 40,
-   "salvo_shots": "",
-   "intraSalvoCooldown_s": "",
    "efficiency": 0.4,
-   "flatChipping": 0.2,
+   "flatChipping": 0.8,
    "chargingEnergy_MJ": 30,
    "magazine": 300,
    "ammoMass_kg": 0,
@@ -592,7 +552,7 @@
    "targetingRange_km": 1200,
    "pivotRange_deg": 30,
    "isPointDefenseTargetable": false,
-   "warheadMass_kg": 1,
+   "warheadMass_kg": 0.9,
    "weightedBuildMaterials": {
       "volatiles": 0.1,
       "metals": 0.5,
@@ -605,6 +565,6 @@
    "impactVisualFXResource": "spaceCombat/ImpactGreen",
    "fireSoundFXResource": "event:/SFX/Game_SFX/Guns/trig_SFX_Alien_Plasma_Cannon",
    "impactSoundFXResource": "event:/SFX/Game_SFX/Ship_Fire_Impacts/trig_SFX_BlasterLongMuffledLow018MonoRR",
-   "expectedDamage_MJ": 882
+   "expectedDamage_MJ": 793.8
 }
 ]
\ No newline at end of file
diff --git a/app/game/templates/TIPowerPlantTemplate.json b/app/game/templates/TIPowerPlantTemplate.json
index df48bc6..a2e6e9b 100644
--- a/app/game/templates/TIPowerPlantTemplate.json
+++ b/app/game/templates/TIPowerPlantTemplate.json
@@ -5,7 +5,6 @@
    "maxOutput_GW": 0.2,
    "specificPower_tGW": 2800,
    "powerPlantClass": "Fuel_Cell",
-   "requiredProjectName": "",
    "generalUse": true,
    "efficiency": 0.7,
    "crew": 1,
@@ -13,10 +12,7 @@
       "water": 0.35,
       "volatiles": 0.3,
       "metals": 0.3,
-      "nobleMetals": 0.05,
-      "fissiles": null,
-      "antimatter": null,
-      "exotics": null
+      "nobleMetals": 0.05
    },
    "iconResource": "shipbuildericons/ICO_FuelCellI"
 },
@@ -34,10 +30,7 @@
       "water": 0.35,
       "volatiles": 0.3,
       "metals": 0.3,
-      "nobleMetals": 0.05,
-      "fissiles": null,
-      "antimatter": null,
-      "exotics": null
+      "nobleMetals": 0.05
    },
    "iconResource": "shipbuildericons/ICO_FuelCellII"
 },
@@ -55,10 +48,7 @@
       "water": 0.35,
       "volatiles": 0.3,
       "metals": 0.3,
-      "nobleMetals": 0.05,
-      "fissiles": null,
-      "antimatter": null,
-      "exotics": null
+      "nobleMetals": 0.05
    },
    "iconResource": "shipbuildericons/ICO_FuelCellIII"
 },
@@ -77,9 +67,7 @@
       "volatiles": 0.1,
       "metals": 0.65,
       "nobleMetals": 0.1,
-      "fissiles": 0.05,
-      "antimatter": null,
-      "exotics": null
+      "fissiles": 0.05
    },
    "iconResource": "shipbuildericons/ICO_SolidCoreFissionReactorI"
 },
@@ -98,9 +86,7 @@
       "volatiles": 0.1,
       "metals": 0.65,
       "nobleMetals": 0.1,
-      "fissiles": 0.05,
-      "antimatter": null,
-      "exotics": null
+      "fissiles": 0.05
    },
    "iconResource": "shipbuildericons/ICO_SolidCoreFissionReactorII"
 },
@@ -119,9 +105,7 @@
       "volatiles": 0.1,
       "metals": 0.65,
       "nobleMetals": 0.1,
-      "fissiles": 0.05,
-      "antimatter": null,
-      "exotics": null
+      "fissiles": 0.05
    },
    "iconResource": "shipbuildericons/ICO_SolidCoreFissionReactorIII"
 },
@@ -140,9 +124,7 @@
       "volatiles": 0.1,
       "metals": 0.65,
       "nobleMetals": 0.1,
-      "fissiles": 0.05,
-      "antimatter": null,
-      "exotics": null
+      "fissiles": 0.05
    },
    "iconResource": "shipbuildericons/ICO_SolidCoreFissionReactorIV"
 },
@@ -161,9 +143,7 @@
       "volatiles": 0.1,
       "metals": 0.65,
       "nobleMetals": 0.1,
-      "fissiles": 0.05,
-      "antimatter": null,
-      "exotics": null
+      "fissiles": 0.05
    },
    "iconResource": "shipbuildericons/ICO_SolidCoreFissionReactorV"
 },
@@ -182,9 +162,7 @@
       "volatiles": 0.1,
       "metals": 0.65,
       "nobleMetals": 0.1,
-      "fissiles": 0.05,
-      "antimatter": null,
-      "exotics": null
+      "fissiles": 0.05
    },
    "iconResource": "shipbuildericons/ICO_SolidCoreFissionReactorVI"
 },
@@ -203,9 +181,7 @@
       "volatiles": 0.1,
       "metals": 0.65,
       "nobleMetals": 0.1,
-      "fissiles": 0.05,
-      "antimatter": null,
-      "exotics": null
+      "fissiles": 0.05
    },
    "iconResource": "shipbuildericons/ICO_SolidCoreFissionReactorVII"
 },
@@ -224,9 +200,7 @@
       "volatiles": 0.1,
       "metals": 0.65,
       "nobleMetals": 0.1,
-      "fissiles": 0.05,
-      "antimatter": null,
-      "exotics": null
+      "fissiles": 0.05
    },
    "iconResource": "shipbuildericons/ICO_SolidCoreFissionReactorVIII"
 },
@@ -245,9 +219,7 @@
       "volatiles": 0.1,
       "metals": 0.65,
       "nobleMetals": 0.1,
-      "fissiles": 0.05,
-      "antimatter": null,
-      "exotics": null
+      "fissiles": 0.05
    },
    "iconResource": "shipbuildericons/ICO_SolidCoreFissionReactorIX"
 },
@@ -266,17 +238,53 @@
       "volatiles": 0.1,
       "metals": 0.65,
       "nobleMetals": 0.1,
-      "fissiles": 0.05,
-      "antimatter": null,
-      "exotics": null
+      "fissiles": 0.05
    },
    "iconResource": "shipbuildericons/ICO_SolidCoreFissionReactorX"
+},
+ {
+   "dataName": "MoltenSaltFissionReactorI",
+   "friendlyName": "Molten Salt Fission Reactor I",
+   "maxOutput_GW": 40,
+   "specificPower_tGW": 2,
+   "powerPlantClass": "Molten_Salt_Core_Fission",
+   "requiredProjectName": "Project_MoltenSaltFissionReactorI",
+   "generalUse": true,
+   "efficiency": 0.92,
+   "crew": 8,
+   "weightedBuildMaterials": {
+      "water": 0.1,
+      "volatiles": 0.2,
+      "metals": 0.5,
+      "nobleMetals": 0.15,
+      "fissiles": 0.05
+   },
+   "iconResource": "shipbuildericons/ICO_MoltenSaltFissionReactorI"
+},
+ {
+   "dataName": "MoltenSaltFissionReactorII",
+   "friendlyName": "Molten Salt Fission Reactor II",
+   "maxOutput_GW": 420,
+   "specificPower_tGW": 1.8,
+   "powerPlantClass": "Molten_Salt_Core_Fission",
+   "requiredProjectName": "Project_MoltenSaltFissionReactorII",
+   "generalUse": true,
+   "efficiency": 0.93,
+   "crew": 8,
+   "weightedBuildMaterials": {
+      "water": 0.1,
+      "volatiles": 0.2,
+      "metals": 0.5,
+      "nobleMetals": 0.15,
+      "fissiles": 0.05
+   },
+   "iconResource": "shipbuildericons/ICO_MoltenSaltFissionReactorII"
 },
  {
    "dataName": "MoltenCoreFissionReactorI",
    "friendlyName": "Molten Core Fission Reactor I",
-   "maxOutput_GW": 6,
-   "specificPower_tGW": 3,
+   "maxOutput_GW": 8,
+   "specificPower_tGW": 4,
    "powerPlantClass": "Liquid_Core_Fission",
    "requiredProjectName": "Project_MoltenCoreFissionReactorI",
    "generalUse": true,
@@ -287,17 +295,15 @@
       "volatiles": 0.1,
       "metals": 0.55,
       "nobleMetals": 0.2,
-      "fissiles": 0.05,
-      "antimatter": null,
-      "exotics": null
+      "fissiles": 0.05
    },
    "iconResource": "shipbuildericons/ICO_MoltenCoreFissionReactorI"
 },
  {
    "dataName": "MoltenCoreFissionReactorII",
    "friendlyName": "Molten Core Fission Reactor II",
-   "maxOutput_GW": 750,
-   "specificPower_tGW": 3,
+   "maxOutput_GW": 35,
+   "specificPower_tGW": 3.5,
    "powerPlantClass": "Liquid_Core_Fission",
    "requiredProjectName": "Project_MoltenCoreFissionReactorII",
    "generalUse": true,
@@ -308,17 +314,15 @@
       "volatiles": 0.1,
       "metals": 0.55,
       "nobleMetals": 0.2,
-      "fissiles": 0.05,
-      "antimatter": null,
-      "exotics": null
+      "fissiles": 0.05
    },
    "iconResource": "shipbuildericons/ICO_MoltenCoreFissionReactorII"
 },
  {
    "dataName": "MoltenCoreFissionReactorIII",
    "friendlyName": "Molten Core Fission Reactor III",
-   "maxOutput_GW": 1250,
-   "specificPower_tGW": 2.5,
+   "maxOutput_GW": 420,
+   "specificPower_tGW": 3,
    "powerPlantClass": "Liquid_Core_Fission",
    "requiredProjectName": "Project_MoltenCoreFissionReactorIII",
    "generalUse": true,
@@ -329,9 +333,7 @@
       "volatiles": 0.1,
       "metals": 0.55,
       "nobleMetals": 0.2,
-      "fissiles": 0.05,
-      "antimatter": null,
-      "exotics": null
+      "fissiles": 0.05
    },
    "iconResource": "shipbuildericons/ICO_MoltenCoreFissionReactorIII"
 },
@@ -339,7 +341,7 @@
    "dataName": "VaporCoreFissionReactorI",
    "friendlyName": "Vapor Core Fission Reactor I",
    "maxOutput_GW": 6.5,
-   "specificPower_tGW": 13,
+   "specificPower_tGW": 4,
    "powerPlantClass": "Gas_Core_Fission",
    "requiredProjectName": "Project_VaporCoreFissionReactorI",
    "generalUse": true,
@@ -350,9 +352,7 @@
       "volatiles": 0.1,
       "metals": 0.5,
       "nobleMetals": 0.25,
-      "fissiles": 0.05,
-      "antimatter": null,
-      "exotics": null
+      "fissiles": 0.05
    },
    "iconResource": "shipbuildericons/ICO_VaporCoreFissionReactorI"
 },
@@ -360,7 +360,7 @@
    "dataName": "VaporCoreFissionReactorII",
    "friendlyName": "Vapor Core Fission Reactor II",
    "maxOutput_GW": 20,
-   "specificPower_tGW": 8,
+   "specificPower_tGW": 3,
    "powerPlantClass": "Gas_Core_Fission",
    "requiredProjectName": "Project_VaporCoreFissionReactorII",
    "generalUse": true,
@@ -371,9 +371,7 @@
       "volatiles": 0.1,
       "metals": 0.5,
       "nobleMetals": 0.25,
-      "fissiles": 0.05,
-      "antimatter": null,
-      "exotics": null
+      "fissiles": 0.05
    },
    "iconResource": "shipbuildericons/ICO_VaporCoreFissionReactorII"
 },
@@ -381,7 +379,7 @@
    "dataName": "VaporCoreFissionReactorIII",
    "friendlyName": "Vapor Core Fission Reactor III",
    "maxOutput_GW": 60,
-   "specificPower_tGW": 4,
+   "specificPower_tGW": 3,
    "powerPlantClass": "Gas_Core_Fission",
    "requiredProjectName": "Project_VaporCoreFissionReactorIII",
    "generalUse": true,
@@ -392,9 +390,7 @@
       "volatiles": 0.1,
       "metals": 0.5,
       "nobleMetals": 0.25,
-      "fissiles": 0.05,
-      "antimatter": null,
-      "exotics": null
+      "fissiles": 0.05
    },
    "iconResource": "shipbuildericons/ICO_VaporCoreFissionReactorIII"
 },
@@ -413,9 +409,7 @@
       "volatiles": 0.1,
       "metals": 0.45,
       "nobleMetals": 0.3,
-      "fissiles": 0.05,
-      "antimatter": null,
-      "exotics": null
+      "fissiles": 0.05
    },
    "iconResource": "shipbuildericons/ICO_GasCoreFissionReactorI"
 },
@@ -434,9 +428,7 @@
       "volatiles": 0.1,
       "metals": 0.45,
       "nobleMetals": 0.3,
-      "fissiles": 0.05,
-      "antimatter": null,
-      "exotics": null
+      "fissiles": 0.05
    },
    "iconResource": "shipbuildericons/ICO_GasCoreFissionReactorII"
 },
@@ -455,9 +447,7 @@
       "volatiles": 0.1,
       "metals": 0.45,
       "nobleMetals": 0.3,
-      "fissiles": 0.05,
-      "antimatter": null,
-      "exotics": null
+      "fissiles": 0.05
    },
    "iconResource": "shipbuildericons/ICO_GasCoreFissionReactorIII"
 },
@@ -476,9 +466,7 @@
       "volatiles": 0.1,
       "metals": 0.45,
       "nobleMetals": 0.3,
-      "fissiles": 0.05,
-      "antimatter": null,
-      "exotics": null
+      "fissiles": 0.05
    },
    "iconResource": "shipbuildericons/ICO_GasCoreFissionReactorIV"
 },
@@ -497,9 +485,7 @@
       "volatiles": 0.1,
       "metals": 0.45,
       "nobleMetals": 0.3,
-      "fissiles": 0.05,
-      "antimatter": null,
-      "exotics": null
+      "fissiles": 0.05
    },
    "iconResource": "shipbuildericons/ICO_GasCoreFissionReactorV"
 },
@@ -518,59 +504,15 @@
       "volatiles": 0.1,
       "metals": 0.45,
       "nobleMetals": 0.3,
-      "fissiles": 0.05,
-      "antimatter": null,
-      "exotics": null
+      "fissiles": 0.05
    },
    "iconResource": "shipbuildericons/ICO_GasCoreFissionReactorVI"
-},
- {
-   "dataName": "SaltWaterCoreReactorI",
-   "friendlyName": "Salt Water Core Reactor I",
-   "maxOutput_GW": 32000,
-   "specificPower_tGW": 0.45,
-   "powerPlantClass": "Salt_Water_Core",
-   "requiredProjectName": "Project_SaltWaterCoreReactorI",
-   "generalUse": false,
-   "efficiency": 0.995,
-   "crew": 24,
-   "weightedBuildMaterials": {
-      "water": 0.1,
-      "volatiles": 0.1,
-      "metals": 0.35,
-      "nobleMetals": 0.4,
-      "fissiles": 0.05,
-      "antimatter": null,
-      "exotics": null
-   },
-   "iconResource": "shipbuildericons/ICO_SaltWaterCoreReactorI"
-},
- {
-   "dataName": "SaltWaterCoreReactorII",
-   "friendlyName": "Salt Water Core Reactor II",
-   "maxOutput_GW": 230000,
-   "specificPower_tGW": 0.08,
-   "powerPlantClass": "Salt_Water_Core",
-   "requiredProjectName": "Project_SaltWaterCoreReactorII",
-   "generalUse": false,
-   "efficiency": 0.995,
-   "crew": 24,
-   "weightedBuildMaterials": {
-      "water": 0.1,
-      "volatiles": 0.1,
-      "metals": 0.3,
-      "nobleMetals": 0.45,
-      "fissiles": 0.05,
-      "antimatter": null,
-      "exotics": null
-   },
-   "iconResource": "shipbuildericons/ICO_SaltWaterCoreReactorII"
 },
  {
    "dataName": "ElectrostaticConfinementFusionReactorI",
    "friendlyName": "Electrostatic Confinement Fusion Reactor I",
-   "maxOutput_GW": 5,
-   "specificPower_tGW": 2,
+   "maxOutput_GW": 46,
+   "specificPower_tGW": 1,
    "powerPlantClass": "Electrostatic_Confinement_Fusion",
    "requiredProjectName": "Project_ElectrostaticConfinementFusionReactorI",
    "generalUse": true,
@@ -581,17 +523,15 @@
       "volatiles": 0.3,
       "metals": 0.5,
       "nobleMetals": 0.16,
-      "fissiles": 0.02,
-      "antimatter": null,
-      "exotics": null
+      "fissiles": 0.02
    },
    "iconResource": "shipbuildericons/ICO_ElectrostaticConfinementFusionReactorI"
 },
  {
    "dataName": "ElectrostaticConfinementFusionReactorII",
    "friendlyName": "Electrostatic Confinement Fusion Reactor II",
-   "maxOutput_GW": 25,
-   "specificPower_tGW": 1,
+   "maxOutput_GW": 74,
+   "specificPower_tGW": 0.5,
    "powerPlantClass": "Electrostatic_Confinement_Fusion",
    "requiredProjectName": "Project_ElectrostaticConfinementFusionReactorII",
    "generalUse": true,
@@ -602,17 +542,15 @@
       "volatiles": 0.3,
       "metals": 0.5,
       "nobleMetals": 0.16,
-      "fissiles": 0.02,
-      "antimatter": null,
-      "exotics": null
+      "fissiles": 0.02
    },
    "iconResource": "shipbuildericons/ICO_ElectrostaticConfinementFusionReactorII"
 },
  {
    "dataName": "ElectrostaticConfinementFusionReactorIII",
    "friendlyName": "Electrostatic Confinement Fusion Reactor III",
-   "maxOutput_GW": 80,
-   "specificPower_tGW": 0.25,
+   "maxOutput_GW": 310,
+   "specificPower_tGW": 0.005,
    "powerPlantClass": "Electrostatic_Confinement_Fusion",
    "requiredProjectName": "Project_ElectrostaticConfinementFusionReactorIII",
    "generalUse": true,
@@ -623,247 +561,140 @@
       "volatiles": 0.3,
       "metals": 0.5,
       "nobleMetals": 0.16,
-      "fissiles": 0.02,
-      "antimatter": null,
-      "exotics": null
+      "exotics": 0.02
    },
    "iconResource": "shipbuildericons/ICO_ElectrostaticConfinementFusionReactorIII"
 },
  {
-   "dataName": "ZPinchFusionReactorI",
-   "friendlyName": "Z-Pinch Fusion Reactor I",
-   "maxOutput_GW": 260,
-   "specificPower_tGW": 13,
-   "powerPlantClass": "Z_Pinch_Fusion",
-   "requiredProjectName": "Project_ZPinchFusionReactorI",
-   "generalUse": false,
-   "efficiency": 0.96,
+   "dataName": "MirrorCellFusionReactorI",
+   "friendlyName": "Mirror Cell Fusion Reactor I",
+   "maxOutput_GW": 120,
+   "specificPower_tGW": 13.4,
+   "powerPlantClass": "Mirrored_Magnetic_Confinement_Fusion",
+   "requiredProjectName": "Project_MirrorCellFusionReactorI",
+   "generalUse": true,
+   "efficiency": 0.93,
    "crew": 12,
    "weightedBuildMaterials": {
       "water": 0.02,
       "volatiles": 0.2,
-      "metals": 0.46,
-      "nobleMetals": 0.3,
-      "fissiles": 0.02,
-      "antimatter": null,
-      "exotics": null
+      "metals": 0.54,
+      "nobleMetals": 0.24
    },
-   "iconResource": "shipbuildericons/ICO_ZPinchFusionReactorI"
+   "iconResource": "shipbuildericons/ICO_MirrorCellFusionReactorI"
 },
  {
-   "dataName": "ZPinchFusionReactorII",
-   "friendlyName": "Z-Pinch Fusion Reactor II",
-   "maxOutput_GW": 720,
-   "specificPower_tGW": 5,
-   "powerPlantClass": "Z_Pinch_Fusion",
-   "requiredProjectName": "Project_ZPinchFusionReactorII",
-   "generalUse": false,
-   "efficiency": 0.985,
-   "crew": 12,
+   "dataName": "MirrorCellFusionReactorII",
+   "friendlyName": "Mirror Cell Fusion Reactor II",
+   "maxOutput_GW": 215,
+   "specificPower_tGW": 6.5,
+   "powerPlantClass": "Mirrored_Magnetic_Confinement_Fusion",
+   "requiredProjectName": "Project_MirrorCellFusionReactorII",
+   "generalUse": true,
+   "efficiency": 0.95,
+   "crew": 10,
    "weightedBuildMaterials": {
       "water": 0.02,
       "volatiles": 0.2,
-      "metals": 0.46,
-      "nobleMetals": 0.3,
-      "fissiles": 0.02,
-      "antimatter": null,
-      "exotics": null
+      "metals": 0.54,
+      "nobleMetals": 0.24
    },
-   "iconResource": "shipbuildericons/ICO_ZPinchFusionReactorII"
-},
- {
-   "dataName": "ZPinchFusionReactorIII",
-   "friendlyName": "Z-Pinch Fusion Reactor III",
-   "maxOutput_GW": 4000,
-   "specificPower_tGW": 2,
-   "powerPlantClass": "Z_Pinch_Fusion",
-   "requiredProjectName": "Project_ZPinchFusionReactorIII",
-   "generalUse": false,
-   "efficiency": 0.99,
-   "crew": 12,
-   "weightedBuildMaterials": {
-      "water": 0.025,
-      "volatiles": 0.2,
-      "metals": 0.45,
-      "nobleMetals": 0.3,
-      "fissiles": 0.025,
-      "antimatter": null,
-      "exotics": null
-   },
-   "iconResource": "shipbuildericons/ICO_ZPinchFusionReactorIII"
+   "iconResource": "shipbuildericons/ICO_MirrorCellFusionReactorII"
 },
  {
-   "dataName": "HybridConfinementFusionReactorI",
-   "friendlyName": "Hybrid Confinement Fusion Reactor I",
-   "maxOutput_GW": 3,
-   "specificPower_tGW": 4,
-   "powerPlantClass": "Hybrid_Confinement_Fusion",
-   "requiredProjectName": "Project_HybridConfinementFusionReactorI",
+   "dataName": "MirrorCellFusionReactorIII",
+   "friendlyName": "Mirror Cell Fusion Reactor III",
+   "maxOutput_GW": 256,
+   "specificPower_tGW": 1.2,
+   "powerPlantClass": "Mirrored_Magnetic_Confinement_Fusion",
+   "requiredProjectName": "Project_MirrorCellFusionReactorIII",
    "generalUse": true,
    "efficiency": 0.97,
-   "crew": 12,
-   "weightedBuildMaterials": {
-      "water": 0.02,
-      "volatiles": 0.16,
-      "metals": 0.4,
-      "nobleMetals": 0.4,
-      "fissiles": 0.02,
-      "antimatter": null,
-      "exotics": null
-   },
-   "iconResource": "shipbuildericons/ICO_HybridConfinementFusionReactorI"
-},
- {
-   "dataName": "HybridConfinementFusionReactorII",
-   "friendlyName": "Hybrid Confinement Fusion Reactor II",
-   "maxOutput_GW": 2000,
-   "specificPower_tGW": 2,
-   "powerPlantClass": "Hybrid_Confinement_Fusion",
-   "requiredProjectName": "Project_HybridConfinementFusionReactorII",
-   "generalUse": true,
-   "efficiency": 0.98,
-   "crew": 12,
-   "weightedBuildMaterials": {
-      "water": 0.02,
-      "volatiles": 0.16,
-      "metals": 0.4,
-      "nobleMetals": 0.4,
-      "fissiles": 0.02,
-      "antimatter": null,
-      "exotics": null
-   },
-   "iconResource": "shipbuildericons/ICO_HybridConfinementFusionReactorII"
-},
- {
-   "dataName": "HybridConfinementFusionReactorIII",
-   "friendlyName": "Hybrid Confinement Fusion Reactor III",
-   "maxOutput_GW": 20000,
-   "specificPower_tGW": 1,
-   "powerPlantClass": "Hybrid_Confinement_Fusion",
-   "requiredProjectName": "Project_HybridConfinementFusionReactorIII",
-   "generalUse": true,
-   "efficiency": 0.99,
-   "crew": 12,
-   "weightedBuildMaterials": {
-      "water": 0.02,
-      "volatiles": 0.16,
-      "metals": 0.4,
-      "nobleMetals": 0.4,
-      "fissiles": 0.02,
-      "antimatter": null,
-      "exotics": null
-   },
-   "iconResource": "shipbuildericons/ICO_HybridConfinementFusionReactorIII"
-},
- {
-   "dataName": "AlienHybridConfinementFusionReactor",
-   "friendlyName": "Alien Hybrid Confinement Fusion Reactor",
-   "maxOutput_GW": 20000,
-   "specificPower_tGW": 1,
-   "powerPlantClass": "Hybrid_Confinement_Fusion",
-   "requiredProjectName": "Project_AlienMasterProject",
-   "generalUse": true,
-   "efficiency": 0.99,
-   "crew": 4,
+   "crew": 8,
    "weightedBuildMaterials": {
       "water": 0.02,
-      "volatiles": 0.16,
-      "metals": 0.4,
-      "nobleMetals": 0.4,
-      "fissiles": 0.02,
-      "antimatter": null,
-      "exotics": null
+      "volatiles": 0.2,
+      "metals": 0.54,
+      "nobleMetals": 0.24
    },
-   "iconResource": "shipbuildericons/ICO_AlienHybridConfinementFusionReactor"
+   "iconResource": "shipbuildericons/ICO_MirrorCellFusionReactorIII"
 },
  {
    "dataName": "FusionTokamakI",
    "friendlyName": "Fusion Tokamak I",
-   "maxOutput_GW": 30,
-   "specificPower_tGW": 28,
+   "maxOutput_GW": 128,
+   "specificPower_tGW": 12,
    "powerPlantClass": "Toroid_Magnetic_Confinement_Fusion",
    "requiredProjectName": "Project_FusionTokamakI",
    "generalUse": true,
-   "efficiency": 0.85,
+   "efficiency": 0.92,
    "crew": 16,
    "weightedBuildMaterials": {
       "water": 0.02,
       "volatiles": 0.3,
-      "metals": 0.5,
-      "nobleMetals": 0.16,
-      "fissiles": 0.02,
-      "antimatter": null,
-      "exotics": null
+      "metals": 0.52,
+      "nobleMetals": 0.16
    },
    "iconResource": "shipbuildericons/ICO_FusionTokamakI"
 },
  {
    "dataName": "FusionTokamakII",
    "friendlyName": "Fusion Tokamak II",
-   "maxOutput_GW": 30,
-   "specificPower_tGW": 14,
+   "maxOutput_GW": 401,
+   "specificPower_tGW": 8,
    "powerPlantClass": "Toroid_Magnetic_Confinement_Fusion",
    "requiredProjectName": "Project_FusionTokamakII",
    "generalUse": true,
-   "efficiency": 0.88,
+   "efficiency": 0.94,
    "crew": 12,
    "weightedBuildMaterials": {
       "water": 0.02,
       "volatiles": 0.3,
-      "metals": 0.5,
-      "nobleMetals": 0.16,
-      "fissiles": 0.02,
-      "antimatter": null,
-      "exotics": null
+      "metals": 0.52,
+      "nobleMetals": 0.16
    },
    "iconResource": "shipbuildericons/ICO_FusionTokamakII"
 },
  {
    "dataName": "FusionTokamakIII",
    "friendlyName": "Fusion Tokamak III",
-   "maxOutput_GW": 220,
-   "specificPower_tGW": 10,
+   "maxOutput_GW": 624,
+   "specificPower_tGW": 5,
    "powerPlantClass": "Toroid_Magnetic_Confinement_Fusion",
    "requiredProjectName": "Project_FusionTokamakIII",
    "generalUse": true,
-   "efficiency": 0.92,
+   "efficiency": 0.96,
    "crew": 10,
    "weightedBuildMaterials": {
       "water": 0.02,
       "volatiles": 0.3,
-      "metals": 0.5,
-      "nobleMetals": 0.16,
-      "fissiles": 0.02,
-      "antimatter": null,
-      "exotics": null
+      "metals": 0.52,
+      "nobleMetals": 0.16
    },
    "iconResource": "shipbuildericons/ICO_FusionTokamakIII"
 },
  {
    "dataName": "FusionTokamakIV",
    "friendlyName": "Fusion Tokamak IV",
-   "maxOutput_GW": 1250,
-   "specificPower_tGW": 4,
+   "maxOutput_GW": 1260,
+   "specificPower_tGW": 3,
    "powerPlantClass": "Toroid_Magnetic_Confinement_Fusion",
    "requiredProjectName": "Project_FusionTokamakIV",
    "generalUse": true,
-   "efficiency": 0.935,
+   "efficiency": 0.975,
    "crew": 10,
    "weightedBuildMaterials": {
       "water": 0.02,
       "volatiles": 0.3,
-      "metals": 0.5,
-      "nobleMetals": 0.16,
-      "fissiles": 0.02,
-      "antimatter": null,
-      "exotics": null
+      "metals": 0.52,
+      "nobleMetals": 0.16
    },
    "iconResource": "shipbuildericons/ICO_FusionTokamakIV"
 },
  {
    "dataName": "FusionTokamakV",
    "friendlyName": "Fusion Tokamak V",
-   "maxOutput_GW": 5200,
+   "maxOutput_GW": 5060,
    "specificPower_tGW": 1,
    "powerPlantClass": "Toroid_Magnetic_Confinement_Fusion",
    "requiredProjectName": "Project_FusionTokamakV",
@@ -875,100 +706,177 @@
       "volatiles": 0.3,
       "metals": 0.5,
       "nobleMetals": 0.16,
-      "fissiles": 0.02,
-      "antimatter": null,
-      "exotics": null
+      "exotics": 0.02
    },
    "iconResource": "shipbuildericons/ICO_FusionTokamakV"
 },
  {
-   "dataName": "FlowStabilizedZPinchFusionReactor",
-   "friendlyName": "Flow Stabilized Z-Pinch Fusion Reactor",
-   "maxOutput_GW": 300000,
-   "specificPower_tGW": 0.0068,
+   "dataName": "HybridConfinementFusionReactorI",
+   "friendlyName": "Hybrid Confinement Fusion Reactor I",
+   "maxOutput_GW": 180,
+   "specificPower_tGW": 4,
+   "powerPlantClass": "Hybrid_Confinement_Fusion",
+   "requiredProjectName": "Project_HybridConfinementFusionReactorI",
+   "generalUse": true,
+   "efficiency": 0.97,
+   "crew": 12,
+   "weightedBuildMaterials": {
+      "water": 0.02,
+      "volatiles": 0.18,
+      "metals": 0.4,
+      "nobleMetals": 0.4
+   },
+   "iconResource": "shipbuildericons/ICO_HybridConfinementFusionReactorI"
+},
+ {
+   "dataName": "HybridConfinementFusionReactorII",
+   "friendlyName": "Hybrid Confinement Fusion Reactor II",
+   "maxOutput_GW": 510,
+   "specificPower_tGW": 2,
+   "powerPlantClass": "Hybrid_Confinement_Fusion",
+   "requiredProjectName": "Project_HybridConfinementFusionReactorII",
+   "generalUse": true,
+   "efficiency": 0.98,
+   "crew": 12,
+   "weightedBuildMaterials": {
+      "water": 0.02,
+      "volatiles": 0.18,
+      "metals": 0.4,
+      "nobleMetals": 0.4
+   },
+   "iconResource": "shipbuildericons/ICO_HybridConfinementFusionReactorII"
+},
+ {
+   "dataName": "HybridConfinementFusionReactorIII",
+   "friendlyName": "Hybrid Confinement Fusion Reactor III",
+   "maxOutput_GW": 1900,
+   "specificPower_tGW": 1,
+   "powerPlantClass": "Hybrid_Confinement_Fusion",
+   "requiredProjectName": "Project_HybridConfinementFusionReactorIII",
+   "generalUse": true,
+   "efficiency": 0.99,
+   "crew": 12,
+   "weightedBuildMaterials": {
+      "water": 0.02,
+      "volatiles": 0.18,
+      "metals": 0.4,
+      "nobleMetals": 0.4
+   },
+   "iconResource": "shipbuildericons/ICO_HybridConfinementFusionReactorIII"
+},
+ {
+   "dataName": "HybridConfinementFusionReactorIV",
+   "friendlyName": "Hybrid Confinement Fusion Reactor IV",
+   "maxOutput_GW": 11370,
+   "specificPower_tGW": 0.05,
+   "powerPlantClass": "Hybrid_Confinement_Fusion",
+   "requiredProjectName": "Project_HybridConfinementFusionReactorIV",
+   "generalUse": true,
+   "efficiency": 0.99,
+   "crew": 12,
+   "weightedBuildMaterials": {
+      "water": 0.02,
+      "volatiles": 0.18,
+      "metals": 0.1,
+      "nobleMetals": 0.7
+   },
+   "iconResource": "shipbuildericons/ICO_HybridConfinementFusionReactorIV"
+},
+ {
+   "dataName": "ZPinchFusionReactorI",
+   "friendlyName": "Z-Pinch Fusion Reactor I",
+   "maxOutput_GW": 260,
+   "specificPower_tGW": 10,
    "powerPlantClass": "Z_Pinch_Fusion",
-   "requiredProjectName": "Project_FlowStabilizedZPinchFusionReactor",
+   "requiredProjectName": "Project_ZPinchFusionReactorI",
    "generalUse": false,
-   "efficiency": 0.995,
+   "efficiency": 0.95,
    "crew": 12,
    "weightedBuildMaterials": {
       "water": 0.02,
       "volatiles": 0.2,
-      "metals": 0.45,
-      "nobleMetals": 0.3,
-      "fissiles": 0.02,
-      "antimatter": null,
-      "exotics": 0.01
+      "metals": 0.48,
+      "nobleMetals": 0.3
    },
-   "iconResource": "shipbuildericons/ICO_FlowStabilizedZPinchFusionReactor"
+   "iconResource": "shipbuildericons/ICO_ZPinchFusionReactorI"
 },
  {
-   "dataName": "MirrorCellFusionReactorI",
-   "friendlyName": "Mirror Cell Fusion Reactor I",
-   "maxOutput_GW": 60,
-   "specificPower_tGW": 13.4,
-   "powerPlantClass": "Mirrored_Magnetic_Confinement_Fusion",
-   "requiredProjectName": "Project_MirrorCellFusionReactorI",
-   "generalUse": true,
-   "efficiency": 0.93,
+   "dataName": "ZPinchFusionReactorII",
+   "friendlyName": "Z-Pinch Fusion Reactor II",
+   "maxOutput_GW": 610,
+   "specificPower_tGW": 5,
+   "powerPlantClass": "Z_Pinch_Fusion",
+   "requiredProjectName": "Project_ZPinchFusionReactorII",
+   "generalUse": false,
+   "efficiency": 0.95,
    "crew": 12,
    "weightedBuildMaterials": {
       "water": 0.02,
       "volatiles": 0.2,
-      "metals": 0.52,
-      "nobleMetals": 0.24,
-      "fissiles": 0.02,
-      "antimatter": null,
-      "exotics": null
+      "metals": 0.48,
+      "nobleMetals": 0.3
    },
-   "iconResource": "shipbuildericons/ICO_MirrorCellFusionReactorI"
+   "iconResource": "shipbuildericons/ICO_ZPinchFusionReactorII"
 },
  {
-   "dataName": "MirrorCellFusionReactorII",
-   "friendlyName": "Mirror Cell Fusion Reactor II",
-   "maxOutput_GW": 360,
-   "specificPower_tGW": 6.5,
-   "powerPlantClass": "Mirrored_Magnetic_Confinement_Fusion",
-   "requiredProjectName": "Project_MirrorCellFusionReactorII",
-   "generalUse": true,
-   "efficiency": 0.95,
-   "crew": 10,
+   "dataName": "ZPinchFusionReactorIII",
+   "friendlyName": "Z-Pinch Fusion Reactor III",
+   "maxOutput_GW": 2510,
+   "specificPower_tGW": 1.5,
+   "powerPlantClass": "Z_Pinch_Fusion",
+   "requiredProjectName": "Project_ZPinchFusionReactorIII",
+   "generalUse": false,
+   "efficiency": 0.96,
+   "crew": 12,
    "weightedBuildMaterials": {
       "water": 0.02,
       "volatiles": 0.2,
-      "metals": 0.52,
-      "nobleMetals": 0.24,
-      "fissiles": 0.02,
-      "antimatter": null,
-      "exotics": null
+      "metals": 0.45,
+      "nobleMetals": 0.33
    },
-   "iconResource": "shipbuildericons/ICO_MirrorCellFusionReactorII"
+   "iconResource": "shipbuildericons/ICO_ZPinchFusionReactorIII"
 },
  {
-   "dataName": "MirrorCellFusionReactorIII",
-   "friendlyName": "Mirror Cell Fusion Reactor III",
-   "maxOutput_GW": 1400,
-   "specificPower_tGW": 1.2,
-   "powerPlantClass": "Mirrored_Magnetic_Confinement_Fusion",
-   "requiredProjectName": "Project_MirrorCellFusionReactorIII",
-   "generalUse": true,
-   "efficiency": 0.98,
-   "crew": 8,
+   "dataName": "ZPinchFusionReactorIV",
+   "friendlyName": "Z-Pinch Fusion Reactor IV",
+   "maxOutput_GW": 3970,
+   "specificPower_tGW": 0.4,
+   "powerPlantClass": "Z_Pinch_Fusion",
+   "requiredProjectName": "Project_ZPinchFusionReactorIV",
+   "generalUse": false,
+   "efficiency": 0.97,
+   "crew": 23,
    "weightedBuildMaterials": {
       "water": 0.02,
       "volatiles": 0.2,
-      "metals": 0.52,
-      "nobleMetals": 0.24,
-      "fissiles": 0.02,
-      "antimatter": null,
-      "exotics": null
+      "metals": 0.45,
+      "nobleMetals": 0.33
    },
-   "iconResource": "shipbuildericons/ICO_MirrorCellFusionReactorIII"
+   "iconResource": "shipbuildericons/ICO_ZPinchFusionReactorIV"
+},
+ {
+   "dataName": "FlowStabilizedZPinchFusionReactor",
+   "friendlyName": "Flow Stabilized Z-Pinch Fusion Reactor",
+   "maxOutput_GW": 7590,
+   "specificPower_tGW": 0.0068,
+   "powerPlantClass": "Z_Pinch_Fusion",
+   "requiredProjectName": "Project_FlowStabilizedZPinchFusionReactor",
+   "generalUse": false,
+   "efficiency": 0.995,
+   "crew": 12,
+   "weightedBuildMaterials": {
+      "water": 0.02,
+      "volatiles": 0.2,
+      "metals": 0.45,
+      "nobleMetals": 0.32,
+      "exotics": 0.01
+   },
+   "iconResource": "shipbuildericons/ICO_FlowStabilizedZPinchFusionReactor"
 },
  {
    "dataName": "InertialConfinementFusionReactorI",
    "friendlyName": "Inertial Confinement Fusion Reactor I",
-   "maxOutput_GW": 5,
+   "maxOutput_GW": 370,
    "specificPower_tGW": 17.6,
    "powerPlantClass": "Inertial_Confinement_Fusion",
    "requiredProjectName": "Project_InertialConfinementFusionReactorI",
@@ -978,102 +886,88 @@
    "weightedBuildMaterials": {
       "water": 0.02,
       "volatiles": 0.15,
-      "metals": 0.46,
-      "nobleMetals": 0.35,
-      "fissiles": 0.02,
-      "antimatter": null,
-      "exotics": null
+      "metals": 0.48,
+      "nobleMetals": 0.35
    },
    "iconResource": "shipbuildericons/ICO_InertialConfinementFusionReactorI"
 },
  {
    "dataName": "InertialConfinementFusionReactorII",
    "friendlyName": "Inertial Confinement Fusion Reactor II",
-   "maxOutput_GW": 30,
+   "maxOutput_GW": 860,
    "specificPower_tGW": 12,
    "powerPlantClass": "Inertial_Confinement_Fusion",
    "requiredProjectName": "Project_InertialConfinementFusionReactorII",
    "generalUse": true,
-   "efficiency": 0.87,
+   "efficiency": 0.89,
    "crew": 12,
    "weightedBuildMaterials": {
       "water": 0.02,
       "volatiles": 0.15,
-      "metals": 0.46,
-      "nobleMetals": 0.35,
-      "fissiles": 0.02,
-      "antimatter": null,
-      "exotics": null
+      "metals": 0.48,
+      "nobleMetals": 0.35
    },
    "iconResource": "shipbuildericons/ICO_InertialConfinementFusionReactorII"
 },
  {
    "dataName": "InertialConfinementFusionReactorIII",
    "friendlyName": "Inertial Confinement Fusion Reactor III",
-   "maxOutput_GW": 200,
+   "maxOutput_GW": 3170,
    "specificPower_tGW": 10,
    "powerPlantClass": "Inertial_Confinement_Fusion",
    "requiredProjectName": "Project_InertialConfinementFusionReactorIII",
    "generalUse": true,
-   "efficiency": 0.89,
+   "efficiency": 0.92,
    "crew": 12,
    "weightedBuildMaterials": {
       "water": 0.02,
       "volatiles": 0.15,
-      "metals": 0.46,
-      "nobleMetals": 0.35,
-      "fissiles": 0.02,
-      "antimatter": null,
-      "exotics": null
+      "metals": 0.48,
+      "nobleMetals": 0.35
    },
    "iconResource": "shipbuildericons/ICO_InertialConfinementFusionReactorIII"
 },
  {
    "dataName": "InertialConfinementFusionReactorIV",
    "friendlyName": "Inertial Confinement Fusion Reactor IV",
-   "maxOutput_GW": 650,
-   "specificPower_tGW": 20,
+   "maxOutput_GW": 5500,
+   "specificPower_tGW": 5,
    "powerPlantClass": "Inertial_Confinement_Fusion",
    "requiredProjectName": "Project_InertialConfinementFusionReactorIV",
    "generalUse": true,
-   "efficiency": 0.975,
+   "efficiency": 0.95,
    "crew": 12,
    "weightedBuildMaterials": {
       "water": 0.02,
       "volatiles": 0.15,
-      "metals": 0.46,
-      "nobleMetals": 0.35,
-      "fissiles": 0.02,
-      "antimatter": null,
-      "exotics": null
+      "metals": 0.48,
+      "nobleMetals": 0.35
    },
    "iconResource": "shipbuildericons/ICO_InertialConfinementFusionReactorIV"
 },
  {
    "dataName": "InertialConfinementFusionReactorV",
    "friendlyName": "Inertial Confinement Fusion Reactor V",
-   "maxOutput_GW": 10000,
+   "maxOutput_GW": 19090,
    "specificPower_tGW": 1,
    "powerPlantClass": "Inertial_Confinement_Fusion",
    "requiredProjectName": "Project_InertialConfinementFusionReactorV",
    "generalUse": true,
-   "efficiency": 0.95,
+   "efficiency": 0.975,
    "crew": 10,
    "weightedBuildMaterials": {
       "water": 0.02,
       "volatiles": 0.15,
-      "metals": 0.46,
+      "metals": 0.48,
       "nobleMetals": 0.35,
-      "fissiles": 0.02,
-      "antimatter": null,
-      "exotics": null
+      "exotics": 0.01
    },
    "iconResource": "shipbuildericons/ICO_InertialConfinementFusionReactorV"
 },
  {
    "dataName": "InertialConfinementFusionReactorVI",
    "friendlyName": "Inertial Confinement Fusion Reactor VI",
-   "maxOutput_GW": 22000,
+   "maxOutput_GW": 20420,
    "specificPower_tGW": 0.068,
    "powerPlantClass": "Inertial_Confinement_Fusion",
    "requiredProjectName": "Project_InertialConfinementFusionReactorVI",
@@ -1085,16 +979,14 @@
       "volatiles": 0.15,
       "metals": 0.45,
       "nobleMetals": 0.35,
-      "fissiles": 0.02,
-      "antimatter": null,
-      "exotics": 0.01
+      "exotics": 0.03
    },
    "iconResource": "shipbuildericons/ICO_InertialConfinementFusionReactorVI"
 },
  {
    "dataName": "InertialConfinementFusionReactorVII",
    "friendlyName": "Inertial Confinement Fusion Reactor VII",
-   "maxOutput_GW": 3100000,
+   "maxOutput_GW": 306430,
    "specificPower_tGW": 0.002,
    "powerPlantClass": "Inertial_Confinement_Fusion",
    "requiredProjectName": "Project_InertialConfinementFusionReactorVII",
@@ -1106,11 +998,65 @@
       "volatiles": 0.15,
       "metals": 0.45,
       "nobleMetals": 0.34,
-      "fissiles": 0.02,
-      "antimatter": null,
-      "exotics": 0.02
+      "exotics": 0.04
    },
    "iconResource": "shipbuildericons/ICO_InertialConfinementFusionReactorVII"
+},
+ {
+   "dataName": "AlienHybridConfinementFusionReactor",
+   "friendlyName": "Alien Hybrid Confinement Fusion Reactor",
+   "maxOutput_GW": 1000,
+   "specificPower_tGW": 1,
+   "powerPlantClass": "Hybrid_Confinement_Fusion",
+   "requiredProjectName": "Project_AlienMasterProject",
+   "generalUse": true,
+   "efficiency": 0.99,
+   "crew": 4,
+   "weightedBuildMaterials": {
+      "water": 0.02,
+      "volatiles": 0.16,
+      "metals": 0.67,
+      "nobleMetals": 0.15
+   },
+   "iconResource": "shipbuildericons/ICO_AlienHybridConfinementFusionReactor"
+},
+ {
+   "dataName": "AlienAdvancedHybridConfinementFusionReactor",
+   "friendlyName": "Alien Advanced Hybrid Confinement Fusion Reactor",
+   "maxOutput_GW": 6400,
+   "specificPower_tGW": 0.35,
+   "powerPlantClass": "Hybrid_Confinement_Fusion",
+   "requiredProjectName": "Project_AlienMasterProject",
+   "generalUse": true,
+   "efficiency": 0.995,
+   "crew": 4,
+   "weightedBuildMaterials": {
+      "water": 0.02,
+      "volatiles": 0.16,
+      "metals": 0.665,
+      "nobleMetals": 0.15,
+      "exotics": 0.005
+   },
+   "iconResource": "shipbuildericons/ICO_AlienHybridConfinementFusionReactor"
+},
+ {
+   "dataName": "AlienSuperAdvancedHybridConfinementFusionReactor",
+   "friendlyName": "Alien Super Advanced Hybrid Confinement Fusion Reactor",
+   "maxOutput_GW": 21510,
+   "specificPower_tGW": 0.05,
+   "powerPlantClass": "Hybrid_Confinement_Fusion",
+   "requiredProjectName": "Project_AlienAdvancedMasterProject",
+   "generalUse": true,
+   "efficiency": 0.998,
+   "crew": 4,
+   "weightedBuildMaterials": {
+      "water": 0.02,
+      "volatiles": 0.16,
+      "metals": 0.665,
+      "nobleMetals": 0.15,
+      "exotics": 0.005
+   },
+   "iconResource": "shipbuildericons/ICO_AlienHybridConfinementFusionReactor"
 },
  {
    "dataName": "AntimatterPlasmaCoreReactorI",
@@ -1123,13 +1069,10 @@
    "efficiency": 0.9975,
    "crew": 12,
    "weightedBuildMaterials": {
-      "water": null,
       "volatiles": 0.3,
       "metals": 0.48,
       "nobleMetals": 0.2,
-      "fissiles": null,
-      "antimatter": 0.02,
-      "exotics": null
+      "antimatter": 0.02
    },
    "iconResource": "shipbuildericons/ICO_AntimatterPlasmaCoreReactorI"
 },
@@ -1144,13 +1087,10 @@
    "efficiency": 0.9975,
    "crew": 12,
    "weightedBuildMaterials": {
-      "water": null,
       "volatiles": 0.3,
       "metals": 0.48,
       "nobleMetals": 0.2,
-      "fissiles": null,
-      "antimatter": 0.02,
-      "exotics": null
+      "antimatter": 0.02
    },
    "iconResource": "shipbuildericons/ICO_AntimatterPlasmaCoreReactorII"
 },
@@ -1165,11 +1105,9 @@
    "efficiency": 0.9975,
    "crew": 12,
    "weightedBuildMaterials": {
-      "water": null,
       "volatiles": 0.32,
       "metals": 0.45,
       "nobleMetals": 0.2,
-      "fissiles": null,
       "antimatter": 0.02,
       "exotics": 0.01
    },
@@ -1186,11 +1124,9 @@
    "efficiency": 0.9975,
    "crew": 12,
    "weightedBuildMaterials": {
-      "water": null,
       "volatiles": 0.3,
       "metals": 0.3,
       "nobleMetals": 0.3,
-      "fissiles": null,
       "antimatter": 0.05,
       "exotics": 0.05
    },
diff --git a/app/game/templates/TIProjectTemplate.json b/app/game/templates/TIProjectTemplate.json
index 382a5fd..e0041bc 100644
--- a/app/game/templates/TIProjectTemplate.json
+++ b/app/game/templates/TIProjectTemplate.json
@@ -155,6 +155,7 @@
    "dataName": "Project_Pherocytes",
    "techCategory": "Xenology",
    "AI_techRole": "FactionObjective",
+   "AI_criticalTech": true,
    "AI_projectRole": "Objective",
    "researchCost": 5000,
    "prereqs": [
@@ -329,8 +330,8 @@
    "dataName": "Project_TheAlienNation",
    "techCategory": "Xenology",
    "AI_techRole": "FactionObjective",
-   "AI_projectRole": "Objective",
    "AI_criticalTech": true,
+   "AI_projectRole": "Objective",
    "researchCost": 10000,
    "prereqs": [
       "Project_HydraDiplomacy"
@@ -575,8 +576,8 @@
    "friendlyName": "AppeaseVictory",
    "dataName": "Project_AppeaseVictory",
    "techCategory": "Xenology",
-   "AI_criticalTech": true,  
    "AI_techRole": "FactionObjective",
+   "AI_criticalTech": true,
    "AI_projectRole": "Objective",
    "researchCost": 2500,
    "prereqs": [
@@ -607,8 +608,8 @@
    "dataName": "Project_CooperateVictory",
    "techCategory": "Xenology",
    "AI_techRole": "FactionObjective",
+   "AI_criticalTech": true,
    "AI_projectRole": "Objective",
-   "AI_criticalTech": true,  
    "researchCost": 25000,
    "prereqs": [
       "Project_TheirOperations"
@@ -638,8 +639,8 @@
    "dataName": "Project_DestroyVictory",
    "techCategory": "Xenology",
    "AI_techRole": "FactionObjective",
-   "AI_projectRole": "Objective",
    "AI_criticalTech": true,
+   "AI_projectRole": "Objective",
    "researchCost": 2500,
    "prereqs": [
       "Project_TheirMethods"
@@ -669,8 +670,8 @@
    "dataName": "Project_EscapeVictory",
    "techCategory": "Xenology",
    "AI_techRole": "FactionObjective",
+   "AI_criticalTech": true,
    "AI_projectRole": "Objective",
-   "AI_criticalTech": true,  
    "researchCost": 5000,
    "prereqs": [
       "Project_TheirOrigin"
@@ -731,7 +732,7 @@
    "dataName": "Project_ResistVictory",
    "techCategory": "Xenology",
    "AI_techRole": "FactionObjective",
-   "AI_criticalTech": true,   
+   "AI_criticalTech": true,
    "AI_projectRole": "Objective",
    "researchCost": 2500,
    "prereqs": [
@@ -762,8 +763,8 @@
    "dataName": "Project_SubmitVictory",
    "techCategory": "Xenology",
    "AI_techRole": "FactionObjective",
+   "AI_criticalTech": true,
    "AI_projectRole": "Objective",
-   "AI_criticalTech": true,   
    "researchCost": 2500,
    "prereqs": [
       "Project_TheirMethods"
@@ -1163,7 +1164,7 @@
    "techCategory": "Materials",
    "AI_techRole": "EarthPolitics",
    "AI_projectRole": "ExpandNation",
-   "researchCost": 2000,
+   "researchCost": 5000,
    "prereqs": [
       "ArrivalInternationalDevelopment"
    ],
@@ -1185,13 +1186,13 @@
    "techCategory": "Materials",
    "AI_techRole": "EarthPolitics",
    "AI_projectRole": "ExpandNation",
-   "researchCost": 1000,
+   "researchCost": 2500,
    "prereqs": [
       "ArrivalInternationalDevelopment"
    ],
    "effects": [
-      "Effect_RegionGDPGainYemen",
-      "Effect_RegionGDPGainMekelle"
+      "Effect_RegionGDPGainAden",
+      "Effect_RegionGDPGainDjibouti"
    ],
    "oneTimeGlobally": true,
    "repeatable": false,
@@ -1207,7 +1208,7 @@
    "techCategory": "Materials",
    "AI_techRole": "EarthPolitics",
    "AI_projectRole": "ExpandNation",
-   "researchCost": 2000,
+   "researchCost": 2500,
    "prereqs": [
       "ArrivalInternationalDevelopment"
    ],
@@ -1235,7 +1236,7 @@
    ],
    "effects": [
       "Effect_RegionGDPGainAlaska",
-      "Effect_RegionGDPGainRussianFarEast"
+      "Effect_RegionGDPGainKamchatka"
    ],
    "oneTimeGlobally": true,
    "repeatable": false,
@@ -1251,7 +1252,7 @@
    "techCategory": "Materials",
    "AI_techRole": "EarthPolitics",
    "AI_projectRole": "ExpandNation",
-   "researchCost": 2000,
+   "researchCost": 2500,
    "prereqs": [
       "ArrivalInternationalDevelopment"
    ],
@@ -1273,13 +1274,13 @@
    "techCategory": "Materials",
    "AI_techRole": "EarthPolitics",
    "AI_projectRole": "ExpandNation",
-   "researchCost": 2000,
+   "researchCost": 2500,
    "prereqs": [
       "ArrivalInternationalDevelopment"
    ],
    "effects": [
       "Effect_RegionGDPGainHijaz",
-      "Effect_RegionGDPGainEgypt"
+      "Effect_RegionGDPGainCairo"
    ],
    "oneTimeGlobally": true,
    "repeatable": false,
@@ -1295,7 +1296,7 @@
    "techCategory": "Materials",
    "AI_techRole": "EarthPolitics",
    "AI_projectRole": "ExpandNation",
-   "researchCost": 2000,
+   "researchCost": 2500,
    "prereqs": [
       "ArrivalInternationalDevelopment"
    ],
@@ -1332,6 +1333,72 @@
    "deltaUnlockChance": 0,
    "maxUnlockChance": 20,
    "resourcesGranted": []
+},
+ {
+   "friendlyName": "Diphu Pass",
+   "dataName": "Project_DiphuPass",
+   "techCategory": "Materials",
+   "AI_techRole": "EarthPolitics",
+   "AI_projectRole": "ExpandNation",
+   "researchCost": 2500,
+   "prereqs": [
+      "ArrivalInternationalDevelopment"
+   ],
+   "effects": [
+      "Effect_RegionGDPGainUpperMyanmar",
+      "Effect_RegionGDPGainTibet"
+   ],
+   "oneTimeGlobally": true,
+   "repeatable": false,
+   "factionAvailableChance": 20,
+   "initialUnlockChance": 20,
+   "deltaUnlockChance": 0,
+   "maxUnlockChance": 20,
+   "resourcesGranted": []
+},
+ {
+   "friendlyName": "Palk Strait Bridge",
+   "dataName": "Project_PalkStraitBridge",
+   "techCategory": "Materials",
+   "AI_techRole": "EarthPolitics",
+   "AI_projectRole": "ExpandNation",
+   "researchCost": 2500,
+   "prereqs": [
+      "ArrivalInternationalDevelopment"
+   ],
+   "effects": [
+      "Effect_RegionGDPGainChennai",
+      "Effect_RegionGDPGainSriLanka"
+   ],
+   "oneTimeGlobally": true,
+   "repeatable": false,
+   "factionAvailableChance": 20,
+   "initialUnlockChance": 20,
+   "deltaUnlockChance": 0,
+   "maxUnlockChance": 20,
+   "resourcesGranted": []
+},
+ {
+   "friendlyName": "North Channel Crossing",
+   "dataName": "Project_NorthChannelCrossing",
+   "techCategory": "Materials",
+   "AI_techRole": "EarthPolitics",
+   "AI_projectRole": "ExpandNation",
+   "researchCost": 7500,
+   "prereqs": [
+      "ArrivalInternationalDevelopment"
+   ],
+   "effects": [
+      "Effect_RegionGDPGainScotland",
+      "Effect_RegionGDPGainNorthernIreland"
+   ],
+   "oneTimeGlobally": true,
+   "repeatable": false,
+   "factionAvailableChance": 20,
+   "initialUnlockChance": 20,
+   "deltaUnlockChance": 0,
+   "maxUnlockChance": 20,
+   "resourcesGranted": []
 },
  {
    "friendlyName": "Atzlan Nation",
@@ -1343,6 +1410,7 @@
    "prereqs": [
       "UnityMovements"
    ],
+   "altPrereq0": "Project_MexicanLiberationMovements",
    "oneTimeGlobally": true,
    "repeatable": false,
    "factionAvailableChance": 100,
@@ -1363,7 +1431,6 @@
    ],
    "oneTimeGlobally": true,
    "repeatable": false,
-   "requiresNation": "IDN",
    "factionAvailableChance": 100,
    "initialUnlockChance": 0,
    "deltaUnlockChance": 5,
@@ -1382,7 +1449,6 @@
    ],
    "oneTimeGlobally": true,
    "repeatable": false,
-   "requiresNation": "USA",
    "factionAvailableChance": 100,
    "initialUnlockChance": 0,
    "deltaUnlockChance": 5,
@@ -1401,7 +1467,6 @@
    ],
    "oneTimeGlobally": true,
    "repeatable": false,
-   "requiresNation": "IND",
    "factionAvailableChance": 100,
    "initialUnlockChance": 0,
    "deltaUnlockChance": 5,
@@ -1420,7 +1485,6 @@
    ],
    "oneTimeGlobally": true,
    "repeatable": false,
-   "requiresNation": "BRA",
    "factionAvailableChance": 100,
    "initialUnlockChance": 0,
    "deltaUnlockChance": 5,
@@ -1439,7 +1503,6 @@
    ],
    "oneTimeGlobally": true,
    "repeatable": false,
-   "requiresNation": "CHN",
    "factionAvailableChance": 100,
    "initialUnlockChance": 0,
    "deltaUnlockChance": 5,
@@ -1458,7 +1521,6 @@
    ],
    "oneTimeGlobally": true,
    "repeatable": false,
-   "requiresNation": "RUS",
    "factionAvailableChance": 100,
    "initialUnlockChance": 0,
    "deltaUnlockChance": 5,
@@ -1477,7 +1539,6 @@
    ],
    "oneTimeGlobally": true,
    "repeatable": false,
-   "requiresNation": "JPN",
    "factionAvailableChance": 100,
    "initialUnlockChance": 0,
    "deltaUnlockChance": 5,
@@ -1496,7 +1557,6 @@
    ],
    "oneTimeGlobally": true,
    "repeatable": false,
-   "requiresNation": "RUS",
    "factionAvailableChance": 100,
    "initialUnlockChance": 0,
    "deltaUnlockChance": 5,
@@ -1515,7 +1575,6 @@
    ],
    "oneTimeGlobally": true,
    "repeatable": false,
-   "requiresNation": "PAK",
    "factionAvailableChance": 100,
    "initialUnlockChance": 0,
    "deltaUnlockChance": 5,
@@ -1534,7 +1593,6 @@
    ],
    "oneTimeGlobally": true,
    "repeatable": false,
-   "requiresNation": "AUS",
    "factionAvailableChance": 100,
    "initialUnlockChance": 0,
    "deltaUnlockChance": 5,
@@ -1584,7 +1642,7 @@
    "techCategory": "SocialScience",
    "AI_techRole": "EarthPolitics",
    "AI_projectRole": "ExpandNation",
-   "researchCost": 25000,
+   "researchCost": 20000,
    "prereqs": [
       "GreatNations"
    ],
@@ -1603,7 +1661,7 @@
    "techCategory": "SocialScience",
    "AI_techRole": "EarthPolitics",
    "AI_projectRole": "ExpandNation",
-   "researchCost": 35000,
+   "researchCost": 30000,
    "prereqs": [
       "Project_UnitedNorthAmerica"
    ],
@@ -1622,7 +1680,7 @@
    "techCategory": "SocialScience",
    "AI_techRole": "EarthPolitics",
    "AI_projectRole": "ExpandNation",
-   "researchCost": 20000,
+   "researchCost": 10000,
    "prereqs": [
       "GreatNations",
       "Project_EndofAmerica"
@@ -1642,7 +1700,7 @@
    "techCategory": "SocialScience",
    "AI_techRole": "EarthPolitics",
    "AI_projectRole": "ExpandNation",
-   "researchCost": 25000,
+   "researchCost": 20000,
    "prereqs": [
       "GreatNations"
    ],
@@ -1673,6 +1731,27 @@
    "deltaUnlockChance": 5,
    "maxUnlockChance": 50,
    "resourcesGranted": []
+},
+ {
+   "friendlyName": "Unidad Colombia",
+   "dataName": "Project_UnidadColombia",
+   "techCategory": "SocialScience",
+   "AI_techRole": "EarthPolitics",
+   "AI_projectRole": "ExpandNation",
+   "researchCost": 15000,
+   "prereqs": [
+      "GreatNations",
+      "Project_GranColombia",
+      "Project_DarienGapRoad"
+   ],
+   "oneTimeGlobally": true,
+   "repeatable": false,
+   "requiresNation": "COL",
+   "factionAvailableChance": 100,
+   "initialUnlockChance": 0,
+   "deltaUnlockChance": 5,
+   "maxUnlockChance": 50,
+   "resourcesGranted": []
 },
  {
    "friendlyName": "South American Union",
@@ -1680,7 +1759,7 @@
    "techCategory": "SocialScience",
    "AI_techRole": "EarthPolitics",
    "AI_projectRole": "ExpandNation",
-   "researchCost": 20000,
+   "researchCost": 10000,
    "prereqs": [
       "GreatNations"
    ],
@@ -1699,7 +1778,7 @@
    "techCategory": "SocialScience",
    "AI_techRole": "EarthPolitics",
    "AI_projectRole": "ExpandNation",
-   "researchCost": 20000,
+   "researchCost": 15000,
    "prereqs": [
       "UnityMovements"
    ],
@@ -1756,7 +1835,7 @@
    "techCategory": "SocialScience",
    "AI_techRole": "EarthPolitics",
    "AI_projectRole": "ExpandNation",
-   "researchCost": 20000,
+   "researchCost": 10000,
    "prereqs": [
       "UnityMovements"
    ],
@@ -1775,7 +1854,7 @@
    "techCategory": "SocialScience",
    "AI_techRole": "EarthPolitics",
    "AI_projectRole": "ExpandNation",
-   "researchCost": 50000,
+   "researchCost": 40000,
    "prereqs": [
       "GreatNations",
       "Project_GreaterIndonesia"
@@ -1795,7 +1874,7 @@
    "techCategory": "SocialScience",
    "AI_techRole": "EarthPolitics",
    "AI_projectRole": "ExpandNation",
-   "researchCost": 20000,
+   "researchCost": 10000,
    "prereqs": [
       "UnityMovements"
    ],
@@ -1878,7 +1957,6 @@
    ],
    "oneTimeGlobally": true,
    "repeatable": false,
-   "requiresNation": "EUA",
    "factionAvailableChance": 100,
    "initialUnlockChance": 0,
    "deltaUnlockChance": 5,
@@ -1910,7 +1988,7 @@
    "techCategory": "SocialScience",
    "AI_techRole": "EarthPolitics",
    "AI_projectRole": "ExpandNation",
-   "researchCost": 5000,
+   "researchCost": 2500,
    "prereqs": [
       "UnityMovements"
    ],
@@ -1948,7 +2026,7 @@
    "techCategory": "SocialScience",
    "AI_techRole": "EarthPolitics",
    "AI_projectRole": "ExpandNation",
-   "researchCost": 20000,
+   "researchCost": 15000,
    "prereqs": [
       "GreatNations"
    ],
@@ -2083,7 +2161,7 @@
    "techCategory": "SocialScience",
    "AI_techRole": "EarthPolitics",
    "AI_projectRole": "ExpandNation",
-   "researchCost": 20000,
+   "researchCost": 40000,
    "prereqs": [
       "UnityMovements"
    ],
@@ -2121,7 +2199,7 @@
    "techCategory": "SocialScience",
    "AI_techRole": "EarthPolitics",
    "AI_projectRole": "ExpandNation",
-   "researchCost": 10000,
+   "researchCost": 5000,
    "prereqs": [
       "UnityMovements"
    ],
@@ -2140,7 +2218,7 @@
    "techCategory": "SocialScience",
    "AI_techRole": "EarthPolitics",
    "AI_projectRole": "ExpandNation",
-   "researchCost": 15000,
+   "researchCost": 10000,
    "prereqs": [
       "UnityMovements"
    ],
@@ -2159,7 +2237,7 @@
    "techCategory": "SocialScience",
    "AI_techRole": "EarthPolitics",
    "AI_projectRole": "ExpandNation",
-   "researchCost": 40000,
+   "researchCost": 25000,
    "prereqs": [
       "GreatNations"
    ],
@@ -2173,12 +2251,12 @@
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Occitan Independence Movement",
-   "dataName": "Project_OccitanIndependenceMovement",
+   "friendlyName": "French Independence Movements",
+   "dataName": "Project_FrenchIndependenceMovements",
    "techCategory": "SocialScience",
    "AI_techRole": "EarthPolitics",
    "AI_projectRole": "NeutralizeNation",
-   "researchCost": 500,
+   "researchCost": 1000,
    "prereqs": [
       "FallofEmpires"
    ],
@@ -2268,7 +2346,7 @@
    "techCategory": "SocialScience",
    "AI_techRole": "EarthPolitics",
    "AI_projectRole": "ExpandNation",
-   "researchCost": 5000,
+   "researchCost": 2500,
    "prereqs": [
       "UnityMovements"
    ],
@@ -2346,9 +2424,10 @@
    "AI_projectRole": "ExpandNation",
    "researchCost": 10000,
    "prereqs": [
-      "UnityMovements",
-      "Project_EndofAmerica"
+      "Project_EndofAmerica",
+      "UnityMovements"
    ],
+   "altPrereq0": "Project_ForwardRussia",
    "oneTimeGlobally": true,
    "repeatable": false,
    "requiresNation": "GBR",
@@ -2364,10 +2443,11 @@
    "techCategory": "SocialScience",
    "AI_techRole": "EarthPolitics",
    "AI_projectRole": "ExpandNation",
-   "researchCost": 30000,
+   "researchCost": 15000,
    "prereqs": [
       "Project_Pan-AsianCooperative"
    ],
+   "altPrereq0": "Project_EndofAmerica",
    "oneTimeGlobally": true,
    "repeatable": false,
    "requiresNation": "JPN",
@@ -2382,6 +2462,7 @@
    "dataName": "Project_CompositeArmor",
    "techCategory": "Materials",
    "AI_techRole": "SpaceWar",
+   "AI_criticalTech": true,
    "AI_projectRole": "Armor",
    "researchCost": 1000,
    "prereqs": [
@@ -2395,12 +2476,32 @@
    "deltaUnlockChance": 5,
    "maxUnlockChance": 35,
    "resourcesGranted": []
+},
+ {
+   "friendlyName": "Foamed Metal Armor",
+   "dataName": "Project_FoamedMetalArmor",
+   "techCategory": "Materials",
+   "AI_techRole": "SpaceWar",
+   "AI_projectRole": "Armor",
+   "researchCost": 2500,
+   "prereqs": [
+      "OrbitalShipbuilding",
+      "Superalloys"
+   ],
+   "oneTimeGlobally": false,
+   "repeatable": false,
+   "factionAvailableChance": 100,
+   "initialUnlockChance": 0,
+   "deltaUnlockChance": 5,
+   "maxUnlockChance": 50,
+   "resourcesGranted": []
 },
  {
    "friendlyName": "Nanotube Armor",
    "dataName": "Project_NanotubeArmor",
    "techCategory": "Materials",
    "AI_techRole": "SpaceWar",
+   "AI_criticalTech": true,
    "AI_projectRole": "Armor",
    "researchCost": 5000,
    "prereqs": [
@@ -2424,9 +2525,8 @@
    "AI_projectRole": "Armor",
    "researchCost": 10000,
    "prereqs": [
-      "OrbitalShipbuilding",
-      "Diamondoids",
-      "ImprovedShipbuildingTechniques"
+      "ImprovedShipbuildingTechniques",
+      "Diamondoids"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
@@ -2444,7 +2544,6 @@
    "AI_projectRole": "Armor",
    "researchCost": 10000,
    "prereqs": [
-      "OrbitalShipbuilding",
       "ImprovedShipbuildingTechniques",
       "Project_Exotics"
    ],
@@ -2465,8 +2564,7 @@
    "researchCost": 10000,
    "prereqs": [
       "Project_ExoticArmor",
-      "Diamondoids",
-      "MolecularAssemblers"
+      "Project_AdamantaneArmor"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
@@ -2577,9 +2675,8 @@
    "AI_projectRole": "Batteries",
    "researchCost": 5000,
    "prereqs": [
-      "OrbitalShipbuilding",
-      "HighTemperatureSuperconductors",
-      "ImprovedShipbuildingTechniques"
+      "ImprovedShipbuildingTechniques",
+      "HighTemperatureSuperconductors"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
@@ -2597,9 +2694,8 @@
    "AI_projectRole": "Batteries",
    "researchCost": 10000,
    "prereqs": [
-      "OrbitalShipbuilding",
-      "Project_Exotics",
-      "ImprovedShipbuildingTechniques"
+      "ImprovedShipbuildingTechniques",
+      "Project_Exotics"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
@@ -2786,6 +2882,26 @@
    "deltaUnlockChance": 5,
    "maxUnlockChance": 35,
    "resourcesGranted": []
+},
+ {
+   "friendlyName": "Ultracold Neutron Containment",
+   "dataName": "Project_UltracoldNeutronContainment",
+   "techCategory": "Materials",
+   "AI_techRole": "SpaceWar",
+   "AI_projectRole": "Propulsion",
+   "researchCost": 10000,
+   "prereqs": [
+      "Neutronics",
+      "Diamondoids",
+      "Project_Exotics"
+   ],
+   "oneTimeGlobally": false,
+   "repeatable": false,
+   "factionAvailableChance": 100,
+   "initialUnlockChance": 10,
+   "deltaUnlockChance": 5,
+   "maxUnlockChance": 100,
+   "resourcesGranted": []
 },
  {
    "friendlyName": "Interplanetary Warships",
@@ -2891,7 +3007,7 @@
    "dataName": "Project_ISRUModule",
    "techCategory": "SpaceScience",
    "AI_techRole": "SpaceDevelopment",
-   "AI_projectRole": "Exploration",
+   "AI_projectRole": "Fleet",
    "researchCost": 1000,
    "prereqs": [
       "OrbitalShipbuilding",
@@ -2914,10 +3030,9 @@
    "dataName": "Project_RemassScoop",
    "techCategory": "Materials",
    "AI_techRole": "SpaceDevelopment",
-   "AI_projectRole": "Exploration",
+   "AI_projectRole": "Fleet",
    "researchCost": 1000,
    "prereqs": [
-      "OrbitalShipbuilding",
       "ImprovedShipbuildingTechniques"
    ],
    "oneTimeGlobally": false,
@@ -2961,8 +3076,9 @@
    "researchCost": 1500,
    "prereqs": [
       "OrbitalShipbuilding",
-      "NuclearFusioninSpace",
-      "AdvancedAtomicManipulation"
+      "DeuteriumTritiumFusion",
+      "AdvancedAtomicManipulation",
+      "ParticleCannon"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
@@ -2981,7 +3097,7 @@
    "researchCost": 2000,
    "prereqs": [
       "OrbitalShipbuilding",
-      "NeutroniumContainment"
+      "Project_UltracoldNeutronContainment"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
@@ -3008,7 +3124,12 @@
    "initialUnlockChance": 0,
    "deltaUnlockChance": 5,
    "maxUnlockChance": 100,
-   "resourcesGranted": []
+   "resourcesGranted": [
+      {
+         "resource": "Antimatter",
+         "value": 1.8e-10
+      }
+   ]
 },
  {
    "friendlyName": "Mobile Space Science Lab",
@@ -3037,7 +3158,7 @@
    "AI_projectRole": "Fleet",
    "researchCost": 500,
    "prereqs": [
-      "FleetLogistics"
+      "MilitarizationofSpace"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
@@ -3056,7 +3177,6 @@
    "AI_projectRole": "Marines",
    "researchCost": 500,
    "prereqs": [
-      "OrbitalShipbuilding",
       "MilitarizationofSpace"
    ],
    "oneTimeGlobally": false,
@@ -3076,7 +3196,6 @@
    "AI_projectRole": "Marines",
    "researchCost": 1000,
    "prereqs": [
-      "OrbitalShipbuilding",
       "SpaceAssaultDoctrine",
       "Project_MarineAssaultUnit"
    ],
@@ -3097,7 +3216,6 @@
    "AI_projectRole": "Marines",
    "researchCost": 2500,
    "prereqs": [
-      "OrbitalShipbuilding",
       "OurSpaceFuture",
       "Project_AdvancedMarineAssaultUnit"
    ],
@@ -3147,6 +3265,25 @@
    "deltaUnlockChance": 5,
    "maxUnlockChance": 100,
    "resourcesGranted": []
+},
+ {
+   "friendlyName": "Cyclotron",
+   "dataName": "Project_Cyclotron",
+   "techCategory": "Energy",
+   "AI_techRole": "SpaceWar",
+   "AI_projectRole": "EnergyWeapons",
+   "researchCost": 5000,
+   "prereqs": [
+      "SuperconductingMagnets",
+      "Project_ElectronLance"
+   ],
+   "oneTimeGlobally": false,
+   "repeatable": false,
+   "factionAvailableChance": 50,
+   "initialUnlockChance": 0,
+   "deltaUnlockChance": 5,
+   "maxUnlockChance": 100,
+   "resourcesGranted": []
 },
  {
    "friendlyName": "Liquid Hydrogen Containment",
@@ -3172,10 +3309,10 @@
    "dataName": "Project_SlushHydrogenTankage",
    "techCategory": "Materials",
    "AI_techRole": "SpaceDevelopment",
+   "AI_criticalTech": true,
    "AI_projectRole": "Propulsion",
    "researchCost": 1000,
    "prereqs": [
-      "OrbitalShipbuilding",
       "AdvancedHydrogenContainment",
       "Project_LiquidHydrogenContainment"
    ],
@@ -3192,11 +3329,10 @@
    "dataName": "Project_HydronTrap",
    "techCategory": "Materials",
    "AI_techRole": "SpaceDevelopment",
+   "AI_criticalTech": true,
    "AI_projectRole": "Propulsion",
    "researchCost": 5000,
    "prereqs": [
-      "OrbitalShipbuilding",
-      "AdvancedHydrogenContainment",
       "AdvancedAtomicManipulation",
       "Project_SlushHydrogenTankage",
       "Project_ExoticHybridSystems"
@@ -3214,6 +3350,7 @@
    "dataName": "Project_Magazine",
    "techCategory": "MilitaryScience",
    "AI_techRole": "SpaceWar",
+   "AI_criticalTech": true,
    "AI_projectRole": "Missiles",
    "researchCost": 500,
    "prereqs": [
@@ -3253,7 +3390,6 @@
    "AI_projectRole": "HabInfrastructure",
    "researchCost": 350,
    "prereqs": [
-      "OrbitalShipbuilding",
       "Project_PlatformCore",
       "Project_SolarCollector",
       "Project_ConstructionModule"
@@ -3274,7 +3410,6 @@
    "AI_projectRole": "HabInfrastructure",
    "researchCost": 350,
    "prereqs": [
-      "OrbitalShipbuilding",
       "Project_OutpostCore",
       "Project_SolarCollector",
       "Project_ConstructionModule"
@@ -3296,7 +3431,6 @@
    "AI_projectRole": "HabInfrastructure",
    "researchCost": 500,
    "prereqs": [
-      "OrbitalShipbuilding",
       "Project_PlatformCore",
       "Project_FissionPile",
       "Project_ConstructionModule"
@@ -3318,7 +3452,6 @@
    "AI_projectRole": "HabInfrastructure",
    "researchCost": 500,
    "prereqs": [
-      "OrbitalShipbuilding",
       "Project_OutpostCore",
       "Project_FissionPile",
       "Project_ConstructionModule"
@@ -3339,7 +3472,6 @@
    "AI_projectRole": "HabInfrastructure",
    "researchCost": 1500,
    "prereqs": [
-      "OrbitalShipbuilding",
       "Project_PlatformCore",
       "Project_FusionPile",
       "Project_ConstructionModule"
@@ -3360,7 +3492,6 @@
    "AI_projectRole": "HabInfrastructure",
    "researchCost": 1500,
    "prereqs": [
-      "OrbitalShipbuilding",
       "Project_OutpostCore",
       "Project_FusionPile",
       "Project_ConstructionModule"
@@ -3381,8 +3512,6 @@
    "AI_projectRole": "HabInfrastructure",
    "researchCost": 1000,
    "prereqs": [
-      "OrbitalShipbuilding",
-      "Project_AutomatedPlatformCore",
       "Project_AutomatedSolarCollector",
       "Project_AutomatedSupplyDepot"
    ],
@@ -3402,8 +3531,6 @@
    "AI_projectRole": "HabInfrastructure",
    "researchCost": 5000,
    "prereqs": [
-      "OrbitalShipbuilding",
-      "Project_AutomatedOutpostCore",
       "Project_AutomatedSolarCollector",
       "Project_AutomatedMiningComplex"
    ],
@@ -3423,8 +3550,6 @@
    "AI_projectRole": "HabInfrastructure",
    "researchCost": 1500,
    "prereqs": [
-      "OrbitalShipbuilding",
-      "Project_AutomatedPlatformCore",
       "Project_AutomatedFissionPile",
       "Project_AutomatedSupplyDepot"
    ],
@@ -3444,8 +3569,6 @@
    "AI_projectRole": "HabInfrastructure",
    "researchCost": 6500,
    "prereqs": [
-      "OrbitalShipbuilding",
-      "Project_AutomatedOutpostCore",
       "Project_AutomatedFissionPile",
       "Project_AutomatedMiningComplex"
    ],
@@ -3458,12 +3581,33 @@
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Antimatter Trap",
-   "dataName": "Project_AntimatterTrap",
-   "techCategory": "Materials",
+   "friendlyName": "Administration Node",
+   "dataName": "Project_AdministrationNode",
+   "techCategory": "SocialScience",
    "AI_techRole": "SpaceDevelopment",
-   "AI_projectRole": "Antimatter",
-   "researchCost": 500,
+   "AI_projectRole": "ControlPointCap",
+   "researchCost": 1000,
+   "prereqs": [
+      "Project_PlatformCore",
+      "AdvancedNeuralNetworks",
+      "ArrivalDomesticPolitics"
+   ],
+   "altPrereq0": "Project_OutpostCore",
+   "oneTimeGlobally": false,
+   "repeatable": false,
+   "factionAvailableChance": 100,
+   "initialUnlockChance": 8,
+   "deltaUnlockChance": 12,
+   "maxUnlockChance": 100,
+   "resourcesGranted": []
+},
+ {
+   "friendlyName": "Antimatter Trap",
+   "dataName": "Project_AntimatterTrap",
+   "techCategory": "Materials",
+   "AI_techRole": "SpaceDevelopment",
+   "AI_projectRole": "Antimatter",
+   "researchCost": 500,
    "prereqs": [
       "Project_PlatformCore",
       "AntimatterContainment"
@@ -3523,11 +3667,11 @@
    "AI_projectRole": "HabInfrastructure",
    "researchCost": 1000,
    "prereqs": [
-      "Project_PlatformCore",
+      "Project_AutomatedPlatformCore",
       "Project_FissionPile",
-      "AdministrationAlgorithms"
+      "WhiteCollarAutomation"
    ],
-   "altPrereq0": "Project_OutpostCore",
+   "altPrereq0": "Project_AutomatedOutpostCore",
    "oneTimeGlobally": false,
    "repeatable": false,
    "factionAvailableChance": 100,
@@ -3544,9 +3688,8 @@
    "AI_projectRole": "HabInfrastructure",
    "researchCost": 1000,
    "prereqs": [
-      "Project_OutpostCore",
-      "Project_OutpostMiningComplex",
-      "AppliedArtificialIntelligence"
+      "Project_AutomatedOutpostCore",
+      "Project_OutpostMiningComplex"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
@@ -3564,7 +3707,6 @@
    "AI_projectRole": "HabInfrastructure",
    "researchCost": 1000,
    "prereqs": [
-      "Project_OutpostCore",
       "Project_OutpostCore",
       "AppliedArtificialIntelligence"
    ],
@@ -3587,7 +3729,6 @@
    "AI_projectRole": "HabInfrastructure",
    "researchCost": 1000,
    "prereqs": [
-      "Project_PlatformCore",
       "Project_PlatformCore",
       "AppliedArtificialIntelligence"
    ],
@@ -3610,11 +3751,10 @@
    "AI_projectRole": "HabInfrastructure",
    "researchCost": 200,
    "prereqs": [
-      "Project_PlatformCore",
-      "Project_SolarCollector",
-      "AppliedArtificialIntelligence"
+      "Project_AutomatedPlatformCore",
+      "Project_SolarCollector"
    ],
-   "altPrereq0": "Project_OutpostCore",
+   "altPrereq0": "Project_AutomatedOutpostCore",
    "oneTimeGlobally": false,
    "repeatable": false,
    "factionAvailableChance": 100,
@@ -3631,11 +3771,10 @@
    "AI_projectRole": "HabInfrastructure",
    "researchCost": 200,
    "prereqs": [
-      "Project_PlatformCore",
-      "Project_SupplyDepot",
-      "AppliedArtificialIntelligence"
+      "Project_AutomatedPlatformCore",
+      "Project_SupplyDepot"
    ],
-   "altPrereq0": "Project_OutpostCore",
+   "altPrereq0": "Project_AutomatedOutpostCore",
    "oneTimeGlobally": false,
    "repeatable": false,
    "factionAvailableChance": 100,
@@ -3735,7 +3874,7 @@
    "researchCost": 2500,
    "prereqs": [
       "Project_PlatformCore",
-      "NuclearFusioninSpace"
+      "DeuteriumTritiumFusion"
    ],
    "altPrereq0": "Project_OutpostCore",
    "oneTimeGlobally": false,
@@ -3765,6 +3904,25 @@
    "deltaUnlockChance": 6,
    "maxUnlockChance": 100,
    "resourcesGranted": []
+},
+ {
+   "friendlyName": "Heavy Fusion Pile",
+   "dataName": "Project_HeavyFusionPile",
+   "techCategory": "Energy",
+   "AI_techRole": "SpaceDevelopment",
+   "AI_projectRole": "HabInfrastructure",
+   "researchCost": 5000,
+   "prereqs": [
+      "AneutronicFusion",
+      "Project_FusionPile"
+   ],
+   "oneTimeGlobally": false,
+   "repeatable": false,
+   "factionAvailableChance": 100,
+   "initialUnlockChance": 0,
+   "deltaUnlockChance": 6,
+   "maxUnlockChance": 100,
+   "resourcesGranted": []
 },
  {
    "friendlyName": "Hydroponics Bay",
@@ -3811,7 +3969,6 @@
    "dataName": "Project_LifeScienceLab",
    "techCategory": "LifeScience",
    "AI_techRole": "SpaceDevelopment",
-   "AI_projectRole": "Research",
    "researchCost": 300,
    "prereqs": [
       "Project_PlatformCore"
@@ -3927,6 +4084,20 @@
    "deltaUnlockChance": 25,
    "maxUnlockChance": 100,
    "resourcesGranted": []
+},
+ {
+   "friendlyName": "Particle Collider",
+   "dataName": "Project_ParticleCollider",
+   "techCategory": "Energy",
+   "AI_techRole": "SpaceDevelopment",
+   "AI_projectRole": "Antimatter",
+   "researchCost": 15000,
+   "prereqs": [
+      "AntimatterContainment",
+      "ParticleCannon",
+      "Project_PlatformCore"
+   ],
+   "resourcesGranted": []
 },
  {
    "friendlyName": "Platform Core",
@@ -4137,8 +4308,9 @@
    "researchCost": 2000,
    "prereqs": [
       "Project_OrbitalCore",
-      "AdministrationAlgorithms",
-      "ExtendedSpaceSurvival"
+      "Project_AdministrationNode",
+      "WhiteCollarAutomation",
+      "ArrivalInternationalRelations"
    ],
    "altPrereq0": "Project_SettlementCore",
    "oneTimeGlobally": false,
@@ -4155,11 +4327,10 @@
    "techCategory": "Energy",
    "AI_techRole": "SpaceDevelopment",
    "AI_projectRole": "Antimatter",
-   "researchCost": 1000,
+   "researchCost": 30000,
    "prereqs": [
       "Project_OrbitalCore",
-      "AdvancedAtomicManipulation",
-      "HighEnergyLasers",
+      "Project_ParticleCollider",
       "AntimatterMassProduction"
    ],
    "oneTimeGlobally": false,
@@ -4179,7 +4350,8 @@
    "researchCost": 1000,
    "prereqs": [
       "Project_OrbitalCore",
-      "Project_BroadcastOutlet"
+      "Project_BroadcastOutlet",
+      "NetworkedPropaganda"
    ],
    "altPrereq0": "Project_SettlementCore",
    "oneTimeGlobally": false,
@@ -4222,7 +4394,7 @@
    "techCategory": "Energy",
    "AI_techRole": "SpaceDevelopment",
    "AI_projectRole": "Research",
-   "researchCost": 1000,
+   "researchCost": 1500,
    "prereqs": [
       "Project_OrbitalCore",
       "Project_EnergyLab",
@@ -4319,6 +4491,25 @@
    "deltaUnlockChance": 6,
    "maxUnlockChance": 100,
    "resourcesGranted": []
+},
+ {
+   "friendlyName": "Heavy Fusion Reactor Array",
+   "dataName": "Project_HeavyFusionReactorArray",
+   "techCategory": "Energy",
+   "AI_techRole": "SpaceDevelopment",
+   "AI_projectRole": "HabInfrastructure",
+   "researchCost": 10000,
+   "prereqs": [
+      "Project_HeavyFusionPile",
+      "Project_FusionReactorArray"
+   ],
+   "oneTimeGlobally": false,
+   "repeatable": false,
+   "factionAvailableChance": 100,
+   "initialUnlockChance": 0,
+   "deltaUnlockChance": 6,
+   "maxUnlockChance": 100,
+   "resourcesGranted": []
 },
  {
    "friendlyName": "Information Science Research Center",
@@ -4326,7 +4517,7 @@
    "techCategory": "InformationScience",
    "AI_techRole": "SpaceDevelopment",
    "AI_projectRole": "Research",
-   "researchCost": 1000,
+   "researchCost": 1500,
    "prereqs": [
       "Project_OrbitalCore",
       "Project_InformationScienceLab",
@@ -4369,7 +4560,7 @@
    "techCategory": "LifeScience",
    "AI_techRole": "SpaceDevelopment",
    "AI_projectRole": "Research",
-   "researchCost": 1000,
+   "researchCost": 1500,
    "prereqs": [
       "Project_OrbitalCore",
       "Project_LifeScienceLab",
@@ -4412,7 +4603,7 @@
    "techCategory": "Materials",
    "AI_techRole": "SpaceDevelopment",
    "AI_projectRole": "Research",
-   "researchCost": 1000,
+   "researchCost": 1500,
    "prereqs": [
       "Project_OrbitalCore",
       "Project_MaterialsLab",
@@ -4433,7 +4624,7 @@
    "techCategory": "MilitaryScience",
    "AI_techRole": "SpaceWar",
    "AI_projectRole": "Research",
-   "researchCost": 1000,
+   "researchCost": 1500,
    "prereqs": [
       "Project_OrbitalCore",
       "Project_MilitaryScienceLab",
@@ -4493,7 +4684,7 @@
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Orbital Hospital",
+   "friendlyName": "Orbital Medical Center",
    "dataName": "Project_OrbitalHospital",
    "techCategory": "LifeScience",
    "AI_techRole": "SpaceDevelopment",
@@ -4518,7 +4709,7 @@
    "AI_techRole": "SpaceDevelopment",
    "AI_criticalTech": true,
    "AI_projectRole": "Research",
-   "researchCost": 1500,
+   "researchCost": 2500,
    "prereqs": [
       "Project_OrbitalCore",
       "QuantumComputing"
@@ -4669,7 +4860,7 @@
    "techCategory": "SocialScience",
    "AI_techRole": "SpaceDevelopment",
    "AI_projectRole": "Research",
-   "researchCost": 1000,
+   "researchCost": 1500,
    "prereqs": [
       "Project_OrbitalCore",
       "Project_SocialScienceLab",
@@ -4730,7 +4921,7 @@
    "techCategory": "SpaceScience",
    "AI_techRole": "SpaceDevelopment",
    "AI_projectRole": "Research",
-   "researchCost": 1000,
+   "researchCost": 1500,
    "prereqs": [
       "Project_OrbitalCore",
       "Project_SpaceScienceLab",
@@ -4751,7 +4942,7 @@
    "techCategory": "Xenology",
    "AI_techRole": "SpaceDevelopment",
    "AI_projectRole": "Objective",
-   "researchCost": 1000,
+   "researchCost": 1500,
    "prereqs": [
       "Project_OrbitalCore",
       "Project_XenologyLab",
@@ -4776,7 +4967,7 @@
    "prereqs": [
       "Project_RingCore",
       "Project_AdministrationTower",
-      "WhiteCollarAutomation",
+      "AdministrationAlgorithms",
       "ArrivalGovernance"
    ],
    "altPrereq0": "Project_ColonyCore",
@@ -4795,10 +4986,11 @@
    "AI_techRole": "SpaceDevelopment",
    "AI_criticalTech": true,
    "AI_projectRole": "HabInfrastructure",
-   "researchCost": 3000,
+   "researchCost": 5000,
    "prereqs": [
       "Project_RingCore",
-      "Project_Farm"
+      "Project_Farm",
+      "DesignerLifeforms"
    ],
    "altPrereq0": "Project_ColonyCore",
    "oneTimeGlobally": false,
@@ -4885,7 +5077,8 @@
    "researchCost": 3000,
    "prereqs": [
       "Project_ColonyCore",
-      "Project_SettlementMiningComplex"
+      "Project_SettlementMiningComplex",
+      "Superalloys"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
@@ -4902,10 +5095,12 @@
    "AI_techRole": "SpaceDevelopment",
    "AI_criticalTech": true,
    "AI_projectRole": "MissionControl",
-   "researchCost": 3000,
+   "researchCost": 10000,
    "prereqs": [
       "Project_RingCore",
-      "Project_OperationsCenter"
+      "Project_OperationsCenter",
+      "QuantumEncryption",
+      "FleetLogistics"
    ],
    "altPrereq0": "Project_ColonyCore",
    "oneTimeGlobally": false,
@@ -4922,10 +5117,11 @@
    "techCategory": "Energy",
    "AI_techRole": "SpaceDevelopment",
    "AI_projectRole": "Research",
-   "researchCost": 3000,
+   "researchCost": 10000,
    "prereqs": [
       "Project_RingCore",
-      "Project_EnergyResearchCenter"
+      "Project_EnergyResearchCenter",
+      "AdministrationAlgorithms"
    ],
    "altPrereq0": "Project_ColonyCore",
    "oneTimeGlobally": false,
@@ -4946,7 +5142,7 @@
    "researchCost": 3000,
    "prereqs": [
       "Project_RingCore",
-      "Project_FissionPile"
+      "Project_FissionReactorArray"
    ],
    "altPrereq0": "Project_ColonyCore",
    "oneTimeGlobally": false,
@@ -4964,10 +5160,11 @@
    "AI_techRole": "SpaceDevelopment",
    "AI_criticalTech": true,
    "AI_projectRole": "Research",
-   "researchCost": 3000,
+   "researchCost": 10000,
    "prereqs": [
       "Project_RingCore",
-      "Project_SkunkWorks"
+      "Project_SkunkWorks",
+      "AdministrationAlgorithms"
    ],
    "altPrereq0": "Project_ColonyCore",
    "oneTimeGlobally": false,
@@ -5000,15 +5197,16 @@
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Geriatrics Facility",
+   "friendlyName": "Space Hospital",
    "dataName": "Project_GeriatricsFacility",
    "techCategory": "LifeScience",
    "AI_techRole": "SpaceDevelopment",
    "AI_projectRole": "Money",
-   "researchCost": 3000,
+   "researchCost": 5000,
    "prereqs": [
       "Project_RingCore",
-      "Project_OrbitalHospital"
+      "Project_OrbitalHospital",
+      "TransformPhages"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
@@ -5046,7 +5244,7 @@
    "AI_techRole": "SpaceDevelopment",
    "AI_criticalTech": true,
    "AI_projectRole": "HabInfrastructure",
-   "researchCost": 15000,
+   "researchCost": 25000,
    "prereqs": [
       "Project_FusionReactorFarm",
       "TerawattFusionReactors"
@@ -5058,6 +5256,27 @@
    "deltaUnlockChance": 5,
    "maxUnlockChance": 100,
    "resourcesGranted": []
+},
+ {
+   "friendlyName": "Helium-3 Mine",
+   "dataName": "Project_Helium-3Mine",
+   "techCategory": "SpaceScience",
+   "AI_techRole": "SpaceDevelopment",
+   "AI_projectRole": "Propulsion",
+   "researchCost": 5000,
+   "prereqs": [
+      "Project_RingCore",
+      "DeuteriumHelium3Fusion",
+      "MissiontoJupiter",
+      "SpaceMiningandRefining"
+   ],
+   "oneTimeGlobally": false,
+   "repeatable": false,
+   "factionAvailableChance": 100,
+   "initialUnlockChance": 0,
+   "deltaUnlockChance": 10,
+   "maxUnlockChance": 100,
+   "resourcesGranted": []
 },
  {
    "friendlyName": "Information Science Institute",
@@ -5065,10 +5284,11 @@
    "techCategory": "InformationScience",
    "AI_techRole": "SpaceDevelopment",
    "AI_projectRole": "Research",
-   "researchCost": 3000,
+   "researchCost": 10000,
    "prereqs": [
       "Project_RingCore",
-      "Project_InformationScienceResearchCenter"
+      "Project_InformationScienceResearchCenter",
+      "QuantumComputing"
    ],
    "altPrereq0": "Project_ColonyCore",
    "oneTimeGlobally": false,
@@ -5111,10 +5331,11 @@
    "techCategory": "LifeScience",
    "AI_techRole": "SpaceDevelopment",
    "AI_projectRole": "Research",
-   "researchCost": 3000,
+   "researchCost": 10000,
    "prereqs": [
       "Project_RingCore",
-      "Project_LifeScienceResearchCenter"
+      "Project_LifeScienceResearchCenter",
+      "AppliedArtificialIntelligence"
    ],
    "altPrereq0": "Project_ColonyCore",
    "oneTimeGlobally": false,
@@ -5132,7 +5353,7 @@
    "AI_techRole": "SpaceWar",
    "AI_criticalTech": true,
    "AI_projectRole": "HabDefense",
-   "researchCost": 3000,
+   "researchCost": 5000,
    "prereqs": [
       "Project_RingCore",
       "Project_MarineCompanyBarracks"
@@ -5152,10 +5373,11 @@
    "techCategory": "Materials",
    "AI_techRole": "SpaceDevelopment",
    "AI_projectRole": "Research",
-   "researchCost": 3000,
+   "researchCost": 10000,
    "prereqs": [
       "Project_RingCore",
-      "Project_MaterialsResearchCenter"
+      "Project_MaterialsResearchCenter",
+      "AppliedArtificialIntelligence"
    ],
    "altPrereq0": "Project_ColonyCore",
    "oneTimeGlobally": false,
@@ -5172,10 +5394,11 @@
    "techCategory": "SocialScience",
    "AI_techRole": "SpaceDevelopment",
    "AI_projectRole": "Influence",
-   "researchCost": 3000,
+   "researchCost": 5000,
    "prereqs": [
       "Project_RingCore",
-      "Project_CommunicationsHub"
+      "Project_CommunicationsHub",
+      "ArrivalCulture"
    ],
    "altPrereq0": "Project_ColonyCore",
    "oneTimeGlobally": false,
@@ -5192,10 +5415,12 @@
    "techCategory": "MilitaryScience",
    "AI_techRole": "SpaceWar",
    "AI_projectRole": "Research",
-   "researchCost": 3000,
+   "researchCost": 10000,
    "prereqs": [
       "Project_RingCore",
-      "Project_MilitaryScienceResearchCenter"
+      "Project_MilitaryScienceResearchCenter",
+      "AppliedArtificialIntelligence",
+      "ArrivalSecurity"
    ],
    "altPrereq0": "Project_ColonyCore",
    "oneTimeGlobally": false,
@@ -5212,11 +5437,11 @@
    "techCategory": "Materials",
    "AI_techRole": "SpaceDevelopment",
    "AI_projectRole": "HabInfrastructure",
-   "researchCost": 5000,
+   "researchCost": 15000,
    "prereqs": [
       "Project_RingCore",
       "Project_Nanofactory",
-      "SpaceCommerce"
+      "MolecularAssemblers"
    ],
    "altPrereq0": "Project_ColonyCore",
    "oneTimeGlobally": false,
@@ -5232,12 +5457,13 @@
    "dataName": "Project_ResearchUniversity",
    "techCategory": "SpaceScience",
    "AI_techRole": "SpaceDevelopment",
+   "AI_criticalTech": true,
    "AI_projectRole": "Research",
-   "researchCost": 5000,
+   "researchCost": 20000,
    "prereqs": [
       "Project_RingCore",
       "Project_ResearchCampus",
-      "SelfRepairingSoftware"
+      "IntegratedEarthSpaceEconomy"
    ],
    "altPrereq0": "Project_ColonyCore",
    "oneTimeGlobally": false,
@@ -5283,10 +5509,11 @@
    "techCategory": "SocialScience",
    "AI_techRole": "SpaceDevelopment",
    "AI_projectRole": "Research",
-   "researchCost": 3000,
+   "researchCost": 10000,
    "prereqs": [
       "Project_RingCore",
-      "Project_SocialScienceResearchCenter"
+      "Project_SocialScienceResearchCenter",
+      "AdministrationAlgorithms"
    ],
    "altPrereq0": "Project_ColonyCore",
    "oneTimeGlobally": false,
@@ -5343,10 +5570,11 @@
    "techCategory": "SpaceScience",
    "AI_techRole": "SpaceDevelopment",
    "AI_projectRole": "Research",
-   "researchCost": 3000,
+   "researchCost": 10000,
    "prereqs": [
       "Project_RingCore",
-      "Project_SpaceScienceResearchCenter"
+      "Project_SpaceScienceResearchCenter",
+      "AppliedArtificialIntelligence"
    ],
    "altPrereq0": "Project_ColonyCore",
    "oneTimeGlobally": false,
@@ -5364,10 +5592,11 @@
    "AI_techRole": "SpaceDevelopment",
    "AI_criticalTech": true,
    "AI_projectRole": "HabInfrastructure",
-   "researchCost": 3000,
+   "researchCost": 5000,
    "prereqs": [
       "Project_RingCore",
-      "Project_Shipyard"
+      "Project_Shipyard",
+      "SpaceNavies"
    ],
    "altPrereq0": "Project_ColonyCore",
    "oneTimeGlobally": false,
@@ -5384,12 +5613,12 @@
    "techCategory": "Energy",
    "AI_techRole": "SpaceDevelopment",
    "AI_projectRole": "Antimatter",
-   "researchCost": 10000,
+   "researchCost": 100000,
    "prereqs": [
       "Project_RingCore",
-      "Project_Atomsmasher"
+      "Project_Atomsmasher",
+      "Accelerando"
    ],
-   "altPrereq0": "Project_ColonyCore",
    "oneTimeGlobally": false,
    "repeatable": false,
    "factionAvailableChance": 100,
@@ -5405,7 +5634,7 @@
    "AI_techRole": "SpaceDevelopment",
    "AI_criticalTech": true,
    "AI_projectRole": "HabInfrastructure",
-   "researchCost": 3000,
+   "researchCost": 5000,
    "prereqs": [
       "Project_OrbitalCore",
       "OrbitalTorusHabs"
@@ -5427,11 +5656,12 @@
    "techCategory": "Xenology",
    "AI_techRole": "SpaceDevelopment",
    "AI_projectRole": "Objective",
-   "researchCost": 3000,
+   "researchCost": 10000,
    "prereqs": [
       "Project_RingCore",
       "Project_XenoscienceResearchCenter",
-      "Project_Exotics"
+      "Project_Exotics",
+      "AppliedArtificialIntelligence"
    ],
    "altPrereq0": "Project_ColonyCore",
    "oneTimeGlobally": false,
@@ -5448,7 +5678,7 @@
    "techCategory": "SpaceScience",
    "AI_techRole": "SpaceDevelopment",
    "AI_projectRole": "Propulsion",
-   "researchCost": 75000,
+   "researchCost": 200000,
    "prereqs": [
       "AntimatterPropulsion",
       "MagneticNozzles",
@@ -5463,16 +5693,16 @@
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Advanced Antimatter Plasma Core Drive",
-   "dataName": "Project_AdvancedAntimatterPlasmaCoreDrive",
+   "friendlyName": "Advanced Antimatter Plasma Core Torch",
+   "dataName": "Project_AdvancedAntimatterPlasmaCoreTorch",
    "techCategory": "SpaceScience",
    "AI_techRole": "SpaceDevelopment",
    "AI_projectRole": "Propulsion",
-   "researchCost": 50000,
+   "researchCost": 120000,
    "prereqs": [
       "AntimatterPropulsion",
       "Project_AntimatterPlasmaCoreReactorIII",
-      "Project_AntimatterPlasmaCoreDrive"
+      "Project_AntimatterPlasmaCoreTorch"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
@@ -5483,8 +5713,8 @@
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Antimatter Plasma Core Drive",
-   "dataName": "Project_AntimatterPlasmaCoreDrive",
+   "friendlyName": "Antimatter Plasma Core Torch",
+   "dataName": "Project_AntimatterPlasmaCoreTorch",
    "techCategory": "SpaceScience",
    "AI_techRole": "SpaceDevelopment",
    "AI_projectRole": "Propulsion",
@@ -5492,7 +5722,7 @@
    "prereqs": [
       "AntimatterPropulsion",
       "Project_AntimatterPlasmaCoreReactorII",
-      "Project_AntimatterPulsedPlasmaCoreDrive"
+      "Project_AntimatterPulsedPlasmaCoreLantern"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
@@ -5503,12 +5733,12 @@
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Antimatter Pulsed Plasma Core Drive",
-   "dataName": "Project_AntimatterPulsedPlasmaCoreDrive",
+   "friendlyName": "Antimatter Pulsed Plasma Core Lantern",
+   "dataName": "Project_AntimatterPulsedPlasmaCoreLantern",
    "techCategory": "SpaceScience",
    "AI_techRole": "SpaceDevelopment",
    "AI_projectRole": "Propulsion",
-   "researchCost": 50000,
+   "researchCost": 25000,
    "prereqs": [
       "AntimatterPropulsion",
       "MagneticNozzles",
@@ -5528,443 +5758,508 @@
    "techCategory": "SpaceScience",
    "AI_techRole": "SpaceDevelopment",
    "AI_projectRole": "Propulsion",
-   "researchCost": 100000,
+   "researchCost": 1000000,
    "prereqs": [
-      "Project_ProtiumInertialTorch",
-      "Project_InertialConfinementFusionReactorVII"
+      "MagneticNozzles",
+      "Project_InertialConfinementFusionReactorVII",
+      "Project_ProtiumNovaTorch"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
-   "factionAvailableChance": 10,
+   "factionAvailableChance": 25,
    "initialUnlockChance": 0,
    "deltaUnlockChance": 5,
    "maxUnlockChance": 10,
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Protium Inertial Torch",
-   "dataName": "Project_ProtiumInertialTorch",
+   "friendlyName": "Protium Nova Torch",
+   "dataName": "Project_ProtiumNovaTorch",
    "techCategory": "SpaceScience",
    "AI_techRole": "SpaceDevelopment",
    "AI_projectRole": "Propulsion",
-   "researchCost": 100000,
+   "researchCost": 200000,
    "prereqs": [
-      "ProtonProtonFusion",
-      "Project_InertialConfinementFusionReactorV",
-      "MagneticNozzles"
+      "MagneticNozzles",
+      "Project_InertialConfinementFusionReactorVI"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
-   "factionAvailableChance": 100,
+   "factionAvailableChance": 50,
+   "factionAlways": "Random",
    "initialUnlockChance": 0,
    "deltaUnlockChance": 5,
    "maxUnlockChance": 15,
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Boron Inertial Torch",
-   "dataName": "Project_BoronInertialTorch",
+   "friendlyName": "Borane Nova Lantern",
+   "dataName": "Project_BoraneNovaLantern",
    "techCategory": "SpaceScience",
    "AI_techRole": "SpaceDevelopment",
    "AI_projectRole": "Propulsion",
-   "researchCost": 50000,
+   "researchCost": 65000,
    "prereqs": [
-      "Project_BoronInertialDrive",
+      "MagneticNozzles",
       "Project_InertialConfinementFusionReactorV"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
-   "factionAvailableChance": 15,
+   "factionAvailableChance": 75,
+   "factionAlways": "Random",
    "initialUnlockChance": 0,
    "deltaUnlockChance": 5,
-   "maxUnlockChance": 10,
+   "maxUnlockChance": 20,
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Boron Inertial Drive",
-   "dataName": "Project_BoronInertialDrive",
+   "friendlyName": "Helion Nova Torch",
+   "dataName": "Project_HelionNovaTorch",
    "techCategory": "SpaceScience",
    "AI_techRole": "SpaceDevelopment",
    "AI_projectRole": "Propulsion",
-   "researchCost": 30000,
+   "researchCost": 120000,
    "prereqs": [
-      "ProtonBoronFusion",
-      "Project_InertialConfinementFusionReactorI",
-      "MagneticNozzles"
+      "MagneticNozzles",
+      "Project_InertialConfinementFusionReactorIV"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
-   "factionAvailableChance": 100,
+   "factionAvailableChance": 50,
+   "factionAlways": "Random",
    "initialUnlockChance": 0,
    "deltaUnlockChance": 5,
-   "maxUnlockChance": 20,
+   "maxUnlockChance": 15,
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Daedelus Torch",
-   "dataName": "Project_DaedelusTorch",
+   "friendlyName": "Helion Nova Lantern",
+   "dataName": "Project_HelionNovaLantern",
    "techCategory": "SpaceScience",
    "AI_techRole": "SpaceDevelopment",
-   "AI_criticalTech": true,
    "AI_projectRole": "Propulsion",
-   "researchCost": 75000,
+   "researchCost": 55000,
    "prereqs": [
-      "Project_HelionInertialDrive",
-      "Project_InertialConfinementFusionReactorV"
+      "MagneticNozzles",
+      "Project_InertialConfinementFusionReactorIII"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
-   "factionAvailableChance": 20,
+   "factionAvailableChance": 75,
+   "factionAlways": "Random",
    "initialUnlockChance": 0,
    "deltaUnlockChance": 5,
-   "maxUnlockChance": 10,
+   "maxUnlockChance": 50,
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Helion Inertial Drive",
-   "dataName": "Project_HelionInertialDrive",
+   "friendlyName": "Deuteron Nova Lantern",
+   "dataName": "Project_DeuteronNovaLantern",
    "techCategory": "SpaceScience",
    "AI_techRole": "SpaceDevelopment",
    "AI_projectRole": "Propulsion",
-   "researchCost": 20000,
+   "researchCost": 25000,
    "prereqs": [
-      "Project_InertialConfinementFusionReactorIII",
-      "MagneticNozzles"
+      "MagneticNozzles",
+      "Project_InertialConfinementFusionReactorII"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
    "factionAvailableChance": 100,
    "initialUnlockChance": 0,
    "deltaUnlockChance": 5,
-   "maxUnlockChance": 15,
+   "maxUnlockChance": 60,
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Triton Vista Inertial Drive",
-   "dataName": "Project_TritonVistaInertialDrive",
+   "friendlyName": "Triton Nova Drive",
+   "dataName": "Project_TritonNovaDrive",
    "techCategory": "SpaceScience",
    "AI_techRole": "SpaceDevelopment",
    "AI_projectRole": "Propulsion",
-   "researchCost": 15000,
+   "researchCost": 14000,
    "prereqs": [
-      "Project_InertialConfinementFusionReactorII",
-      "Project_TritonHopeInertialDrive"
+      "MagneticNozzles",
+      "Project_InertialConfinementFusionReactorI"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
-   "factionAvailableChance": 20,
+   "factionAvailableChance": 100,
    "initialUnlockChance": 0,
-   "deltaUnlockChance": 5,
-   "maxUnlockChance": 20,
+   "deltaUnlockChance": 10,
+   "maxUnlockChance": 100,
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Triton Hope Inertial Drive",
-   "dataName": "Project_TritonHopeInertialDrive",
+   "friendlyName": "Zeta Borane Lantern",
+   "dataName": "Project_ZetaBoraneLantern",
    "techCategory": "SpaceScience",
    "AI_techRole": "SpaceDevelopment",
    "AI_projectRole": "Propulsion",
-   "researchCost": 10000,
+   "researchCost": 60000,
    "prereqs": [
-      "Project_InertialConfinementFusionReactorI",
-      "MagneticNozzles"
+      "MagneticNozzles",
+      "Project_ZPinchFusionReactorIV"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
    "factionAvailableChance": 100,
    "initialUnlockChance": 0,
    "deltaUnlockChance": 5,
-   "maxUnlockChance": 30,
+   "maxUnlockChance": 15,
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Mag Protium Fusion Drive",
-   "dataName": "Project_MagProtiumFusionDrive",
+   "friendlyName": "Zeta Helion Lantern",
+   "dataName": "Project_ZetaHelionLantern",
    "techCategory": "SpaceScience",
    "AI_techRole": "SpaceDevelopment",
    "AI_projectRole": "Propulsion",
    "researchCost": 50000,
    "prereqs": [
-      "ProtonProtonFusion",
-      "Project_FusionTokamakIV",
-      "MagneticNozzles"
+      "MagneticNozzles",
+      "Project_ZPinchFusionReactorIII"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
-   "factionAvailableChance": 100,
+   "factionAvailableChance": 75,
+   "factionAlways": "Random",
    "initialUnlockChance": 0,
    "deltaUnlockChance": 5,
-   "maxUnlockChance": 10,
+   "maxUnlockChance": 15,
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Zeta Boron Fusion Drive",
-   "dataName": "Project_ZetaBoronFusionDrive",
+   "friendlyName": "Zeta Deuteron Torch",
+   "dataName": "Project_ZetaDeuteronTorch",
    "techCategory": "SpaceScience",
    "AI_techRole": "SpaceDevelopment",
-   "AI_criticalTech": true,
    "AI_projectRole": "Propulsion",
-   "researchCost": 35000,
+   "researchCost": 100000,
    "prereqs": [
-      "Project_ZPinchFusionReactorII",
-      "ProtonBoronFusion",
-      "MagneticNozzles"
+      "MagneticNozzles",
+      "Project_FlowStabilizedZPinchFusionReactor"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
-   "factionAvailableChance": 100,
+   "factionAvailableChance": 50,
+   "factionAlways": "Random",
    "initialUnlockChance": 0,
    "deltaUnlockChance": 5,
-   "maxUnlockChance": 10,
+   "maxUnlockChance": 20,
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Zeta Helion Drive",
-   "dataName": "Project_ZetaHelionDrive",
+   "friendlyName": "Zeta Deuteron Drive",
+   "dataName": "Project_ZetaDeuteronDrive",
    "techCategory": "SpaceScience",
    "AI_techRole": "SpaceDevelopment",
    "AI_projectRole": "Propulsion",
-   "researchCost": 50000,
+   "researchCost": 25000,
    "prereqs": [
-      "Project_ZPinchFusionReactorIII",
-      "DeuteriumHelium3Fusion",
-      "MagneticNozzles"
+      "MagneticNozzles",
+      "Project_ZPinchFusionReactorII"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
    "factionAvailableChance": 100,
    "initialUnlockChance": 0,
    "deltaUnlockChance": 5,
-   "maxUnlockChance": 15,
+   "maxUnlockChance": 100,
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Advanced Helion Reflex Drive",
-   "dataName": "Project_AdvancedHelionReflexDrive",
+   "friendlyName": "Zeta Triton Drive",
+   "dataName": "Project_ZetaTritonDrive",
    "techCategory": "SpaceScience",
    "AI_techRole": "SpaceDevelopment",
    "AI_projectRole": "Propulsion",
-   "researchCost": 20000,
+   "researchCost": 10000,
    "prereqs": [
-      "Project_HelionReflexDrive"
+      "MagneticNozzles",
+      "Project_ZPinchFusionReactorI"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
    "factionAvailableChance": 100,
    "initialUnlockChance": 0,
-   "deltaUnlockChance": 3,
-   "maxUnlockChance": 15,
+   "deltaUnlockChance": 8,
+   "maxUnlockChance": 100,
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Helion Reflex Drive",
-   "dataName": "Project_HelionReflexDrive",
+   "friendlyName": "Borane Plasmajet Torch",
+   "dataName": "Project_BoranePlasmajetTorch",
    "techCategory": "SpaceScience",
    "AI_techRole": "SpaceDevelopment",
    "AI_projectRole": "Propulsion",
-   "researchCost": 10000,
+   "researchCost": 75000,
    "prereqs": [
-      "Project_MirrorCellFusionReactorI",
-      "DeuteriumHelium3Fusion",
-      "MagneticNozzles"
+      "MagneticNozzles",
+      "Project_HybridConfinementFusionReactorIV"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
-   "factionAvailableChance": 100,
+   "factionAvailableChance": 50,
+   "factionAlways": "Random",
    "initialUnlockChance": 0,
    "deltaUnlockChance": 5,
    "maxUnlockChance": 15,
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Advanced Helion Torus Drive",
-   "dataName": "Project_AdvancedHelionTorusDrive",
+   "friendlyName": "Helion Plasmajet Lantern",
+   "dataName": "Project_HelionPlasmajetLantern",
    "techCategory": "SpaceScience",
    "AI_techRole": "SpaceDevelopment",
    "AI_projectRole": "Propulsion",
-   "researchCost": 15000,
+   "researchCost": 35000,
    "prereqs": [
-      "Project_HelionTorusDrive",
-      "Project_FusionTokamakIV"
+      "MagneticNozzles",
+      "Project_HybridConfinementFusionReactorIII"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
-   "factionAvailableChance": 10,
+   "factionAvailableChance": 75,
+   "factionAlways": "Random",
    "initialUnlockChance": 0,
    "deltaUnlockChance": 5,
-   "maxUnlockChance": 15,
+   "maxUnlockChance": 20,
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Helion Torus Drive",
-   "dataName": "Project_HelionTorusDrive",
+   "friendlyName": "Deuteron Polywell Drive",
+   "dataName": "Project_DeuteronPolywellDrive",
    "techCategory": "SpaceScience",
    "AI_techRole": "SpaceDevelopment",
    "AI_projectRole": "Propulsion",
-   "researchCost": 10000,
+   "researchCost": 18000,
    "prereqs": [
-      "Project_FusionTokamakI",
-      "DeuteriumHelium3Fusion",
-      "MagneticNozzles"
+      "MagneticNozzles",
+      "Project_HybridConfinementFusionReactorII"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
-   "factionAvailableChance": 20,
+   "factionAvailableChance": 100,
    "initialUnlockChance": 0,
    "deltaUnlockChance": 5,
-   "maxUnlockChance": 15,
+   "maxUnlockChance": 30,
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Triton Reflex Drive",
-   "dataName": "Project_TritonReflexDrive",
+   "friendlyName": "Triton Polywell Drive",
+   "dataName": "Project_TritonPolywellDrive",
    "techCategory": "SpaceScience",
    "AI_techRole": "SpaceDevelopment",
    "AI_projectRole": "Propulsion",
-   "researchCost": 10000,
+   "researchCost": 6000,
    "prereqs": [
-      "Project_MirrorCellFusionReactorI",
-      "MagneticNozzles"
+      "MagneticNozzles",
+      "Project_HybridConfinementFusionReactorI"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
    "factionAvailableChance": 100,
    "initialUnlockChance": 0,
    "deltaUnlockChance": 5,
+   "maxUnlockChance": 50,
+   "resourcesGranted": []
+},
+ {
+   "friendlyName": "Protium Torus Lantern",
+   "dataName": "Project_ProtiumTorusLantern",
+   "techCategory": "SpaceScience",
+   "AI_techRole": "SpaceDevelopment",
+   "AI_criticalTech": true,
+   "AI_projectRole": "Propulsion",
+   "researchCost": 65000,
+   "prereqs": [
+      "MagneticNozzles",
+      "Project_FusionTokamakV"
+   ],
+   "oneTimeGlobally": false,
+   "repeatable": false,
+   "factionAvailableChance": 50,
+   "factionAlways": "Random",
+   "initialUnlockChance": 0,
+   "deltaUnlockChance": 5,
    "maxUnlockChance": 15,
    "resourcesGranted": []
+},
+ {
+   "friendlyName": "Helion Torus Lantern",
+   "dataName": "Project_HelionTorusLantern",
+   "techCategory": "SpaceScience",
+   "AI_techRole": "SpaceDevelopment",
+   "AI_criticalTech": true,
+   "AI_projectRole": "Propulsion",
+   "researchCost": 35000,
+   "prereqs": [
+      "MagneticNozzles",
+      "Project_FusionTokamakIII"
+   ],
+   "oneTimeGlobally": false,
+   "repeatable": false,
+   "factionAvailableChance": 75,
+   "factionAlways": "Random",
+   "initialUnlockChance": 0,
+   "deltaUnlockChance": 8,
+   "maxUnlockChance": 75,
+   "resourcesGranted": []
+},
+ {
+   "friendlyName": "Deuteron Torus Drive",
+   "dataName": "Project_DeuteronTorusDrive",
+   "techCategory": "SpaceScience",
+   "AI_techRole": "SpaceDevelopment",
+   "AI_criticalTech": true,
+   "AI_projectRole": "Propulsion",
+   "researchCost": 24000,
+   "prereqs": [
+      "MagneticNozzles",
+      "Project_FusionTokamakII"
+   ],
+   "oneTimeGlobally": false,
+   "repeatable": false,
+   "factionAvailableChance": 100,
+   "initialUnlockChance": 0,
+   "deltaUnlockChance": 10,
+   "maxUnlockChance": 100,
+   "resourcesGranted": []
 },
  {
    "friendlyName": "Triton Torus Drive",
    "dataName": "Project_TritonTorusDrive",
    "techCategory": "SpaceScience",
    "AI_techRole": "SpaceDevelopment",
+   "AI_criticalTech": true,
    "AI_projectRole": "Propulsion",
-   "researchCost": 10000,
+   "researchCost": 7200,
    "prereqs": [
+      "MagneticNozzles",
       "Project_FusionTokamakI"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
    "factionAvailableChance": 100,
    "initialUnlockChance": 0,
-   "deltaUnlockChance": 5,
-   "maxUnlockChance": 15,
+   "deltaUnlockChance": 12,
+   "maxUnlockChance": 100,
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Icarus Torch",
-   "dataName": "Project_IcarusTorch",
+   "friendlyName": "Helion Reflex Drive",
+   "dataName": "Project_HelionReflexDrive",
    "techCategory": "SpaceScience",
    "AI_techRole": "SpaceDevelopment",
    "AI_projectRole": "Propulsion",
-   "researchCost": 75000,
+   "researchCost": 28000,
    "prereqs": [
-      "Project_IcarusDrive",
-      "Project_HybridConfinementFusionReactorIII",
-      "MagneticNozzles"
+      "MagneticNozzles",
+      "Project_MirrorCellFusionReactorIII"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
-   "factionAvailableChance": 25,
+   "factionAvailableChance": 100,
    "initialUnlockChance": 0,
    "deltaUnlockChance": 5,
-   "maxUnlockChance": 10,
+   "maxUnlockChance": 50,
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Icarus Drive",
-   "dataName": "Project_IcarusDrive",
+   "friendlyName": "Deuteron Reflex Drive",
+   "dataName": "Project_DeuteronReflexDrive",
    "techCategory": "SpaceScience",
    "AI_techRole": "SpaceDevelopment",
    "AI_projectRole": "Propulsion",
-   "researchCost": 35000,
+   "researchCost": 20000,
    "prereqs": [
-      "Project_HybridFusionDrive",
-      "Project_HybridConfinementFusionReactorII"
+      "MagneticNozzles",
+      "Project_MirrorCellFusionReactorII"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
    "factionAvailableChance": 100,
-   "factionAlways": "`",
    "initialUnlockChance": 0,
    "deltaUnlockChance": 5,
-   "maxUnlockChance": 30,
+   "maxUnlockChance": 75,
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Hybrid Fusion Drive",
-   "dataName": "Project_HybridFusionDrive",
+   "friendlyName": "Triton Reflex Drive",
+   "dataName": "Project_TritonReflexDrive",
    "techCategory": "SpaceScience",
    "AI_techRole": "SpaceDevelopment",
    "AI_projectRole": "Propulsion",
-   "researchCost": 25000,
+   "researchCost": 7500,
    "prereqs": [
-      "Project_HybridConfinementFusionReactorI"
+      "MagneticNozzles",
+      "Project_MirrorCellFusionReactorI"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
    "factionAvailableChance": 100,
    "initialUnlockChance": 0,
-   "deltaUnlockChance": 5,
-   "maxUnlockChance": 10,
+   "deltaUnlockChance": 12,
+   "maxUnlockChance": 100,
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Lithium Fusion Lantern",
-   "dataName": "Project_LithiumFusionLantern",
+   "friendlyName": "Protium Fusor Drive",
+   "dataName": "Project_ProtiumFusorDrive",
    "techCategory": "SpaceScience",
    "AI_techRole": "SpaceDevelopment",
    "AI_projectRole": "Propulsion",
-   "researchCost": 20000,
+   "researchCost": 15000,
    "prereqs": [
-      "Project_ElectrostaticConfinementFusionReactorII",
-      "HydrogenLithium6Fusion"
+      "MagneticNozzles",
+      "Project_ElectrostaticConfinementFusionReactorIII"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
-   "factionAvailableChance": 100,
+   "factionAvailableChance": 50,
+   "factionAlways": "Random",
    "initialUnlockChance": 0,
    "deltaUnlockChance": 5,
-   "maxUnlockChance": 20,
+   "maxUnlockChance": 30,
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Firefly Torch",
-   "dataName": "Project_FireflyTorch",
+   "friendlyName": "Deuteron Fusor Drive",
+   "dataName": "Project_DeuteronFusorDrive",
    "techCategory": "SpaceScience",
    "AI_techRole": "SpaceDevelopment",
    "AI_projectRole": "Propulsion",
-   "researchCost": 75000,
+   "researchCost": 7500,
    "prereqs": [
-      "Project_TritonPulseDrive",
-      "Project_FlowStabilizedZPinchFusionReactor"
+      "MagneticNozzles",
+      "Project_ElectrostaticConfinementFusionReactorII"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
    "factionAvailableChance": 100,
    "initialUnlockChance": 0,
    "deltaUnlockChance": 5,
-   "maxUnlockChance": 10,
+   "maxUnlockChance": 30,
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Triton Pulse Drive",
-   "dataName": "Project_TritonPulseDrive",
+   "friendlyName": "Triton Fusor Drive",
+   "dataName": "Project_TritonFusorDrive",
    "techCategory": "SpaceScience",
    "AI_techRole": "SpaceDevelopment",
    "AI_projectRole": "Propulsion",
-   "researchCost": 10000,
+   "researchCost": 5000,
    "prereqs": [
-      "Project_ZPinchFusionReactorI",
-      "MagneticNozzles"
+      "MagneticNozzles",
+      "Project_ElectrostaticConfinementFusionReactorI"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
    "factionAvailableChance": 100,
    "initialUnlockChance": 0,
-   "deltaUnlockChance": 5,
-   "maxUnlockChance": 20,
+   "deltaUnlockChance": 25,
+   "maxUnlockChance": 100,
    "resourcesGranted": []
 },
  {
@@ -5973,7 +6268,7 @@
    "techCategory": "SpaceScience",
    "AI_techRole": "SpaceDevelopment",
    "AI_projectRole": "Propulsion",
-   "researchCost": 20000,
+   "researchCost": 10000,
    "prereqs": [
       "FissionPulseDrives"
    ],
@@ -5981,8 +6276,8 @@
    "repeatable": false,
    "factionAvailableChance": 100,
    "initialUnlockChance": 0,
-   "deltaUnlockChance": 5,
-   "maxUnlockChance": 25,
+   "deltaUnlockChance": 15,
+   "maxUnlockChance": 100,
    "resourcesGranted": []
 },
  {
@@ -5991,7 +6286,7 @@
    "techCategory": "SpaceScience",
    "AI_techRole": "SpaceDevelopment",
    "AI_projectRole": "Propulsion",
-   "researchCost": 40000,
+   "researchCost": 25000,
    "prereqs": [
       "HeavyPulsedPropulsion",
       "Project_OrionDrive"
@@ -6001,7 +6296,7 @@
    "factionAvailableChance": 100,
    "initialUnlockChance": 0,
    "deltaUnlockChance": 5,
-   "maxUnlockChance": 25,
+   "maxUnlockChance": 50,
    "resourcesGranted": []
 },
  {
@@ -6010,18 +6305,16 @@
    "techCategory": "SpaceScience",
    "AI_techRole": "SpaceDevelopment",
    "AI_projectRole": "Propulsion",
-   "researchCost": 40000,
+   "researchCost": 15000,
    "prereqs": [
-      "Project_MinimagOrion",
-      "MagneticNozzles"
+      "Project_MinimagOrion"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
-   "factionAvailableChance": 15,
-   "factionAlways": "EscapeCouncil",
+   "factionAvailableChance": 50,
    "initialUnlockChance": 0,
    "deltaUnlockChance": 5,
-   "maxUnlockChance": 25,
+   "maxUnlockChance": 50,
    "resourcesGranted": []
 },
  {
@@ -6030,15 +6323,13 @@
    "techCategory": "SpaceScience",
    "AI_techRole": "SpaceDevelopment",
    "AI_projectRole": "Propulsion",
-   "researchCost": 20000,
+   "researchCost": 10000,
    "prereqs": [
-      "FissionPulseDrives",
-      "ZPinchTechniques"
+      "Project_Z-pinchMicrofissionDrive"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
    "factionAvailableChance": 50,
-   "factionAlways": "EscapeCouncil",
    "initialUnlockChance": 0,
    "deltaUnlockChance": 5,
    "maxUnlockChance": 100,
@@ -6050,11 +6341,10 @@
    "techCategory": "SpaceScience",
    "AI_techRole": "SpaceDevelopment",
    "AI_projectRole": "Propulsion",
-   "researchCost": 5000,
+   "researchCost": 7500,
    "prereqs": [
       "AntimatterContainment",
-      "FissionPulseDrives",
-      "MagneticNozzles"
+      "FissionPulseDrives"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
@@ -6062,7 +6352,12 @@
    "initialUnlockChance": 0,
    "deltaUnlockChance": 5,
    "maxUnlockChance": 25,
-   "resourcesGranted": []
+   "resourcesGranted": [
+      {
+         "resource": "Antimatter",
+         "value": 1.5e-12
+      }
+   ]
 },
  {
    "friendlyName": "Neutronium Microfission Drive",
@@ -6070,11 +6365,10 @@
    "techCategory": "SpaceScience",
    "AI_techRole": "SpaceDevelopment",
    "AI_projectRole": "Propulsion",
-   "researchCost": 3500,
+   "researchCost": 5000,
    "prereqs": [
-      "NeutroniumContainment",
-      "FissionPulseDrives",
-      "MagneticNozzles"
+      "Project_UltracoldNeutronContainment",
+      "FissionPulseDrives"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
@@ -6090,11 +6384,10 @@
    "techCategory": "SpaceScience",
    "AI_techRole": "SpaceDevelopment",
    "AI_projectRole": "Propulsion",
-   "researchCost": 3500,
+   "researchCost": 1000,
    "prereqs": [
       "ZPinchTechniques",
-      "FissionPulseDrives",
-      "MagneticNozzles"
+      "FissionPulseDrives"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
@@ -6110,44 +6403,43 @@
    "techCategory": "SpaceScience",
    "AI_techRole": "SpaceDevelopment",
    "AI_projectRole": "Propulsion",
-   "researchCost": 75000,
+   "researchCost": 150000,
    "prereqs": [
-      "Project_SaltWaterCoreReactorII",
-      "Project_NeutronFluxDrive",
+      "Project_NeutronFluxLantern",
       "MagneticNozzles"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
-   "factionAvailableChance": 100,
+   "factionAvailableChance": 20,
    "initialUnlockChance": 0,
    "deltaUnlockChance": 5,
    "maxUnlockChance": 10,
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Neutron Flux Drive",
-   "dataName": "Project_NeutronFluxDrive",
+   "friendlyName": "Neutron Flux Lantern",
+   "dataName": "Project_NeutronFluxLantern",
    "techCategory": "SpaceScience",
    "AI_techRole": "SpaceDevelopment",
    "AI_projectRole": "Propulsion",
-   "researchCost": 30000,
+   "researchCost": 35000,
    "prereqs": [
-      "Project_SaltWaterCoreReactorI"
+      "AdvancedFissionSystems"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
-   "factionAvailableChance": 100,
+   "factionAvailableChance": 20,
    "initialUnlockChance": 0,
    "deltaUnlockChance": 5,
-   "maxUnlockChance": 10,
+   "maxUnlockChance": 15,
    "resourcesGranted": []
 },
  {
    "friendlyName": "Firestar Drive",
-   "dataName": "Project_FirestarDrive",
+   "dataName": "Project_FirestarFissionLantern",
    "techCategory": "SpaceScience",
-   "AI_criticalTech": true,  
    "AI_techRole": "SpaceDevelopment",
+   "AI_criticalTech": true,
    "AI_projectRole": "Propulsion",
    "researchCost": 20000,
    "prereqs": [
@@ -6166,8 +6458,9 @@
    "dataName": "Project_FlareDrive",
    "techCategory": "SpaceScience",
    "AI_techRole": "SpaceDevelopment",
+   "AI_criticalTech": true,
    "AI_projectRole": "Propulsion",
-   "researchCost": 10000,
+   "researchCost": 15000,
    "prereqs": [
       "Project_GasCoreFissionReactorV"
    ],
@@ -6186,7 +6479,7 @@
    "AI_techRole": "SpaceDevelopment",
    "AI_criticalTech": true,
    "AI_projectRole": "Propulsion",
-   "researchCost": 5000,
+   "researchCost": 4000,
    "prereqs": [
       "Project_GasCoreFissionReactorII"
    ],
@@ -6207,7 +6500,9 @@
    "researchCost": 5000,
    "prereqs": [
       "Project_GasCoreFissionReactorI",
-      "MagneticNozzles"
+      "MagneticNozzles",
+      "Project_FissionFragDrive",
+      "HighTemperatureSuperconductors"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
@@ -6223,9 +6518,10 @@
    "techCategory": "SpaceScience",
    "AI_techRole": "SpaceDevelopment",
    "AI_projectRole": "Propulsion",
-   "researchCost": 2000,
+   "researchCost": 1000,
    "prereqs": [
-      "Project_GasCoreFissionReactorI"
+      "AdvancedCarbonManipulation",
+      "Project_SolidCoreFissionReactorVII"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
@@ -6236,12 +6532,12 @@
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Fission Lantern",
-   "dataName": "Project_FissionLantern",
+   "friendlyName": "Lodestar Fission Lantern",
+   "dataName": "Project_LodestarFissionLantern",
    "techCategory": "SpaceScience",
    "AI_techRole": "SpaceDevelopment",
    "AI_projectRole": "Propulsion",
-   "researchCost": 10000,
+   "researchCost": 16000,
    "prereqs": [
       "Project_GasCoreFissionReactorIV"
    ],
@@ -6259,7 +6555,7 @@
    "techCategory": "SpaceScience",
    "AI_techRole": "SpaceDevelopment",
    "AI_projectRole": "Propulsion",
-   "researchCost": 5000,
+   "researchCost": 1500,
    "prereqs": [
       "Project_GasCoreFissionReactorII"
    ],
@@ -6267,8 +6563,8 @@
    "repeatable": false,
    "factionAvailableChance": 40,
    "initialUnlockChance": 0,
-   "deltaUnlockChance": 5,
-   "maxUnlockChance": 15,
+   "deltaUnlockChance": 10,
+   "maxUnlockChance": 70,
    "resourcesGranted": []
 },
  {
@@ -6277,7 +6573,7 @@
    "techCategory": "SpaceScience",
    "AI_techRole": "SpaceDevelopment",
    "AI_projectRole": "Propulsion",
-   "researchCost": 3000,
+   "researchCost": 2500,
    "prereqs": [
       "Project_QuartzDrive"
    ],
@@ -6285,8 +6581,8 @@
    "repeatable": false,
    "factionAvailableChance": 100,
    "initialUnlockChance": 0,
-   "deltaUnlockChance": 5,
-   "maxUnlockChance": 30,
+   "deltaUnlockChance": 15,
+   "maxUnlockChance": 100,
    "resourcesGranted": []
 },
  {
@@ -6295,7 +6591,7 @@
    "techCategory": "SpaceScience",
    "AI_techRole": "SpaceDevelopment",
    "AI_projectRole": "Propulsion",
-   "researchCost": 3000,
+   "researchCost": 1000,
    "prereqs": [
       "Project_GasCoreFissionReactorI"
    ],
@@ -6303,8 +6599,8 @@
    "repeatable": false,
    "factionAvailableChance": 100,
    "initialUnlockChance": 0,
-   "deltaUnlockChance": 5,
-   "maxUnlockChance": 40,
+   "deltaUnlockChance": 15,
+   "maxUnlockChance": 100,
    "resourcesGranted": []
 },
  {
@@ -6313,7 +6609,7 @@
    "techCategory": "SpaceScience",
    "AI_techRole": "SpaceDevelopment",
    "AI_projectRole": "Propulsion",
-   "researchCost": 10000,
+   "researchCost": 2500,
    "prereqs": [
       "Project_VaporCoreFissionReactorIII",
       "Project_CavityDrive"
@@ -6333,7 +6629,7 @@
    "techCategory": "SpaceScience",
    "AI_techRole": "SpaceDevelopment",
    "AI_projectRole": "Propulsion",
-   "researchCost": 2000,
+   "researchCost": 750,
    "prereqs": [
       "Project_VaporCoreFissionReactorI"
    ],
@@ -6342,7 +6638,7 @@
    "factionAvailableChance": 60,
    "initialUnlockChance": 0,
    "deltaUnlockChance": 5,
-   "maxUnlockChance": 50,
+   "maxUnlockChance": 60,
    "resourcesGranted": []
 },
  {
@@ -6351,7 +6647,7 @@
    "techCategory": "SpaceScience",
    "AI_techRole": "SpaceDevelopment",
    "AI_projectRole": "Propulsion",
-   "researchCost": 5000,
+   "researchCost": 2500,
    "prereqs": [
       "Project_VortexDrive",
       "Project_VaporCoreFissionReactorII"
@@ -6370,7 +6666,7 @@
    "techCategory": "SpaceScience",
    "AI_techRole": "SpaceDevelopment",
    "AI_projectRole": "Propulsion",
-   "researchCost": 2000,
+   "researchCost": 2500,
    "prereqs": [
       "Project_VaporCoreFissionReactorI"
    ],
@@ -6378,23 +6674,23 @@
    "repeatable": false,
    "factionAvailableChance": 100,
    "initialUnlockChance": 0,
-   "deltaUnlockChance": 5,
-   "maxUnlockChance": 50,
+   "deltaUnlockChance": 8,
+   "maxUnlockChance": 100,
    "resourcesGranted": []
 },
  {
    "friendlyName": "Pegasus Drive",
    "dataName": "Project_PegasusDrive",
    "techCategory": "SpaceScience",
-   "AI_criticalTech": true,
-  
    "AI_techRole": "SpaceDevelopment",
+   "AI_criticalTech": true,
    "AI_projectRole": "Propulsion",
-   "researchCost": 10000,
+   "researchCost": 12000,
    "prereqs": [
       "Project_FissionSpinnerDrive",
       "Project_MoltenCoreFissionReactorIII"
    ],
+   "altPrereq0": "Project_TeardropDrive",
    "oneTimeGlobally": false,
    "repeatable": false,
    "factionAvailableChance": 30,
@@ -6410,7 +6706,7 @@
    "AI_techRole": "SpaceDevelopment",
    "AI_criticalTech": true,
    "AI_projectRole": "Propulsion",
-   "researchCost": 5000,
+   "researchCost": 7000,
    "prereqs": [
       "Project_LarsDrive",
       "Project_MoltenCoreFissionReactorII"
@@ -6419,8 +6715,27 @@
    "repeatable": false,
    "factionAvailableChance": 50,
    "initialUnlockChance": 0,
-   "deltaUnlockChance": 5,
-   "maxUnlockChance": 20,
+   "deltaUnlockChance": 8,
+   "maxUnlockChance": 60,
+   "resourcesGranted": []
+},
+ {
+   "friendlyName": "Teardrop Drive",
+   "dataName": "Project_TeardropDrive",
+   "techCategory": "SpaceScience",
+   "AI_techRole": "SpaceDevelopment",
+   "AI_criticalTech": true,
+   "AI_projectRole": "Propulsion",
+   "researchCost": 3000,
+   "prereqs": [
+      "Project_MoltenCoreFissionReactorII"
+   ],
+   "oneTimeGlobally": false,
+   "repeatable": false,
+   "factionAvailableChance": 80,
+   "initialUnlockChance": 0,
+   "deltaUnlockChance": 8,
+   "maxUnlockChance": 100,
    "resourcesGranted": []
 },
  {
@@ -6428,8 +6743,9 @@
    "dataName": "Project_LarsDrive",
    "techCategory": "SpaceScience",
    "AI_techRole": "SpaceDevelopment",
+   "AI_criticalTech": true,
    "AI_projectRole": "Propulsion",
-   "researchCost": 2500,
+   "researchCost": 1500,
    "prereqs": [
       "Project_MoltenCoreFissionReactorI"
    ],
@@ -6437,7 +6753,7 @@
    "repeatable": false,
    "factionAvailableChance": 100,
    "initialUnlockChance": 0,
-   "deltaUnlockChance": 5,
+   "deltaUnlockChance": 10,
    "maxUnlockChance": 100,
    "resourcesGranted": []
 },
@@ -6447,9 +6763,10 @@
    "techCategory": "SpaceScience",
    "AI_techRole": "SpaceDevelopment",
    "AI_projectRole": "Propulsion",
-   "researchCost": 7500,
+   "researchCost": 1500,
    "prereqs": [
-      "Project_PebbleDrive"
+      "Project_PebbleDrive",
+      "Project_SolidCoreFissionReactorX"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
@@ -6465,15 +6782,15 @@
    "techCategory": "SpaceScience",
    "AI_techRole": "SpaceDevelopment",
    "AI_projectRole": "Propulsion",
-   "researchCost": 2500,
+   "researchCost": 1500,
    "prereqs": [
-      "Project_SolidCoreFissionReactorVII"
+      "Project_SolidCoreFissionReactorIX"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
    "factionAvailableChance": 100,
    "initialUnlockChance": 0,
-   "deltaUnlockChance": 5,
+   "deltaUnlockChance": 10,
    "maxUnlockChance": 100,
    "resourcesGranted": []
 },
@@ -6482,11 +6799,10 @@
    "dataName": "Project_AdvancedPulsarDrive",
    "techCategory": "SpaceScience",
    "AI_techRole": "SpaceDevelopment",
-   "AI_criticalTech": true,
    "AI_projectRole": "Propulsion",
-   "researchCost": 8000,
+   "researchCost": 5000,
    "prereqs": [
-      "HighEnergyLasers",
+      "ArcLasers",
       "Project_PulsarDrive",
       "Project_SolidCoreFissionReactorV"
    ],
@@ -6496,7 +6812,7 @@
    "factionAvailableChance": 40,
    "initialUnlockChance": 0,
    "deltaUnlockChance": 5,
-   "maxUnlockChance": 20,
+   "maxUnlockChance": 25,
    "resourcesGranted": []
 },
  {
@@ -6504,7 +6820,6 @@
    "dataName": "Project_PulsarDrive",
    "techCategory": "SpaceScience",
    "AI_techRole": "SpaceDevelopment",
-   "AI_criticalTech": true,
    "AI_projectRole": "Propulsion",
    "researchCost": 2000,
    "prereqs": [
@@ -6526,7 +6841,7 @@
    "AI_techRole": "SpaceDevelopment",
    "AI_criticalTech": true,
    "AI_projectRole": "Propulsion",
-   "researchCost": 7000,
+   "researchCost": 5000,
    "prereqs": [
       "Project_Dumbo",
       "Project_SolidCoreFissionReactorIV"
@@ -6536,7 +6851,7 @@
    "factionAvailableChance": 40,
    "initialUnlockChance": 0,
    "deltaUnlockChance": 5,
-   "maxUnlockChance": 50,
+   "maxUnlockChance": 40,
    "resourcesGranted": []
 },
  {
@@ -6545,17 +6860,17 @@
    "techCategory": "SpaceScience",
    "AI_techRole": "SpaceDevelopment",
    "AI_projectRole": "Propulsion",
-   "researchCost": 2000,
+   "researchCost": 1500,
    "prereqs": [
       "Project_CermetNerva",
-      "Project_SolidCoreFissionReactorII"
+      "Project_Dumbo"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
    "factionAvailableChance": 50,
    "initialUnlockChance": 0,
-   "deltaUnlockChance": 5,
-   "maxUnlockChance": 40,
+   "deltaUnlockChance": 10,
+   "maxUnlockChance": 50,
    "resourcesGranted": []
 },
  {
@@ -6563,8 +6878,9 @@
    "dataName": "Project_Dumbo",
    "techCategory": "SpaceScience",
    "AI_techRole": "SpaceDevelopment",
+   "AI_criticalTech": true,
    "AI_projectRole": "Propulsion",
-   "researchCost": 2000,
+   "researchCost": 1000,
    "prereqs": [
       "Project_SolidCoreFissionReactorII"
    ],
@@ -6572,8 +6888,8 @@
    "repeatable": false,
    "factionAvailableChance": 100,
    "initialUnlockChance": 0,
-   "deltaUnlockChance": 5,
-   "maxUnlockChance": 50,
+   "deltaUnlockChance": 10,
+   "maxUnlockChance": 60,
    "resourcesGranted": []
 },
  {
@@ -6582,7 +6898,7 @@
    "techCategory": "SpaceScience",
    "AI_techRole": "SpaceDevelopment",
    "AI_projectRole": "Propulsion",
-   "researchCost": 2000,
+   "researchCost": 1000,
    "prereqs": [
       "Project_NervaDrive"
    ],
@@ -6590,8 +6906,8 @@
    "repeatable": false,
    "factionAvailableChance": 40,
    "initialUnlockChance": 0,
-   "deltaUnlockChance": 5,
-   "maxUnlockChance": 40,
+   "deltaUnlockChance": 10,
+   "maxUnlockChance": 60,
    "resourcesGranted": []
 },
  {
@@ -6600,7 +6916,7 @@
    "techCategory": "SpaceScience",
    "AI_techRole": "SpaceDevelopment",
    "AI_projectRole": "Propulsion",
-   "researchCost": 1500,
+   "researchCost": 750,
    "prereqs": [
       "Project_NervaDrive"
    ],
@@ -6608,8 +6924,8 @@
    "repeatable": false,
    "factionAvailableChance": 40,
    "initialUnlockChance": 0,
-   "deltaUnlockChance": 5,
-   "maxUnlockChance": 50,
+   "deltaUnlockChance": 10,
+   "maxUnlockChance": 75,
    "resourcesGranted": []
 },
  {
@@ -6618,15 +6934,15 @@
    "techCategory": "SpaceScience",
    "AI_techRole": "SpaceDevelopment",
    "AI_projectRole": "Propulsion",
-   "researchCost": 1000,
+   "researchCost": 750,
    "prereqs": [
-      "Project_SolidCoreFissionReactorVI"
+      "Project_SolidCoreFissionReactorVIII"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
    "factionAvailableChance": 40,
    "initialUnlockChance": 0,
-   "deltaUnlockChance": 5,
+   "deltaUnlockChance": 10,
    "maxUnlockChance": 60,
    "resourcesGranted": []
 },
@@ -6636,15 +6952,15 @@
    "techCategory": "SpaceScience",
    "AI_techRole": "SpaceDevelopment",
    "AI_projectRole": "Propulsion",
-   "researchCost": 1000,
+   "researchCost": 500,
    "prereqs": [
-      "Project_SolidCoreFissionReactorVI"
+      "Project_SolidCoreFissionReactorVII"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
    "factionAvailableChance": 40,
    "initialUnlockChance": 0,
-   "deltaUnlockChance": 5,
+   "deltaUnlockChance": 25,
    "maxUnlockChance": 60,
    "resourcesGranted": []
 },
@@ -6655,7 +6971,7 @@
    "AI_techRole": "SpaceDevelopment",
    "AI_criticalTech": true,
    "AI_projectRole": "Propulsion",
-   "researchCost": 1000,
+   "researchCost": 300,
    "prereqs": [
       "Project_SolidCoreFissionReactorI"
    ],
@@ -6663,8 +6979,8 @@
    "repeatable": false,
    "factionAvailableChance": 100,
    "initialUnlockChance": 0,
-   "deltaUnlockChance": 5,
-   "maxUnlockChance": 60,
+   "deltaUnlockChance": 35,
+   "maxUnlockChance": 100,
    "resourcesGranted": []
 },
  {
@@ -6673,7 +6989,7 @@
    "techCategory": "SpaceScience",
    "AI_techRole": "SpaceDevelopment",
    "AI_projectRole": "Propulsion",
-   "researchCost": 1000,
+   "researchCost": 250,
    "prereqs": [
       "Project_SolidCoreFissionReactorVI"
    ],
@@ -6681,7 +6997,7 @@
    "repeatable": false,
    "factionAvailableChance": 100,
    "initialUnlockChance": 0,
-   "deltaUnlockChance": 5,
+   "deltaUnlockChance": 10,
    "maxUnlockChance": 60,
    "resourcesGranted": []
 },
@@ -6691,7 +7007,7 @@
    "techCategory": "SpaceScience",
    "AI_techRole": "SpaceDevelopment",
    "AI_projectRole": "Propulsion",
-   "researchCost": 1500,
+   "researchCost": 500,
    "prereqs": [
       "HighEnergyElectromagneticPropulsion",
       "Project_MassDriver",
@@ -6711,7 +7027,7 @@
    "techCategory": "SpaceScience",
    "AI_techRole": "SpaceDevelopment",
    "AI_projectRole": "Propulsion",
-   "researchCost": 1000,
+   "researchCost": 200,
    "prereqs": [
       "ElectromagneticPropulsion"
    ],
@@ -6719,8 +7035,8 @@
    "repeatable": false,
    "factionAvailableChance": 100,
    "initialUnlockChance": 0,
-   "deltaUnlockChance": 5,
-   "maxUnlockChance": 50,
+   "deltaUnlockChance": 15,
+   "maxUnlockChance": 100,
    "resourcesGranted": []
 },
  {
@@ -6729,9 +7045,9 @@
    "techCategory": "SpaceScience",
    "AI_techRole": "SpaceDevelopment",
    "AI_projectRole": "Propulsion",
-   "researchCost": 1000,
+   "researchCost": 200,
    "prereqs": [
-      "HighEnergyElectrothermalPropulsion"
+      "ElectrothermalPropulsion"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
@@ -6747,17 +7063,17 @@
    "techCategory": "SpaceScience",
    "AI_techRole": "SpaceDevelopment",
    "AI_projectRole": "Propulsion",
-   "researchCost": 1000,
+   "researchCost": 200,
    "prereqs": [
       "ElectrothermalPropulsion",
-      "ArcLasers"
+      "HighEnergyLasers"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
    "factionAvailableChance": 100,
    "initialUnlockChance": 0,
    "deltaUnlockChance": 5,
-   "maxUnlockChance": 40,
+   "maxUnlockChance": 50,
    "resourcesGranted": []
 },
  {
@@ -6766,10 +7082,10 @@
    "techCategory": "SpaceScience",
    "AI_techRole": "SpaceDevelopment",
    "AI_projectRole": "Propulsion",
-   "researchCost": 2000,
+   "researchCost": 500,
    "prereqs": [
       "ElectromagneticPropulsion",
-      "Ultracapacitors"
+      "Supercapacitors"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
@@ -6785,8 +7101,9 @@
    "techCategory": "SpaceScience",
    "AI_techRole": "SpaceDevelopment",
    "AI_projectRole": "Propulsion",
-   "researchCost": 1500,
+   "researchCost": 900,
    "prereqs": [
+      "HighEnergyElectromagneticPropulsion",
       "Project_VASIMR"
    ],
    "oneTimeGlobally": false,
@@ -6803,7 +7120,7 @@
    "techCategory": "SpaceScience",
    "AI_techRole": "SpaceDevelopment",
    "AI_projectRole": "Propulsion",
-   "researchCost": 1000,
+   "researchCost": 400,
    "prereqs": [
       "ElectromagneticPropulsion"
    ],
@@ -6811,8 +7128,8 @@
    "repeatable": false,
    "factionAvailableChance": 100,
    "initialUnlockChance": 0,
-   "deltaUnlockChance": 5,
-   "maxUnlockChance": 50,
+   "deltaUnlockChance": 15,
+   "maxUnlockChance": 100,
    "resourcesGranted": []
 },
  {
@@ -6821,16 +7138,16 @@
    "techCategory": "SpaceScience",
    "AI_techRole": "SpaceDevelopment",
    "AI_projectRole": "Propulsion",
-   "researchCost": 1500,
+   "researchCost": 300,
    "prereqs": [
-      "HighEnergyElectrostaticPropulsion"
+      "ElectrostaticPropulsion"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
    "factionAvailableChance": 100,
    "initialUnlockChance": 0,
    "deltaUnlockChance": 5,
-   "maxUnlockChance": 20,
+   "maxUnlockChance": 50,
    "resourcesGranted": []
 },
  {
@@ -6838,19 +7155,20 @@
    "dataName": "Project_GridDrive",
    "techCategory": "SpaceScience",
    "AI_techRole": "SpaceDevelopment",
-   "AI_criticalTech": true,
    "AI_projectRole": "Propulsion",
-   "researchCost": 2500,
+   "researchCost": 2000,
    "prereqs": [
-      "HighEnergyElectrostaticPropulsion",
+      "Project_SolidCoreFissionReactorI",
+      "CarbonNanotubes",
       "Project_IonDrive"
    ],
+   "altPrereq0": "Project_FuelCellIII",
    "oneTimeGlobally": false,
    "repeatable": false,
    "factionAvailableChance": 50,
    "initialUnlockChance": 0,
    "deltaUnlockChance": 5,
-   "maxUnlockChance": 20,
+   "maxUnlockChance": 50,
    "resourcesGranted": []
 },
  {
@@ -6858,27 +7176,8 @@
    "dataName": "Project_IonDrive",
    "techCategory": "SpaceScience",
    "AI_techRole": "SpaceDevelopment",
-   "AI_criticalTech": true,
-   "AI_projectRole": "Propulsion",
-   "researchCost": 500,
-   "prereqs": [
-      "ElectrostaticPropulsion"
-   ],
-   "oneTimeGlobally": false,
-   "repeatable": false,
-   "factionAvailableChance": 100,
-   "initialUnlockChance": 0,
-   "deltaUnlockChance": 5,
-   "maxUnlockChance": 20,
-   "resourcesGranted": []
-},
- {
-   "friendlyName": "Hall Drive",
-   "dataName": "Project_HallDrive",
-   "techCategory": "SpaceScience",
-   "AI_techRole": "SpaceDevelopment",
    "AI_projectRole": "Propulsion",
-   "researchCost": 500,
+   "researchCost": 300,
    "prereqs": [
       "ElectrostaticPropulsion"
    ],
@@ -6886,8 +7185,8 @@
    "repeatable": false,
    "factionAvailableChance": 100,
    "initialUnlockChance": 0,
-   "deltaUnlockChance": 5,
-   "maxUnlockChance": 50,
+   "deltaUnlockChance": 15,
+   "maxUnlockChance": 100,
    "resourcesGranted": []
 },
  {
@@ -6898,8 +7197,10 @@
    "AI_projectRole": "Propulsion",
    "researchCost": 1000,
    "prereqs": [
+      "Project_SolidCoreFissionReactorI",
       "HighEnergyElectromagneticPropulsion"
    ],
+   "altPrereq0": "Project_MoltenCoreFissionReactorI",
    "oneTimeGlobally": false,
    "repeatable": false,
    "factionAvailableChance": 50,
@@ -6914,15 +7215,17 @@
    "techCategory": "SpaceScience",
    "AI_techRole": "SpaceDevelopment",
    "AI_projectRole": "Propulsion",
-   "researchCost": 1000,
+   "researchCost": 800,
    "prereqs": [
+      "Project_SolidCoreFissionReactorI",
       "HighEnergyElectromagneticPropulsion"
    ],
+   "altPrereq0": "Project_FuelCellIII",
    "oneTimeGlobally": false,
    "repeatable": false,
    "factionAvailableChance": 50,
    "initialUnlockChance": 0,
-   "deltaUnlockChance": 5,
+   "deltaUnlockChance": 15,
    "maxUnlockChance": 50,
    "resourcesGranted": []
 },
@@ -6932,7 +7235,7 @@
    "techCategory": "SpaceScience",
    "AI_techRole": "SpaceDevelopment",
    "AI_projectRole": "Propulsion",
-   "researchCost": 1000,
+   "researchCost": 200,
    "prereqs": [
       "ElectromagneticPropulsion",
       "AdvancedSuperconductors"
@@ -6941,27 +7244,9 @@
    "repeatable": false,
    "factionAvailableChance": 50,
    "initialUnlockChance": 0,
-   "deltaUnlockChance": 5,
+   "deltaUnlockChance": 15,
    "maxUnlockChance": 50,
    "resourcesGranted": []
-},
- {
-   "friendlyName": "Arcjet Drive",
-   "dataName": "Project_ArcjetDrive",
-   "techCategory": "SpaceScience",
-   "AI_techRole": "SpaceDevelopment",
-   "AI_projectRole": "Propulsion",
-   "researchCost": 500,
-   "prereqs": [
-      "ElectrothermalPropulsion"
-   ],
-   "oneTimeGlobally": false,
-   "repeatable": false,
-   "factionAvailableChance": 100,
-   "initialUnlockChance": 0,
-   "deltaUnlockChance": 5,
-   "maxUnlockChance": 100,
-   "resourcesGranted": []
 },
  {
    "friendlyName": "Tungsten Resistojet",
@@ -6969,25 +7254,7 @@
    "techCategory": "SpaceScience",
    "AI_techRole": "SpaceDevelopment",
    "AI_projectRole": "Propulsion",
-   "researchCost": 500,
-   "prereqs": [
-      "HighEnergyElectrothermalPropulsion"
-   ],
-   "oneTimeGlobally": false,
-   "repeatable": false,
-   "factionAvailableChance": 100,
-   "initialUnlockChance": 0,
-   "deltaUnlockChance": 5,
-   "maxUnlockChance": 100,
-   "resourcesGranted": []
-},
- {
-   "friendlyName": "Resistojet",
-   "dataName": "Project_Resistojet",
-   "techCategory": "SpaceScience",
-   "AI_techRole": "SpaceDevelopment",
-   "AI_projectRole": "Propulsion",
-   "researchCost": 500,
+   "researchCost": 200,
    "prereqs": [
       "ElectrothermalPropulsion"
    ],
@@ -6995,7 +7262,7 @@
    "repeatable": false,
    "factionAvailableChance": 100,
    "initialUnlockChance": 0,
-   "deltaUnlockChance": 5,
+   "deltaUnlockChance": 50,
    "maxUnlockChance": 100,
    "resourcesGranted": []
 },
@@ -7091,7 +7358,7 @@
    "AI_techRole": "SpaceDevelopment",
    "AI_criticalTech": true,
    "AI_projectRole": "Propulsion",
-   "researchCost": 200,
+   "researchCost": 250,
    "prereqs": [
       "AdvancedHydrogenContainment",
       "Project_ImprovedInterplanetaryRockets"
@@ -7102,7 +7369,7 @@
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
-   "factionAvailableChance": 25,
+   "factionAvailableChance": 20,
    "initialUnlockChance": 0,
    "deltaUnlockChance": 5,
    "maxUnlockChance": 100,
@@ -7114,7 +7381,7 @@
    "techCategory": "SpaceScience",
    "AI_techRole": "SpaceDevelopment",
    "AI_projectRole": "Boost",
-   "researchCost": 200,
+   "researchCost": 500,
    "prereqs": [
       "AdvancedChemicalRocketry"
    ],
@@ -7269,8 +7536,7 @@
    "AI_projectRole": "PowerPlant",
    "researchCost": 700,
    "prereqs": [
-      "Project_SolidCoreFissionReactorII",
-      "CarbonNanotubes"
+      "Project_SolidCoreFissionReactorII"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
@@ -7324,8 +7590,7 @@
    "AI_projectRole": "PowerPlant",
    "researchCost": 1000,
    "prereqs": [
-      "Project_SolidCoreFissionReactorVIII",
-      "Diamondoids"
+      "Project_SolidCoreFissionReactorVIII"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
@@ -7354,52 +7619,91 @@
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Molten Core Fission Reactor I",
-   "dataName": "Project_MoltenCoreFissionReactorI",
+   "friendlyName": "Molten Salt Fission Reactor I",
+   "dataName": "Project_MoltenSaltFissionReactorI",
    "techCategory": "Energy",
    "AI_techRole": "SpaceDevelopment",
    "AI_projectRole": "PowerPlant",
-   "researchCost": 500,
+   "researchCost": 800,
    "prereqs": [
-      "MoltenCoreFissionSystems"
+      "Project_MoltenCoreFissionReactorI",
+      "Project_SolidCoreFissionReactorIII"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
-   "factionAvailableChance": 100,
+   "factionAvailableChance": 60,
    "initialUnlockChance": 0,
-   "deltaUnlockChance": 25,
-   "maxUnlockChance": 100,
+   "deltaUnlockChance": 5,
+   "maxUnlockChance": 50,
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Molten Core Fission Reactor II",
-   "dataName": "Project_MoltenCoreFissionReactorII",
+   "friendlyName": "Molten Salt Fission Reactor II",
+   "dataName": "Project_MoltenSaltFissionReactorII",
    "techCategory": "Energy",
    "AI_techRole": "SpaceDevelopment",
    "AI_projectRole": "PowerPlant",
-   "researchCost": 1000,
+   "researchCost": 1500,
    "prereqs": [
-      "Project_MoltenCoreFissionReactorI",
-      "CarbonNanotubes"
+      "Project_MoltenSaltFissionReactorI",
+      "Project_MoltenCoreFissionReactorIII"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
-   "factionAvailableChance": 100,
+   "factionAvailableChance": 60,
    "initialUnlockChance": 0,
    "deltaUnlockChance": 5,
    "maxUnlockChance": 50,
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Molten Core Fission Reactor III",
-   "dataName": "Project_MoltenCoreFissionReactorIII",
+   "friendlyName": "Molten Core Fission Reactor I",
+   "dataName": "Project_MoltenCoreFissionReactorI",
    "techCategory": "Energy",
    "AI_techRole": "SpaceDevelopment",
+   "AI_criticalTech": true,
    "AI_projectRole": "PowerPlant",
-   "researchCost": 1500,
+   "researchCost": 500,
    "prereqs": [
-      "Project_MoltenCoreFissionReactorII",
-      "Diamondoids"
+      "MoltenCoreFissionSystems"
+   ],
+   "oneTimeGlobally": false,
+   "repeatable": false,
+   "factionAvailableChance": 100,
+   "initialUnlockChance": 0,
+   "deltaUnlockChance": 25,
+   "maxUnlockChance": 100,
+   "resourcesGranted": []
+},
+ {
+   "friendlyName": "Molten Core Fission Reactor II",
+   "dataName": "Project_MoltenCoreFissionReactorII",
+   "techCategory": "Energy",
+   "AI_techRole": "SpaceDevelopment",
+   "AI_projectRole": "PowerPlant",
+   "researchCost": 1000,
+   "prereqs": [
+      "Project_MoltenCoreFissionReactorI",
+      "AdvancedCarbonManipulation"
+   ],
+   "oneTimeGlobally": false,
+   "repeatable": false,
+   "factionAvailableChance": 100,
+   "initialUnlockChance": 0,
+   "deltaUnlockChance": 5,
+   "maxUnlockChance": 50,
+   "resourcesGranted": []
+},
+ {
+   "friendlyName": "Molten Core Fission Reactor III",
+   "dataName": "Project_MoltenCoreFissionReactorIII",
+   "techCategory": "Energy",
+   "AI_techRole": "SpaceDevelopment",
+   "AI_projectRole": "PowerPlant",
+   "researchCost": 2000,
+   "prereqs": [
+      "Project_MoltenCoreFissionReactorII",
+      "CarbonNanotubes"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
@@ -7417,7 +7721,8 @@
    "AI_projectRole": "PowerPlant",
    "researchCost": 800,
    "prereqs": [
-      "GasCoreFissionSystems"
+      "GasCoreFissionSystems",
+      "Project_MoltenCoreFissionReactorII"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
@@ -7435,7 +7740,8 @@
    "AI_projectRole": "PowerPlant",
    "researchCost": 1200,
    "prereqs": [
-      "Project_VaporCoreFissionReactorI"
+      "Project_VaporCoreFissionReactorI",
+      "AdvancedCarbonManipulation"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
@@ -7473,7 +7779,7 @@
    "AI_projectRole": "PowerPlant",
    "researchCost": 1000,
    "prereqs": [
-      "Project_VaporCoreFissionReactorI"
+      "GasCoreFissionSystems"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
@@ -7488,6 +7794,7 @@
    "dataName": "Project_GasCoreFissionReactorII",
    "techCategory": "Energy",
    "AI_techRole": "SpaceDevelopment",
+   "AI_criticalTech": true,
    "AI_projectRole": "PowerPlant",
    "researchCost": 1250,
    "prereqs": [
@@ -7506,6 +7813,7 @@
    "dataName": "Project_GasCoreFissionReactorIII",
    "techCategory": "Energy",
    "AI_techRole": "SpaceDevelopment",
+   "AI_criticalTech": true,
    "AI_projectRole": "PowerPlant",
    "researchCost": 1500,
    "prereqs": [
@@ -7521,12 +7829,13 @@
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Gas Core Fission Reactor IV",
+   "friendlyName": "Terawatt Gas Core Fission Reactor I",
    "dataName": "Project_GasCoreFissionReactorIV",
    "techCategory": "Energy",
    "AI_techRole": "SpaceDevelopment",
+   "AI_criticalTech": true,
    "AI_projectRole": "PowerPlant",
-   "researchCost": 2000,
+   "researchCost": 10000,
    "prereqs": [
       "AdvancedFissionSystems",
       "Project_GasCoreFissionReactorII"
@@ -7540,12 +7849,13 @@
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Gas Core Fission Reactor V",
+   "friendlyName": "Terawatt Gas Core Fission Reactor II",
    "dataName": "Project_GasCoreFissionReactorV",
    "techCategory": "Energy",
    "AI_techRole": "SpaceDevelopment",
+   "AI_criticalTech": true,
    "AI_projectRole": "PowerPlant",
-   "researchCost": 2500,
+   "researchCost": 10000,
    "prereqs": [
       "Project_GasCoreFissionReactorIV"
    ],
@@ -7558,12 +7868,13 @@
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Gas Core Fission Reactor VI",
+   "friendlyName": "Terawatt Gas Core Fission Reactor III",
    "dataName": "Project_GasCoreFissionReactorVI",
    "techCategory": "Energy",
    "AI_techRole": "SpaceDevelopment",
+   "AI_criticalTech": true,
    "AI_projectRole": "PowerPlant",
-   "researchCost": 3000,
+   "researchCost": 10000,
    "prereqs": [
       "Project_GasCoreFissionReactorV"
    ],
@@ -7576,167 +7887,171 @@
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Salt Water Core Reactor I",
-   "dataName": "Project_SaltWaterCoreReactorI",
+   "friendlyName": "Electrostatic Confinement Fusion Reactor I",
+   "dataName": "Project_ElectrostaticConfinementFusionReactorI",
    "techCategory": "Energy",
    "AI_techRole": "SpaceDevelopment",
    "AI_projectRole": "PowerPlant",
-   "researchCost": 10000,
+   "researchCost": 2500,
    "prereqs": [
-      "AdvancedFissionSystems",
-      "Ultracapacitors"
+      "DeuteriumTritiumFusion",
+      "ElectrostaticPlasmaConfinement"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
-   "factionAvailableChance": 20,
+   "factionAvailableChance": 100,
    "initialUnlockChance": 0,
-   "deltaUnlockChance": 5,
+   "deltaUnlockChance": 25,
    "maxUnlockChance": 100,
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Salt Water Core Reactor II",
-   "dataName": "Project_SaltWaterCoreReactorII",
+   "friendlyName": "Electrostatic Confinement Fusion Reactor II",
+   "dataName": "Project_ElectrostaticConfinementFusionReactorII",
    "techCategory": "Energy",
    "AI_techRole": "SpaceDevelopment",
    "AI_projectRole": "PowerPlant",
-   "researchCost": 10000,
+   "researchCost": 5000,
    "prereqs": [
-      "Project_SaltWaterCoreReactorI"
+      "DeuteriumDeuteriumFusion",
+      "Project_ElectrostaticConfinementFusionReactorI"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
-   "factionAvailableChance": 10,
+   "factionAvailableChance": 100,
    "initialUnlockChance": 0,
-   "deltaUnlockChance": 5,
-   "maxUnlockChance": 100,
+   "deltaUnlockChance": 10,
+   "maxUnlockChance": 50,
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Electrostatic Confinement Fusion Reactor I",
-   "dataName": "Project_ElectrostaticConfinementFusionReactorI",
+   "friendlyName": "Electrostatic Confinement Fusion Reactor III",
+   "dataName": "Project_ElectrostaticConfinementFusionReactorIII",
    "techCategory": "Energy",
    "AI_techRole": "SpaceDevelopment",
    "AI_projectRole": "PowerPlant",
-   "researchCost": 10000,
+   "researchCost": 15000,
    "prereqs": [
-      "DeuteriumTritiumFusion",
-      "ElectrostaticPlasmaConfinement"
+      "ProtonProtonFusion",
+      "Project_ElectrostaticConfinementFusionReactorII",
+      "Project_Exotics"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
    "factionAvailableChance": 100,
    "initialUnlockChance": 0,
-   "deltaUnlockChance": 25,
-   "maxUnlockChance": 100,
+   "deltaUnlockChance": 10,
+   "maxUnlockChance": 20,
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Electrostatic Confinement Fusion Reactor II",
-   "dataName": "Project_ElectrostaticConfinementFusionReactorII",
+   "friendlyName": "Mirror Cell Fusion Reactor I",
+   "dataName": "Project_MirrorCellFusionReactorI",
    "techCategory": "Energy",
    "AI_techRole": "SpaceDevelopment",
    "AI_projectRole": "PowerPlant",
-   "researchCost": 10000,
+   "researchCost": 2500,
    "prereqs": [
-      "Project_ElectrostaticConfinementFusionReactorI"
+      "DeuteriumTritiumFusion",
+      "MagneticPlasmaConfinementTechniques"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
    "factionAvailableChance": 100,
    "initialUnlockChance": 0,
-   "deltaUnlockChance": 10,
-   "maxUnlockChance": 20,
+   "deltaUnlockChance": 25,
+   "maxUnlockChance": 100,
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Electrostatic Confinement Fusion Reactor III",
-   "dataName": "Project_ElectrostaticConfinementFusionReactorIII",
+   "friendlyName": "Mirror Cell Fusion Reactor II",
+   "dataName": "Project_MirrorCellFusionReactorII",
    "techCategory": "Energy",
    "AI_techRole": "SpaceDevelopment",
    "AI_projectRole": "PowerPlant",
-   "researchCost": 10000,
+   "researchCost": 5000,
    "prereqs": [
-      "Project_ElectrostaticConfinementFusionReactorII"
+      "DeuteriumDeuteriumFusion",
+      "Project_MirrorCellFusionReactorI"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
    "factionAvailableChance": 100,
    "initialUnlockChance": 0,
    "deltaUnlockChance": 10,
-   "maxUnlockChance": 20,
+   "maxUnlockChance": 75,
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Z-Pinch Fusion Reactor I",
-   "dataName": "Project_ZPinchFusionReactorI",
+   "friendlyName": "Mirror Cell Fusion Reactor III",
+   "dataName": "Project_MirrorCellFusionReactorIII",
    "techCategory": "Energy",
    "AI_techRole": "SpaceDevelopment",
-   "AI_criticalTech": true,
    "AI_projectRole": "PowerPlant",
    "researchCost": 10000,
    "prereqs": [
-      "DeuteriumTritiumFusion",
-      "ZPinchTechniques",
-      "DeuteriumTritiumFusion"
+      "DeuteriumHelium3Fusion",
+      "Project_MirrorCellFusionReactorII"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
-   "factionAvailableChance": 40,
+   "factionAvailableChance": 100,
    "initialUnlockChance": 0,
-   "deltaUnlockChance": 25,
-   "maxUnlockChance": 100,
+   "deltaUnlockChance": 10,
+   "maxUnlockChance": 50,
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Z-Pinch Fusion Reactor II",
-   "dataName": "Project_ZPinchFusionReactorII",
+   "friendlyName": "Fusion Tokamak I",
+   "dataName": "Project_FusionTokamakI",
    "techCategory": "Energy",
    "AI_techRole": "SpaceDevelopment",
+   "AI_criticalTech": true,
    "AI_projectRole": "PowerPlant",
-   "researchCost": 20000,
+   "researchCost": 5000,
    "prereqs": [
-      "Project_ZPinchFusionReactorI"
+      "DeuteriumTritiumFusion",
+      "Tokamaks"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
    "factionAvailableChance": 100,
    "initialUnlockChance": 0,
-   "deltaUnlockChance": 5,
-   "maxUnlockChance": 20,
+   "deltaUnlockChance": 50,
+   "maxUnlockChance": 100,
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Z-Pinch Fusion Reactor III",
-   "dataName": "Project_ZPinchFusionReactorIII",
+   "friendlyName": "Fusion Tokamak II",
+   "dataName": "Project_FusionTokamakII",
    "techCategory": "Energy",
    "AI_techRole": "SpaceDevelopment",
+   "AI_criticalTech": true,
    "AI_projectRole": "PowerPlant",
-   "researchCost": 50000,
+   "researchCost": 10000,
    "prereqs": [
-      "TerawattFusionReactors",
-      "AppliedArtificialIntelligence",
-      "Project_ZPinchFusionReactorII"
+      "DeuteriumDeuteriumFusion",
+      "Project_FusionTokamakI"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
    "factionAvailableChance": 100,
    "initialUnlockChance": 0,
-   "deltaUnlockChance": 5,
-   "maxUnlockChance": 20,
+   "deltaUnlockChance": 10,
+   "maxUnlockChance": 100,
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Hybrid Confinement Fusion Reactor I",
-   "dataName": "Project_HybridConfinementFusionReactorI",
+   "friendlyName": "Fusion Tokamak III",
+   "dataName": "Project_FusionTokamakIII",
    "techCategory": "Energy",
    "AI_techRole": "SpaceDevelopment",
+   "AI_criticalTech": true,
    "AI_projectRole": "PowerPlant",
-   "researchCost": 10000,
+   "researchCost": 15000,
    "prereqs": [
-      "DeuteriumDeuteriumFusion",
-      "MagneticPlasmaConfinementTechniques",
-      "ElectrostaticPlasmaConfinement"
+      "DeuteriumHelium3Fusion",
+      "Project_FusionTokamakII"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
@@ -7747,35 +8062,35 @@
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Hybrid Confinement Fusion Reactor II",
-   "dataName": "Project_HybridConfinementFusionReactorII",
+   "friendlyName": "Fusion Tokamak IV",
+   "dataName": "Project_FusionTokamakIV",
    "techCategory": "Energy",
    "AI_techRole": "SpaceDevelopment",
+   "AI_criticalTech": true,
    "AI_projectRole": "PowerPlant",
    "researchCost": 20000,
    "prereqs": [
-      "TerawattFusionReactors",
-      "Project_HybridConfinementFusionReactorI"
+      "Project_FusionTokamakIII"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
    "factionAvailableChance": 100,
    "initialUnlockChance": 0,
-   "deltaUnlockChance": 25,
+   "deltaUnlockChance": 5,
    "maxUnlockChance": 20,
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Hybrid Confinement Fusion Reactor III",
-   "dataName": "Project_HybridConfinementFusionReactorIII",
+   "friendlyName": "Fusion Tokamak V",
+   "dataName": "Project_FusionTokamakV",
    "techCategory": "Energy",
    "AI_techRole": "SpaceDevelopment",
    "AI_projectRole": "PowerPlant",
-   "researchCost": 50000,
+   "researchCost": 35000,
    "prereqs": [
-      "Project_HybridConfinementFusionReactorII",
-      "AppliedArtificialIntelligence",
-      "InertialPlasmaConfinementTechniques"
+      "ProtonProtonFusion",
+      "Project_FusionTokamakIV",
+      "Project_ExoticHybridSystems"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
@@ -7786,175 +8101,183 @@
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Fusion Tokamak I",
-   "dataName": "Project_FusionTokamakI",
+   "friendlyName": "Hybrid Confinement Fusion Reactor I",
+   "dataName": "Project_HybridConfinementFusionReactorI",
    "techCategory": "Energy",
    "AI_techRole": "SpaceDevelopment",
+   "AI_criticalTech": true,
    "AI_projectRole": "PowerPlant",
-   "researchCost": 5000,
+   "researchCost": 10000,
    "prereqs": [
       "DeuteriumTritiumFusion",
-      "MagneticPlasmaConfinementTechniques"
+      "MagneticPlasmaConfinementTechniques",
+      "ElectrostaticPlasmaConfinement"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
    "factionAvailableChance": 100,
    "initialUnlockChance": 0,
-   "deltaUnlockChance": 50,
+   "deltaUnlockChance": 15,
    "maxUnlockChance": 100,
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Fusion Tokamak II",
-   "dataName": "Project_FusionTokamakII",
+   "friendlyName": "Hybrid Confinement Fusion Reactor II",
+   "dataName": "Project_HybridConfinementFusionReactorII",
    "techCategory": "Energy",
    "AI_techRole": "SpaceDevelopment",
+   "AI_criticalTech": true,
    "AI_projectRole": "PowerPlant",
-   "researchCost": 7500,
+   "researchCost": 20000,
    "prereqs": [
-      "Project_FusionTokamakI"
+      "DeuteriumDeuteriumFusion",
+      "Project_HybridConfinementFusionReactorI"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
    "factionAvailableChance": 100,
    "initialUnlockChance": 0,
    "deltaUnlockChance": 10,
-   "maxUnlockChance": 20,
+   "maxUnlockChance": 50,
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Fusion Tokamak III",
-   "dataName": "Project_FusionTokamakIII",
+   "friendlyName": "Hybrid Confinement Fusion Reactor III",
+   "dataName": "Project_HybridConfinementFusionReactorIII",
    "techCategory": "Energy",
    "AI_techRole": "SpaceDevelopment",
+   "AI_criticalTech": true,
    "AI_projectRole": "PowerPlant",
-   "researchCost": 10000,
+   "researchCost": 50000,
    "prereqs": [
-      "Project_FusionTokamakII",
-      "CarbonNanotubes"
+      "InertialPlasmaConfinementTechniques",
+      "DeuteriumHelium3Fusion",
+      "Project_HybridConfinementFusionReactorII"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
    "factionAvailableChance": 100,
    "initialUnlockChance": 0,
    "deltaUnlockChance": 5,
-   "maxUnlockChance": 20,
+   "maxUnlockChance": 30,
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Fusion Tokamak IV",
-   "dataName": "Project_FusionTokamakIV",
+   "friendlyName": "Hybrid Confinement Fusion Reactor IV",
+   "dataName": "Project_HybridConfinementFusionReactorIV",
    "techCategory": "Energy",
    "AI_techRole": "SpaceDevelopment",
+   "AI_criticalTech": true,
    "AI_projectRole": "PowerPlant",
-   "researchCost": 15000,
+   "researchCost": 75000,
    "prereqs": [
+      "AneutronicFusion",
       "TerawattFusionReactors",
-      "Project_FusionTokamakIII"
+      "PlasmaWeapons",
+      "Project_HybridConfinementFusionReactorIII"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
    "factionAvailableChance": 100,
    "initialUnlockChance": 0,
    "deltaUnlockChance": 5,
-   "maxUnlockChance": 20,
+   "maxUnlockChance": 30,
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Fusion Tokamak V",
-   "dataName": "Project_FusionTokamakV",
+   "friendlyName": "Z-Pinch Fusion Reactor I",
+   "dataName": "Project_ZPinchFusionReactorI",
    "techCategory": "Energy",
    "AI_techRole": "SpaceDevelopment",
    "AI_projectRole": "PowerPlant",
-   "researchCost": 20000,
+   "researchCost": 10000,
    "prereqs": [
-      "Project_FusionTokamakIV",
-      "AppliedArtificialIntelligence"
-   ],
+      "DeuteriumTritiumFusion",
+      "ZPinchTechniques"
+   ],
    "oneTimeGlobally": false,
    "repeatable": false,
    "factionAvailableChance": 100,
    "initialUnlockChance": 0,
-   "deltaUnlockChance": 5,
-   "maxUnlockChance": 20,
+   "deltaUnlockChance": 25,
+   "maxUnlockChance": 100,
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Flow-Stabilized Z-Pinch Fusion Reactor",
-   "dataName": "Project_FlowStabilizedZPinchFusionReactor",
+   "friendlyName": "Z-Pinch Fusion Reactor II",
+   "dataName": "Project_ZPinchFusionReactorII",
    "techCategory": "Energy",
    "AI_techRole": "SpaceDevelopment",
    "AI_projectRole": "PowerPlant",
-   "researchCost": 50000,
+   "researchCost": 20000,
    "prereqs": [
-      "DeuteriumHelium3Fusion",
-      "Project_ZPinchFusionReactorIII",
-      "Project_ExoticHybridSystems"
+      "DeuteriumDeuteriumFusion",
+      "Project_ZPinchFusionReactorI"
    ],
-   "altPrereq0": "ProtonBoronFusion",
    "oneTimeGlobally": false,
    "repeatable": false,
-   "factionAvailableChance": 25,
+   "factionAvailableChance": 100,
    "initialUnlockChance": 0,
-   "deltaUnlockChance": 25,
-   "maxUnlockChance": 100,
+   "deltaUnlockChance": 5,
+   "maxUnlockChance": 30,
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Mirror Cell Fusion Reactor I",
-   "dataName": "Project_MirrorCellFusionReactorI",
+   "friendlyName": "Z-Pinch Fusion Reactor III",
+   "dataName": "Project_ZPinchFusionReactorIII",
    "techCategory": "Energy",
    "AI_techRole": "SpaceDevelopment",
    "AI_projectRole": "PowerPlant",
-   "researchCost": 2500,
+   "researchCost": 50000,
    "prereqs": [
-      "DeuteriumTritiumFusion",
-      "MagneticPlasmaConfinementTechniques"
+      "DeuteriumHelium3Fusion",
+      "Project_ZPinchFusionReactorII"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
-   "factionAvailableChance": 35,
+   "factionAvailableChance": 100,
    "initialUnlockChance": 0,
-   "deltaUnlockChance": 25,
-   "maxUnlockChance": 100,
+   "deltaUnlockChance": 5,
+   "maxUnlockChance": 30,
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Mirror Cell Fusion Reactor II",
-   "dataName": "Project_MirrorCellFusionReactorII",
+   "friendlyName": "Z-Pinch Fusion Reactor IV",
+   "dataName": "Project_ZPinchFusionReactorIV",
    "techCategory": "Energy",
    "AI_techRole": "SpaceDevelopment",
    "AI_projectRole": "PowerPlant",
-   "researchCost": 5000,
+   "researchCost": 50000,
    "prereqs": [
-      "Project_MirrorCellFusionReactorI"
+      "AneutronicFusion",
+      "Project_ZPinchFusionReactorIII"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
    "factionAvailableChance": 100,
    "initialUnlockChance": 0,
    "deltaUnlockChance": 5,
-   "maxUnlockChance": 20,
+   "maxUnlockChance": 30,
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Mirror Cell Fusion Reactor III",
-   "dataName": "Project_MirrorCellFusionReactorIII",
+   "friendlyName": "Flow-Stabilized Z-Pinch Fusion Reactor",
+   "dataName": "Project_FlowStabilizedZPinchFusionReactor",
    "techCategory": "Energy",
    "AI_techRole": "SpaceDevelopment",
    "AI_projectRole": "PowerPlant",
-   "researchCost": 10000,
+   "researchCost": 80000,
    "prereqs": [
-      "Project_MirrorCellFusionReactorII",
-      "SuperconductingMagnets",
-      "TerawattFusionReactors"
+      "TerawattFusionReactors",
+      "Project_ZPinchFusionReactorIV",
+      "Project_ExoticHybridSystems"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
    "factionAvailableChance": 100,
    "initialUnlockChance": 0,
-   "deltaUnlockChance": 5,
-   "maxUnlockChance": 20,
+   "deltaUnlockChance": 25,
+   "maxUnlockChance": 100,
    "resourcesGranted": []
 },
  {
@@ -7962,9 +8285,8 @@
    "dataName": "Project_InertialConfinementFusionReactorI",
    "techCategory": "Energy",
    "AI_techRole": "SpaceDevelopment",
-   "AI_criticalTech": true,
    "AI_projectRole": "PowerPlant",
-   "researchCost": 5000,
+   "researchCost": 10000,
    "prereqs": [
       "DeuteriumTritiumFusion",
       "InertialPlasmaConfinementTechniques"
@@ -7983,10 +8305,10 @@
    "techCategory": "Energy",
    "AI_techRole": "SpaceDevelopment",
    "AI_projectRole": "PowerPlant",
-   "researchCost": 10000,
+   "researchCost": 15000,
    "prereqs": [
-      "Project_InertialConfinementFusionReactorI",
-      "Supercapacitors"
+      "DeuteriumDeuteriumFusion",
+      "Project_InertialConfinementFusionReactorI"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
@@ -8002,10 +8324,10 @@
    "techCategory": "Energy",
    "AI_techRole": "SpaceDevelopment",
    "AI_projectRole": "PowerPlant",
-   "researchCost": 15000,
+   "researchCost": 20000,
    "prereqs": [
-      "Project_InertialConfinementFusionReactorII",
-      "DeuteriumHelium3Fusion"
+      "DeuteriumHelium3Fusion",
+      "Project_InertialConfinementFusionReactorII"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
@@ -8021,10 +8343,10 @@
    "techCategory": "Energy",
    "AI_techRole": "SpaceDevelopment",
    "AI_projectRole": "PowerPlant",
-   "researchCost": 20000,
+   "researchCost": 25000,
    "prereqs": [
-      "Project_InertialConfinementFusionReactorI",
-      "Supercapacitors"
+      "AneutronicFusion",
+      "Project_InertialConfinementFusionReactorIII"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
@@ -8040,12 +8362,12 @@
    "techCategory": "Energy",
    "AI_techRole": "SpaceDevelopment",
    "AI_projectRole": "PowerPlant",
-   "researchCost": 25000,
+   "researchCost": 35000,
    "prereqs": [
+      "TerawattFusionReactors",
       "Project_InertialConfinementFusionReactorIV",
-      "TerawattFusionReactors"
+      "Project_Exotics"
    ],
-   "altPrereq0": "Project_InertialConfinementFusionReactorII",
    "oneTimeGlobally": false,
    "repeatable": false,
    "factionAvailableChance": 100,
@@ -8060,11 +8382,11 @@
    "techCategory": "Energy",
    "AI_techRole": "SpaceDevelopment",
    "AI_projectRole": "PowerPlant",
-   "researchCost": 50000,
+   "researchCost": 100000,
    "prereqs": [
+      "ProtonProtonFusion",
       "Project_InertialConfinementFusionReactorV",
-      "AdvancedNeuralNetworks",
-      "Project_Exotics"
+      "Project_ExoticHybridSystems"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
@@ -8080,11 +8402,10 @@
    "techCategory": "Energy",
    "AI_techRole": "SpaceDevelopment",
    "AI_projectRole": "PowerPlant",
-   "researchCost": 75000,
+   "researchCost": 500000,
    "prereqs": [
-      "Project_InertialConfinementFusionReactorVI",
-      "AppliedArtificialIntelligence",
-      "Project_ExoticHybridSystems"
+      "Accelerando",
+      "Project_InertialConfinementFusionReactorVI"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
@@ -8102,7 +8423,7 @@
    "AI_projectRole": "PowerPlant",
    "researchCost": 25000,
    "prereqs": [
-      "AntimatterContainment",
+      "AntimatterMassProduction",
       "GasCoreFissionSystems"
    ],
    "oneTimeGlobally": false,
@@ -8111,7 +8432,12 @@
    "initialUnlockChance": 0,
    "deltaUnlockChance": 20,
    "maxUnlockChance": 100,
-   "resourcesGranted": []
+   "resourcesGranted": [
+      {
+         "resource": "Antimatter",
+         "value": 0.002
+      }
+   ]
 },
  {
    "friendlyName": "Antimatter Plasma Core Reactor II",
@@ -8119,11 +8445,10 @@
    "techCategory": "Energy",
    "AI_techRole": "SpaceDevelopment",
    "AI_projectRole": "PowerPlant",
-   "researchCost": 50000,
+   "researchCost": 75000,
    "prereqs": [
-      "AntimatterMassProduction",
-      "MagneticPlasmaConfinementTechniques",
-      "Project_AntimatterPlasmaCoreReactorI"
+      "Project_AntimatterPlasmaCoreReactorI",
+      "MagneticPlasmaConfinementTechniques"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
@@ -8131,7 +8456,12 @@
    "initialUnlockChance": 0,
    "deltaUnlockChance": 10,
    "maxUnlockChance": 100,
-   "resourcesGranted": []
+   "resourcesGranted": [
+      {
+         "resource": "Antimatter",
+         "value": 0.002
+      }
+   ]
 },
  {
    "friendlyName": "Antimatter Plasma Core Reactor III",
@@ -8139,20 +8469,24 @@
    "techCategory": "Energy",
    "AI_techRole": "SpaceDevelopment",
    "AI_projectRole": "PowerPlant",
-   "researchCost": 75000,
+   "researchCost": 150000,
    "prereqs": [
-      "AntimatterMassProduction",
-      "Diamondoids",
       "Project_AntimatterPlasmaCoreReactorII",
+      "Diamondoids",
       "Project_Exotics"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
    "factionAvailableChance": 100,
    "initialUnlockChance": 0,
-   "deltaUnlockChance": 10,
+   "deltaUnlockChance": 5,
    "maxUnlockChance": 100,
-   "resourcesGranted": []
+   "resourcesGranted": [
+      {
+         "resource": "Antimatter",
+         "value": 0.002
+      }
+   ]
 },
  {
    "friendlyName": "Antimatter Beam Core Reactor",
@@ -8160,46 +8494,31 @@
    "techCategory": "Energy",
    "AI_techRole": "SpaceDevelopment",
    "AI_projectRole": "PowerPlant",
-   "researchCost": 75000,
+   "researchCost": 500000,
    "prereqs": [
-      "AntimatterMassProduction",
-      "Diamondoids",
+      "Project_AntimatterPlasmaCoreReactorIII",
       "Project_ExoticHybridSystems"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
    "factionAvailableChance": 40,
    "initialUnlockChance": 0,
-   "deltaUnlockChance": 10,
-   "maxUnlockChance": 100,
-   "resourcesGranted": []
-},
- {
-   "friendlyName": "Anaconda Missiles",
-   "dataName": "Project_AnacondaMissileBay",
-   "techCategory": "MilitaryScience",
-   "AI_techRole": "SpaceWar",
-   "AI_projectRole": "Missiles",
-   "researchCost": 650,
-   "prereqs": [
-      "MissileWarfareDoctrine",
-      "Project_Liquid-FuelRockets"
-   ],
-   "oneTimeGlobally": false,
-   "repeatable": false,
-   "factionAvailableChance": 40,
-   "initialUnlockChance": 0,
-   "deltaUnlockChance": 10,
+   "deltaUnlockChance": 5,
    "maxUnlockChance": 50,
-   "resourcesGranted": []
+   "resourcesGranted": [
+      {
+         "resource": "Antimatter",
+         "value": 0.005
+      }
+   ]
 },
  {
-   "friendlyName": "Cobra Missiles",
-   "dataName": "Project_CobraMissileBay",
+   "friendlyName": "Hypergolic High Explosive Missiles",
+   "dataName": "Project_AnacondaMissileBay",
    "techCategory": "MilitaryScience",
    "AI_techRole": "SpaceWar",
    "AI_projectRole": "Missiles",
-   "researchCost": 650,
+   "researchCost": 800,
    "prereqs": [
       "MissileWarfareDoctrine",
       "Project_Liquid-FuelRockets"
@@ -8207,16 +8526,17 @@
    "oneTimeGlobally": false,
    "repeatable": false,
    "factionAvailableChance": 100,
-   "initialUnlockChance": 25,
-   "deltaUnlockChance": 10,
+   "initialUnlockChance": 0,
+   "deltaUnlockChance": 25,
    "maxUnlockChance": 100,
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Copperhead Missiles",
+   "friendlyName": "Hydrolox High Explosive Missiles",
    "dataName": "Project_CopperheadMissileBay",
    "techCategory": "MilitaryScience",
    "AI_techRole": "SpaceWar",
+   "AI_criticalTech": true,
    "AI_projectRole": "Missiles",
    "researchCost": 650,
    "prereqs": [
@@ -8225,14 +8545,14 @@
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
-   "factionAvailableChance": 40,
+   "factionAvailableChance": 100,
    "initialUnlockChance": 0,
    "deltaUnlockChance": 10,
-   "maxUnlockChance": 50,
+   "maxUnlockChance": 100,
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Harlequin Missiles",
+   "friendlyName": "Hypergolic Penetrator Missiles",
    "dataName": "Project_HarlequinMissileBay",
    "techCategory": "MilitaryScience",
    "AI_techRole": "SpaceWar",
@@ -8251,29 +8571,11 @@
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Keelback Missiles",
-   "dataName": "Project_KeelbackMissileBay",
-   "techCategory": "MilitaryScience",
-   "AI_techRole": "SpaceWar",
-   "AI_projectRole": "Missiles",
-   "researchCost": 1500,
-   "prereqs": [
-      "AdvancedMissileWarfareDoctrine",
-      "Project_Liquid-FuelRockets"
-   ],
-   "oneTimeGlobally": false,
-   "repeatable": false,
-   "factionAvailableChance": 100,
-   "initialUnlockChance": 25,
-   "deltaUnlockChance": 10,
-   "maxUnlockChance": 50,
-   "resourcesGranted": []
-},
- {
-   "friendlyName": "Lancehead Missiles",
+   "friendlyName": "Hydrolox Penetrator Missiles",
    "dataName": "Project_LanceheadMissileBay",
    "techCategory": "MilitaryScience",
    "AI_techRole": "SpaceWar",
+   "AI_criticalTech": true,
    "AI_projectRole": "Missiles",
    "researchCost": 1500,
    "prereqs": [
@@ -8289,7 +8591,7 @@
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Rattler Missiles",
+   "friendlyName": "Hypergolic Fragmentation Missiles",
    "dataName": "Project_RattlerMissileBay",
    "techCategory": "MilitaryScience",
    "AI_techRole": "SpaceWar",
@@ -8308,15 +8610,15 @@
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Riverjack Missiles",
-   "dataName": "Project_RiverjackMissileBay",
+   "friendlyName": "Hydrolox Fragmentation Missiles",
+   "dataName": "Project_ViperMissileBay",
    "techCategory": "MilitaryScience",
    "AI_techRole": "SpaceWar",
    "AI_projectRole": "Missiles",
-   "researchCost": 800,
+   "researchCost": 1000,
    "prereqs": [
       "MissileWarfareDoctrine",
-      "Project_Liquid-FuelRockets"
+      "Project_CryogenicLiquid-FuelRockets"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
@@ -8327,34 +8629,35 @@
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Viper Missiles",
-   "dataName": "Project_ViperMissileBay",
+   "friendlyName": "Nerva High Explosive Missiles",
+   "dataName": "Project_AthenaTorpedoBay",
    "techCategory": "MilitaryScience",
    "AI_techRole": "SpaceWar",
    "AI_projectRole": "Missiles",
-   "researchCost": 1000,
+   "researchCost": 2000,
    "prereqs": [
-      "MissileWarfareDoctrine",
-      "Project_CryogenicLiquid-FuelRockets"
+      "AdvancedMissileWarfareDoctrine",
+      "Project_SolidCoreFissionReactorVI"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
-   "factionAvailableChance": 40,
+   "factionAvailableChance": 100,
    "initialUnlockChance": 0,
    "deltaUnlockChance": 10,
    "maxUnlockChance": 50,
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Hera Torpedoes",
-   "dataName": "Project_HeraTorpedoBay",
+   "friendlyName": "Nerva Penetrator Missiles",
+   "dataName": "Project_AresTorpedoBay",
    "techCategory": "MilitaryScience",
    "AI_techRole": "SpaceWar",
+   "AI_criticalTech": true,
    "AI_projectRole": "Missiles",
-   "researchCost": 500,
+   "researchCost": 5000,
    "prereqs": [
-      "MissileWarfareDoctrine",
-      "Project_Liquid-FuelRockets"
+      "AdvancedMissileWarfareDoctrine",
+      "Project_SolidCoreFissionReactorVI"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
@@ -8365,150 +8668,135 @@
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Artemis Torpedoes",
-   "dataName": "Project_ArtemisTorpedoBay",
+   "friendlyName": "Hypergolic Nuclear Torpedos",
+   "dataName": "Project_CerebrusNuclearTorpedoBay",
    "techCategory": "MilitaryScience",
    "AI_techRole": "SpaceWar",
    "AI_projectRole": "Missiles",
-   "researchCost": 800,
+   "researchCost": 2000,
    "prereqs": [
-      "MissileWarfareDoctrine",
-      "Project_CryogenicLiquid-FuelRockets"
+      "AdvancedMissileWarfareDoctrine",
+      "Project_Liquid-FuelRockets"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
    "factionAvailableChance": 100,
    "initialUnlockChance": 25,
-   "deltaUnlockChance": 10,
+   "deltaUnlockChance": 5,
    "maxUnlockChance": 50,
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Athena Torpedoes",
-   "dataName": "Project_AthenaTorpedoBay",
+   "friendlyName": "Hydrolox Nuclear Torpedos",
+   "dataName": "Project_HadesNuclearTorpedoBay",
    "techCategory": "MilitaryScience",
    "AI_techRole": "SpaceWar",
    "AI_projectRole": "Missiles",
    "researchCost": 2000,
    "prereqs": [
       "AdvancedMissileWarfareDoctrine",
-      "SolidCoreFissionSystems"
+      "MilitarizationofSpace",
+      "Project_CryogenicLiquid-FuelRockets"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
    "factionAvailableChance": 40,
    "initialUnlockChance": 0,
-   "deltaUnlockChance": 10,
+   "deltaUnlockChance": 5,
    "maxUnlockChance": 50,
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Hermes Torpedoes",
-   "dataName": "Project_HermesTorpedoBay",
+   "friendlyName": "Nerva Nuclear Torpedos",
+   "dataName": "Project_NemesisNuclearTorpedoBay",
    "techCategory": "MilitaryScience",
    "AI_techRole": "SpaceWar",
    "AI_projectRole": "Missiles",
-   "researchCost": 1200,
+   "researchCost": 5000,
    "prereqs": [
       "AdvancedMissileWarfareDoctrine",
-      "Project_Liquid-FuelRockets"
+      "MilitarizationofSpace",
+      "Project_SolidCoreFissionReactorVII"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
    "factionAvailableChance": 40,
    "initialUnlockChance": 0,
-   "deltaUnlockChance": 10,
+   "deltaUnlockChance": 5,
    "maxUnlockChance": 50,
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Vulcan Torpedoes",
-   "dataName": "Project_VulcanTorpedoBay",
+   "friendlyName": "Olympus Nuclear Torpedos",
+   "dataName": "Project_OlympusNuclearTorpedoBay",
    "techCategory": "MilitaryScience",
    "AI_techRole": "SpaceWar",
    "AI_projectRole": "Missiles",
-   "researchCost": 1500,
+   "researchCost": 5000,
    "prereqs": [
       "AdvancedMissileWarfareDoctrine",
-      "Project_CryogenicLiquid-FuelRockets"
+      "FissionPulseDrives",
+      "MilitarizationofSpace",
+      "Project_SolidCoreFissionReactorVIII"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
-   "factionAvailableChance": 40,
+   "factionAvailableChance": 50,
+   "factionAlways": "DestroyCouncil",
    "initialUnlockChance": 0,
-   "deltaUnlockChance": 10,
+   "deltaUnlockChance": 5,
    "maxUnlockChance": 50,
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Ares Torpedoes",
-   "dataName": "Project_AresTorpedoBay",
+   "friendlyName": "Acheron Nuclear Torpedos",
+   "dataName": "Project_AcheronNuclearTorpedoBay",
    "techCategory": "MilitaryScience",
    "AI_techRole": "SpaceWar",
    "AI_projectRole": "Missiles",
-   "researchCost": 2000,
+   "researchCost": 6000,
    "prereqs": [
-      "AdvancedMissileWarfareDoctrine",
-      "SolidCoreFissionSystems"
+      "HeavyPulsedPropulsion",
+      "Project_OlympusNuclearTorpedoBay"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
-   "factionAvailableChance": 40,
+   "factionAvailableChance": 50,
    "initialUnlockChance": 0,
-   "deltaUnlockChance": 10,
+   "deltaUnlockChance": 5,
    "maxUnlockChance": 50,
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Cerebrus Nuclear Torpedoes",
-   "dataName": "Project_CerebrusNuclearTorpedoBay",
+   "friendlyName": "Tartarus Nuclear Torpedos",
+   "dataName": "Project_TartarusNuclearTorpedoBay",
    "techCategory": "MilitaryScience",
    "AI_techRole": "SpaceWar",
    "AI_projectRole": "Missiles",
-   "researchCost": 1500,
+   "researchCost": 10000,
    "prereqs": [
-      "AdvancedMissileWarfareDoctrine",
-      "Project_Liquid-FuelRockets"
+      "Diamondoids",
+      "Project_AcheronNuclearTorpedoBay"
    ],
+   "altPrereq0": "Project_Exotics",
    "oneTimeGlobally": false,
    "repeatable": false,
-   "factionAvailableChance": 100,
-   "initialUnlockChance": 25,
+   "factionAvailableChance": 40,
+   "initialUnlockChance": 0,
    "deltaUnlockChance": 5,
    "maxUnlockChance": 50,
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Hades Nuclear Torpedoes",
-   "dataName": "Project_HadesNuclearTorpedoBay",
+   "friendlyName": "Styx Nuclear Torpedos",
+   "dataName": "Project_StyxNuclearTorpedoBay",
    "techCategory": "MilitaryScience",
    "AI_techRole": "SpaceWar",
    "AI_projectRole": "Missiles",
-   "researchCost": 1500,
+   "researchCost": 20000,
    "prereqs": [
-      "AdvancedMissileWarfareDoctrine",
-      "MilitarizationofSpace",
-      "Project_CryogenicLiquid-FuelRockets"
-   ],
-   "oneTimeGlobally": false,
-   "repeatable": false,
-   "factionAvailableChance": 40,
-   "initialUnlockChance": 0,
-   "deltaUnlockChance": 5,
-   "maxUnlockChance": 50,
-   "resourcesGranted": []
-},
- {
-   "friendlyName": "Nemesis Nuclear Torpedoes",
-   "dataName": "Project_NemesisNuclearTorpedoBay",
-   "techCategory": "MilitaryScience",
-   "AI_techRole": "SpaceWar",
-   "AI_projectRole": "Missiles",
-   "researchCost": 1500,
-   "prereqs": [
-      "AdvancedMissileWarfareDoctrine",
-      "MilitarizationofSpace",
-      "SolidCoreFissionSystems"
+      "Project_ExoticHybridSystems",
+      "Project_TartarusNuclearTorpedoBay"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
@@ -8517,26 +8805,6 @@
    "deltaUnlockChance": 5,
    "maxUnlockChance": 50,
    "resourcesGranted": []
-},
- {
-   "friendlyName": "Olympus Nuclear Torpedoes",
-   "dataName": "Project_OlympusNuclearTorpedoBay",
-   "techCategory": "MilitaryScience",
-   "AI_techRole": "SpaceWar",
-   "AI_projectRole": "Missiles",
-   "researchCost": 3000,
-   "prereqs": [
-      "AdvancedMissileWarfareDoctrine",
-      "HeavyPulsedPropulsion",
-      "MilitarizationofSpace"
-   ],
-   "oneTimeGlobally": false,
-   "repeatable": false,
-   "factionAvailableChance": 20,
-   "initialUnlockChance": 0,
-   "deltaUnlockChance": 5,
-   "maxUnlockChance": 50,
-   "resourcesGranted": []
 },
  {
    "friendlyName": "Antimatter Torpedoes",
@@ -8548,15 +8816,20 @@
    "prereqs": [
       "AdvancedMissileWarfareDoctrine",
       "AntimatterWeaponry",
-      "SolidCoreFissionSystems"
+      "Project_SolidCoreFissionReactorIX"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
-   "factionAvailableChance": 10,
+   "factionAvailableChance": 20,
    "initialUnlockChance": 0,
    "deltaUnlockChance": 5,
    "maxUnlockChance": 10,
-   "resourcesGranted": []
+   "resourcesGranted": [
+      {
+         "resource": "Antimatter",
+         "value": 0.000006
+      }
+   ]
 },
  {
    "friendlyName": "Potassium Heat Sinks",
@@ -8669,25 +8942,6 @@
    "deltaUnlockChance": 15,
    "maxUnlockChance": 75,
    "resourcesGranted": []
-},
- {
-   "friendlyName": "Heavy Plasma Battery Mk 1",
-   "dataName": "Project_HeavyPlasmaBatteryMk1",
-   "techCategory": "MilitaryScience",
-   "AI_techRole": "SpaceWar",
-   "AI_projectRole": "Kinetics",
-   "researchCost": 10000,
-   "prereqs": [
-      "PlasmaWeapons",
-      "Project_FleetCombatants"
-   ],
-   "oneTimeGlobally": false,
-   "repeatable": false,
-   "factionAvailableChance": 100,
-   "initialUnlockChance": 30,
-   "deltaUnlockChance": 15,
-   "maxUnlockChance": 75,
-   "resourcesGranted": []
 },
  {
    "friendlyName": "Plasma Cannon Mk 1",
@@ -8707,25 +8961,6 @@
    "deltaUnlockChance": 25,
    "maxUnlockChance": 100,
    "resourcesGranted": []
-},
- {
-   "friendlyName": "Heavy Plasma Cannon Mk 1",
-   "dataName": "Project_HeavyPlasmaCannonMk1",
-   "techCategory": "MilitaryScience",
-   "AI_techRole": "SpaceWar",
-   "AI_projectRole": "Kinetics",
-   "researchCost": 10000,
-   "prereqs": [
-      "PlasmaWeapons",
-      "Project_ShipsoftheLine"
-   ],
-   "oneTimeGlobally": false,
-   "repeatable": false,
-   "factionAvailableChance": 100,
-   "initialUnlockChance": 30,
-   "deltaUnlockChance": 15,
-   "maxUnlockChance": 75,
-   "resourcesGranted": []
 },
  {
    "friendlyName": "Plasma Battery Mk 2",
@@ -8745,25 +8980,6 @@
    "deltaUnlockChance": 15,
    "maxUnlockChance": 75,
    "resourcesGranted": []
-},
- {
-   "friendlyName": "Heavy Plasma Battery Mk 2",
-   "dataName": "Project_HeavyPlasmaBatteryMk2",
-   "techCategory": "MilitaryScience",
-   "AI_techRole": "SpaceWar",
-   "AI_projectRole": "Kinetics",
-   "researchCost": 20000,
-   "prereqs": [
-      "Project_HeavyPlasmaBatteryMk1",
-      "Project_Exotics"
-   ],
-   "oneTimeGlobally": false,
-   "repeatable": false,
-   "factionAvailableChance": 100,
-   "initialUnlockChance": 30,
-   "deltaUnlockChance": 15,
-   "maxUnlockChance": 75,
-   "resourcesGranted": []
 },
  {
    "friendlyName": "Plasma Cannon Mk 2",
@@ -8783,25 +8999,6 @@
    "deltaUnlockChance": 15,
    "maxUnlockChance": 75,
    "resourcesGranted": []
-},
- {
-   "friendlyName": "Heavy Plasma Cannon Mk 2",
-   "dataName": "Project_HeavyPlasmaCannonMk2",
-   "techCategory": "MilitaryScience",
-   "AI_techRole": "SpaceWar",
-   "AI_projectRole": "Kinetics",
-   "researchCost": 20000,
-   "prereqs": [
-      "Project_HeavyPlasmaCannonMk1",
-      "Project_Exotics"
-   ],
-   "oneTimeGlobally": false,
-   "repeatable": false,
-   "factionAvailableChance": 100,
-   "initialUnlockChance": 30,
-   "deltaUnlockChance": 15,
-   "maxUnlockChance": 75,
-   "resourcesGranted": []
 },
  {
    "friendlyName": "Plasma Battery Mk 3",
@@ -8821,25 +9018,6 @@
    "deltaUnlockChance": 15,
    "maxUnlockChance": 75,
    "resourcesGranted": []
-},
- {
-   "friendlyName": "Heavy Plasma Battery Mk 3",
-   "dataName": "Project_HeavyPlasmaBatteryMk3",
-   "techCategory": "MilitaryScience",
-   "AI_techRole": "SpaceWar",
-   "AI_projectRole": "Kinetics",
-   "researchCost": 30000,
-   "prereqs": [
-      "Project_HeavyPlasmaBatteryMk2",
-      "Project_ExoticHybridSystems"
-   ],
-   "oneTimeGlobally": false,
-   "repeatable": false,
-   "factionAvailableChance": 100,
-   "initialUnlockChance": 30,
-   "deltaUnlockChance": 15,
-   "maxUnlockChance": 75,
-   "resourcesGranted": []
 },
  {
    "friendlyName": "Plasma Cannon Mk 3",
@@ -8861,34 +9039,15 @@
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Heavy Plasma Cannon Mk 3",
-   "dataName": "Project_HeavyPlasmaCannonMk3",
-   "techCategory": "MilitaryScience",
-   "AI_techRole": "SpaceWar",
-   "AI_projectRole": "Kinetics",
-   "researchCost": 30000,
-   "prereqs": [
-      "Project_HeavyPlasmaCannonMk2",
-      "Project_ExoticHybridSystems"
-   ],
-   "oneTimeGlobally": false,
-   "repeatable": false,
-   "factionAvailableChance": 100,
-   "initialUnlockChance": 30,
-   "deltaUnlockChance": 15,
-   "maxUnlockChance": 75,
-   "resourcesGranted": []
-},
- {
-   "friendlyName": "Point Defense Particle Beam",
-   "dataName": "Project_PointDefenseParticleBeam",
+   "friendlyName": "E-Beam Batteries",
+   "dataName": "Project_EBeamBatteries",
    "techCategory": "MilitaryScience",
    "AI_techRole": "SpaceWar",
    "AI_projectRole": "EnergyWeapons",
    "researchCost": 800,
    "prereqs": [
       "ParticleCannon",
-      "Project_PatrolVessels"
+      "DirectedEnergyWarfareDoctrine"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
@@ -8899,15 +9058,16 @@
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Particle Cannon",
-   "dataName": "Project_ParticleCannonMk1",
+   "friendlyName": "Electron Lance",
+   "dataName": "Project_ElectronLance",
    "techCategory": "MilitaryScience",
    "AI_techRole": "SpaceWar",
    "AI_projectRole": "EnergyWeapons",
    "researchCost": 1000,
    "prereqs": [
       "ParticleCannon",
-      "Project_FleetCombatants"
+      "DirectedEnergyWarfareDoctrine",
+      "Project_PatrolVessels"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
@@ -8918,15 +9078,15 @@
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Heavy Particle Cannon",
-   "dataName": "Project_HeavyParticleCannonMk1",
+   "friendlyName": "Ion Batteries",
+   "dataName": "Project_IonBatteries",
    "techCategory": "MilitaryScience",
    "AI_techRole": "SpaceWar",
    "AI_projectRole": "EnergyWeapons",
-   "researchCost": 1200,
+   "researchCost": 2500,
    "prereqs": [
-      "ParticleCannon",
-      "Project_PatrolVessels"
+      "AdvancedAtomicManipulation",
+      "Project_EBeamBatteries"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
@@ -8937,15 +9097,15 @@
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Sprinal Particle Cannon",
-   "dataName": "Project_SpinalParticleCannonMk1",
+   "friendlyName": "Ion Cannon",
+   "dataName": "Project_IonCannon",
    "techCategory": "MilitaryScience",
    "AI_techRole": "SpaceWar",
    "AI_projectRole": "EnergyWeapons",
-   "researchCost": 1200,
+   "researchCost": 2500,
    "prereqs": [
-      "ParticleCannon",
-      "Project_ShipsoftheLine"
+      "AdvancedAtomicManipulation",
+      "Project_ElectronLance"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
@@ -8956,15 +9116,15 @@
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Improved Particle Cannon",
-   "dataName": "Project_ParticleCannonMk2",
+   "friendlyName": "Particle Beam Batteries",
+   "dataName": "Project_ParticleBeamBatteries",
    "techCategory": "MilitaryScience",
    "AI_techRole": "SpaceWar",
    "AI_projectRole": "EnergyWeapons",
-   "researchCost": 1750,
+   "researchCost": 5000,
    "prereqs": [
-      "Project_ParticleCannonMk1",
-      "Supercapacitors"
+      "Supercapacitors",
+      "Project_IonBatteries"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
@@ -8975,15 +9135,15 @@
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Improved Heavy Particle Cannon",
-   "dataName": "Project_HeavyParticleCannonMk2",
+   "friendlyName": "Particle Lance",
+   "dataName": "Project_ParticleLance",
    "techCategory": "MilitaryScience",
    "AI_techRole": "SpaceWar",
    "AI_projectRole": "EnergyWeapons",
-   "researchCost": 2000,
+   "researchCost": 5000,
    "prereqs": [
-      "Project_HeavyParticleCannonMk1",
-      "Supercapacitors"
+      "Supercapacitors",
+      "Project_IonCannon"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
@@ -8994,15 +9154,15 @@
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Improved Spinal Particle Cannon",
-   "dataName": "Project_SpinalParticleCannonMk2",
+   "friendlyName": "Antimatter Particle Cannon",
+   "dataName": "Project_AntimatterParticleCannon",
    "techCategory": "MilitaryScience",
    "AI_techRole": "SpaceWar",
    "AI_projectRole": "EnergyWeapons",
-   "researchCost": 2000,
+   "researchCost": 25000,
    "prereqs": [
-      "Project_SpinalParticleCannonMk1",
-      "Supercapacitors"
+      "AntimatterWeaponry",
+      "Project_ParticleLance"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
@@ -9010,18 +9170,26 @@
    "initialUnlockChance": 0,
    "deltaUnlockChance": 10,
    "maxUnlockChance": 50,
-   "resourcesGranted": []
+   "resourcesGranted": [
+      {
+         "resource": "Antimatter",
+         "value": 6.4e-10
+      }
+   ]
 },
  {
-   "friendlyName": "Advanced Particle Cannon",
-   "dataName": "Project_ParticleCannonMk3",
+   "friendlyName": "Spinal Neutron Lance",
+   "dataName": "Project_SpinalNeutronLance",
    "techCategory": "MilitaryScience",
    "AI_techRole": "SpaceWar",
    "AI_projectRole": "EnergyWeapons",
-   "researchCost": 2500,
+   "researchCost": 50000,
    "prereqs": [
-      "Project_ParticleCannonMk2",
-      "Ultracapacitors"
+      "AdvancedFissionSystems",
+      "Project_UltracoldNeutronContainment",
+      "Project_ParticleLance",
+      "Project_ShipsoftheLine",
+      "Project_ExoticHybridSystems"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
@@ -9032,51 +9200,32 @@
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Advanced Heavy Particle Cannon",
-   "dataName": "Project_HeavyParticleCannonMk3",
-   "techCategory": "MilitaryScience",
-   "AI_techRole": "SpaceWar",
-   "AI_projectRole": "EnergyWeapons",
-   "researchCost": 3000,
-   "prereqs": [
-      "Project_HeavyParticleCannonMk2",
-      "Ultracapacitors"
-   ],
-   "oneTimeGlobally": false,
-   "repeatable": false,
-   "factionAvailableChance": 100,
-   "initialUnlockChance": 0,
-   "deltaUnlockChance": 10,
-   "maxUnlockChance": 50,
-   "resourcesGranted": []
-},
- {
-   "friendlyName": "Advanced Spinal Particle Cannon",
-   "dataName": "Project_SpinalParticleCannonMk3",
+   "friendlyName": "Railgun Batteries",
+   "dataName": "Project_RailgunBatteryMk1",
    "techCategory": "MilitaryScience",
    "AI_techRole": "SpaceWar",
-   "AI_projectRole": "EnergyWeapons",
+   "AI_criticalTech": true,
+   "AI_projectRole": "Kinetics",
    "researchCost": 3000,
    "prereqs": [
-      "Project_SpinalParticleCannonMk2",
-      "Ultracapacitors"
+      "Railguns"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
    "factionAvailableChance": 100,
-   "initialUnlockChance": 0,
-   "deltaUnlockChance": 10,
-   "maxUnlockChance": 50,
+   "initialUnlockChance": 20,
+   "deltaUnlockChance": 20,
+   "maxUnlockChance": 100,
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Light Railgun Batteries",
-   "dataName": "Project_LightRailgunBatteryMk1",
+   "friendlyName": "Rail Cannon",
+   "dataName": "Project_RailCannonMk1",
    "techCategory": "MilitaryScience",
    "AI_techRole": "SpaceWar",
    "AI_criticalTech": true,
    "AI_projectRole": "Kinetics",
-   "researchCost": 1000,
+   "researchCost": 3000,
    "prereqs": [
       "Railguns"
    ],
@@ -9089,16 +9238,16 @@
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Railgun Batteries",
-   "dataName": "Project_RailgunBatteryMk1",
+   "friendlyName": "Improved Railgun Batteries",
+   "dataName": "Project_RailgunBatteryMk2",
    "techCategory": "MilitaryScience",
    "AI_techRole": "SpaceWar",
    "AI_criticalTech": true,
    "AI_projectRole": "Kinetics",
-   "researchCost": 1000,
+   "researchCost": 4000,
    "prereqs": [
-      "Railguns",
-      "Project_PatrolVessels"
+      "Project_RailgunBatteryMk1",
+      "MagneticForceManipulation"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
@@ -9109,15 +9258,16 @@
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Heavy Railgun Batteries",
-   "dataName": "Project_HeavyRailgunBatteryMk1",
+   "friendlyName": "Improved Rail Cannon",
+   "dataName": "Project_RailCannonMk2",
    "techCategory": "MilitaryScience",
    "AI_techRole": "SpaceWar",
+   "AI_criticalTech": true,
    "AI_projectRole": "Kinetics",
-   "researchCost": 1000,
+   "researchCost": 4000,
    "prereqs": [
-      "Railguns",
-      "Project_FleetCombatants"
+      "Project_RailCannonMk1",
+      "MagneticForceManipulation"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
@@ -9128,35 +9278,34 @@
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Rail Cannon",
-   "dataName": "Project_RailCannonMk1",
+   "friendlyName": "Advanced Railgun Batteries",
+   "dataName": "Project_RailgunBatteryMk3",
    "techCategory": "MilitaryScience",
    "AI_techRole": "SpaceWar",
    "AI_criticalTech": true,
    "AI_projectRole": "Kinetics",
-   "researchCost": 1200,
+   "researchCost": 5000,
    "prereqs": [
-      "Railguns",
-      "Project_PatrolVessels"
+      "Project_RailgunBatteryMk2"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
    "factionAvailableChance": 100,
-   "initialUnlockChance": 0,
-   "deltaUnlockChance": 15,
-   "maxUnlockChance": 50,
+   "initialUnlockChance": 20,
+   "deltaUnlockChance": 20,
+   "maxUnlockChance": 100,
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Spinal Mount Railguns",
-   "dataName": "Project_SpinalRailgunMk1",
+   "friendlyName": "Advanced Rail Cannon",
+   "dataName": "Project_RailCannonMk3",
    "techCategory": "MilitaryScience",
    "AI_techRole": "SpaceWar",
+   "AI_criticalTech": true,
    "AI_projectRole": "Kinetics",
-   "researchCost": 1200,
+   "researchCost": 5000,
    "prereqs": [
-      "Railguns",
-      "Project_ShipsoftheLine"
+      "Project_RailCannonMk2"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
@@ -9167,34 +9316,55 @@
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Improved Light Railgun Batteries",
-   "dataName": "Project_LightRailgunBatteryMk2",
+   "friendlyName": "Coilgun Batteries",
+   "dataName": "Project_CoilgunBatteryMk1",
    "techCategory": "MilitaryScience",
    "AI_techRole": "SpaceWar",
    "AI_criticalTech": true,
    "AI_projectRole": "Kinetics",
-   "researchCost": 2000,
+   "researchCost": 5000,
    "prereqs": [
-      "Project_LightRailgunBatteryMk1"
+      "Coilguns"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
    "factionAvailableChance": 100,
-   "initialUnlockChance": 0,
-   "deltaUnlockChance": 15,
+   "initialUnlockChance": 20,
+   "deltaUnlockChance": 20,
+   "maxUnlockChance": 100,
+   "resourcesGranted": []
+},
+ {
+   "friendlyName": "Coil Cannon",
+   "dataName": "Project_CoilCannonMk1",
+   "techCategory": "MilitaryScience",
+   "AI_techRole": "SpaceWar",
+   "AI_criticalTech": true,
+   "AI_projectRole": "Kinetics",
+   "researchCost": 5000,
+   "prereqs": [
+      "Coilguns"
+   ],
+   "oneTimeGlobally": false,
+   "repeatable": false,
+   "factionAvailableChance": 100,
+   "initialUnlockChance": 0,
+   "deltaUnlockChance": 15,
    "maxUnlockChance": 50,
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Improved Railgun Batteries",
-   "dataName": "Project_RailgunBatteryMk2",
+   "friendlyName": "Improved Coilgun Batteries",
+   "dataName": "Project_CoilgunBatteryMk2",
    "techCategory": "MilitaryScience",
    "AI_techRole": "SpaceWar",
    "AI_criticalTech": true,
    "AI_projectRole": "Kinetics",
-   "researchCost": 2000,
+   "researchCost": 10000,
    "prereqs": [
-      "Project_RailgunBatteryMk1"
+      "Project_CoilgunBatteryMk1",
+      "HighTemperatureSuperconductors",
+      "Superalloys"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
@@ -9205,14 +9375,17 @@
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Improved Heavy Railgun Batteries",
-   "dataName": "Project_HeavyRailgunBatteryMk2",
+   "friendlyName": "Improved Coil Cannon",
+   "dataName": "Project_CoilCannonMk2",
    "techCategory": "MilitaryScience",
    "AI_techRole": "SpaceWar",
+   "AI_criticalTech": true,
    "AI_projectRole": "Kinetics",
-   "researchCost": 2000,
+   "researchCost": 10000,
    "prereqs": [
-      "Project_HeavyRailgunBatteryMk1"
+      "Project_CoilCannonMk1",
+      "HighTemperatureSuperconductors",
+      "Superalloys"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
@@ -9223,33 +9396,38 @@
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Improved Rail Cannon",
-   "dataName": "Project_RailCannonMk2",
+   "friendlyName": "Advanced Coilgun Batteries",
+   "dataName": "Project_CoilgunBatteryMk3",
    "techCategory": "MilitaryScience",
    "AI_techRole": "SpaceWar",
    "AI_criticalTech": true,
    "AI_projectRole": "Kinetics",
-   "researchCost": 2500,
+   "researchCost": 15000,
    "prereqs": [
-      "Project_RailCannonMk1"
+      "Project_CoilgunBatteryMk2",
+      "Ultracapacitors",
+      "Project_Exotics"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
    "factionAvailableChance": 100,
-   "initialUnlockChance": 0,
-   "deltaUnlockChance": 15,
-   "maxUnlockChance": 50,
+   "initialUnlockChance": 20,
+   "deltaUnlockChance": 20,
+   "maxUnlockChance": 100,
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Improved Spinal Mount Railguns",
-   "dataName": "Project_SpinalRailgunMk2",
+   "friendlyName": "Advanced Coil Cannon",
+   "dataName": "Project_CoilCannonMk3",
    "techCategory": "MilitaryScience",
    "AI_techRole": "SpaceWar",
+   "AI_criticalTech": true,
    "AI_projectRole": "Kinetics",
-   "researchCost": 2500,
+   "researchCost": 15000,
    "prereqs": [
-      "Project_SpinalRailgunMk1"
+      "Project_CoilCannonMk2",
+      "Ultracapacitors",
+      "Project_Exotics"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
@@ -9260,2085 +9438,566 @@
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Advanced Light Railgun Batteries",
-   "dataName": "Project_LightRailgunBatteryMk3",
+   "friendlyName": "Point Defense Laser Turrets",
+   "dataName": "Project_PointDefenseLaserTurret",
    "techCategory": "MilitaryScience",
    "AI_techRole": "SpaceWar",
    "AI_criticalTech": true,
-   "AI_projectRole": "Kinetics",
-   "researchCost": 3000,
+   "AI_projectRole": "EnergyWeapons",
+   "researchCost": 250,
    "prereqs": [
-      "Project_LightRailgunBatteryMk2",
-      "MagneticForceManipulation"
+      "DirectedEnergyWarfareDoctrine"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
    "factionAvailableChance": 100,
-   "initialUnlockChance": 0,
-   "deltaUnlockChance": 15,
-   "maxUnlockChance": 50,
+   "initialUnlockChance": 50,
+   "deltaUnlockChance": 50,
+   "maxUnlockChance": 100,
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Advanced Railgun Batteries",
-   "dataName": "Project_RailgunBatteryMk3",
+   "friendlyName": "IR Laser Batteries",
+   "dataName": "Project_60cmIRLaserBattery",
    "techCategory": "MilitaryScience",
    "AI_techRole": "SpaceWar",
    "AI_criticalTech": true,
-   "AI_projectRole": "Kinetics",
-   "researchCost": 3000,
+   "AI_projectRole": "EnergyWeapons",
+   "researchCost": 500,
    "prereqs": [
-      "Project_RailgunBatteryMk2",
-      "MagneticForceManipulation"
+      "InfraredCombatLasers"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
    "factionAvailableChance": 100,
-   "initialUnlockChance": 20,
-   "deltaUnlockChance": 20,
+   "initialUnlockChance": 50,
+   "deltaUnlockChance": 25,
    "maxUnlockChance": 100,
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Advanced Heavy Railgun Batteries",
-   "dataName": "Project_HeavyRailgunBatteryMk3",
+   "friendlyName": "Light IR Laser Cannon",
+   "dataName": "Project_240cmIRLaserCannon",
    "techCategory": "MilitaryScience",
    "AI_techRole": "SpaceWar",
-   "AI_projectRole": "Kinetics",
-   "researchCost": 3000,
+   "AI_criticalTech": true,
+   "AI_projectRole": "EnergyWeapons",
+   "researchCost": 500,
    "prereqs": [
-      "Project_HeavyRailgunBatteryMk2",
-      "MagneticForceManipulation"
+      "InfraredCombatLasers"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
    "factionAvailableChance": 100,
    "initialUnlockChance": 0,
-   "deltaUnlockChance": 15,
-   "maxUnlockChance": 50,
+   "deltaUnlockChance": 34,
+   "maxUnlockChance": 100,
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Advanced Rail Cannon",
-   "dataName": "Project_RailCannonMk3",
+   "friendlyName": "Point Defense Arc Laser Turrets",
+   "dataName": "Project_PointDefenseArcLaserTurret",
    "techCategory": "MilitaryScience",
    "AI_techRole": "SpaceWar",
    "AI_criticalTech": true,
-   "AI_projectRole": "Kinetics",
-   "researchCost": 3500,
+   "AI_projectRole": "EnergyWeapons",
+   "researchCost": 1000,
    "prereqs": [
-      "Project_RailCannonMk2",
-      "MagneticForceManipulation"
+      "ArcLasers"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
    "factionAvailableChance": 100,
-   "initialUnlockChance": 0,
-   "deltaUnlockChance": 15,
-   "maxUnlockChance": 50,
+   "initialUnlockChance": 50,
+   "deltaUnlockChance": 50,
+   "maxUnlockChance": 100,
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Advanced Spinal Mount Railguns",
-   "dataName": "Project_SpinalRailgunMk3",
+   "friendlyName": "Light IR Arc Laser Batteries",
+   "dataName": "Project_60cmIRArcLaserBattery",
    "techCategory": "MilitaryScience",
    "AI_techRole": "SpaceWar",
-   "AI_projectRole": "Kinetics",
-   "researchCost": 3500,
+   "AI_projectRole": "EnergyWeapons",
+   "researchCost": 1500,
    "prereqs": [
-      "Project_SpinalRailgunMk2",
-      "MagneticForceManipulation"
+      "ArcLasers"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
    "factionAvailableChance": 100,
-   "initialUnlockChance": 0,
-   "deltaUnlockChance": 15,
-   "maxUnlockChance": 50,
+   "initialUnlockChance": 50,
+   "deltaUnlockChance": 25,
+   "maxUnlockChance": 100,
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Light Coilgun Batteries",
-   "dataName": "Project_LightCoilgunBatteryMk1",
+   "friendlyName": "Light IR Arc Laser Cannon",
+   "dataName": "Project_240cmIRArcLaserCannon",
    "techCategory": "MilitaryScience",
    "AI_techRole": "SpaceWar",
-   "AI_criticalTech": true,
-   "AI_projectRole": "Kinetics",
-   "researchCost": 3000,
+   "AI_projectRole": "EnergyWeapons",
+   "researchCost": 1500,
    "prereqs": [
-      "Coilguns"
+      "ArcLasers"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
    "factionAvailableChance": 100,
    "initialUnlockChance": 0,
-   "deltaUnlockChance": 15,
-   "maxUnlockChance": 50,
+   "deltaUnlockChance": 34,
+   "maxUnlockChance": 100,
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Coilgun Batteries",
-   "dataName": "Project_CoilgunBatteryMk1",
+   "friendlyName": "Point Defense Phaser Turrets",
+   "dataName": "Project_PointDefensePhaserTurret",
    "techCategory": "MilitaryScience",
    "AI_techRole": "SpaceWar",
    "AI_criticalTech": true,
-   "AI_projectRole": "Kinetics",
-   "researchCost": 3000,
+   "AI_projectRole": "EnergyWeapons",
+   "researchCost": 1500,
    "prereqs": [
-      "Coilguns",
-      "Project_PatrolVessels"
+      "PhasedArrayLasers"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
    "factionAvailableChance": 100,
-   "initialUnlockChance": 20,
-   "deltaUnlockChance": 20,
+   "initialUnlockChance": 50,
+   "deltaUnlockChance": 50,
    "maxUnlockChance": 100,
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Heavy Coilgun Batteries",
-   "dataName": "Project_HeavyCoilgunBatteryMk1",
+   "friendlyName": "IR Phaser Batteries",
+   "dataName": "Project_60cmIRPhaserBattery",
    "techCategory": "MilitaryScience",
    "AI_techRole": "SpaceWar",
-   "AI_projectRole": "Kinetics",
-   "researchCost": 3000,
+   "AI_projectRole": "EnergyWeapons",
+   "researchCost": 2500,
    "prereqs": [
-      "Coilguns",
-      "Project_FleetCombatants"
+      "PhasedArrayLasers"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
    "factionAvailableChance": 100,
-   "initialUnlockChance": 0,
-   "deltaUnlockChance": 15,
-   "maxUnlockChance": 50,
+   "initialUnlockChance": 50,
+   "deltaUnlockChance": 25,
+   "maxUnlockChance": 100,
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Coil Cannon",
-   "dataName": "Project_CoilCannonMk1",
+   "friendlyName": "IR Phaser Cannon",
+   "dataName": "Project_240cmIRPhaserCannon",
    "techCategory": "MilitaryScience",
    "AI_techRole": "SpaceWar",
-   "AI_criticalTech": true,
-   "AI_projectRole": "Kinetics",
-   "researchCost": 3500,
+   "AI_projectRole": "EnergyWeapons",
+   "researchCost": 2500,
    "prereqs": [
-      "Coilguns",
-      "Project_PatrolVessels"
+      "PhasedArrayLasers"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
    "factionAvailableChance": 100,
    "initialUnlockChance": 0,
-   "deltaUnlockChance": 15,
-   "maxUnlockChance": 50,
+   "deltaUnlockChance": 34,
+   "maxUnlockChance": 100,
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Spinal Mount Coilgun",
-   "dataName": "Project_SpinalCoilerMk1",
+   "friendlyName": "Green Laser Batteries",
+   "dataName": "Project_60cmGreenLaserBattery",
    "techCategory": "MilitaryScience",
    "AI_techRole": "SpaceWar",
-   "AI_projectRole": "Kinetics",
-   "researchCost": 3500,
+   "AI_projectRole": "EnergyWeapons",
+   "researchCost": 5000,
    "prereqs": [
-      "Coilguns",
-      "Project_ShipsoftheLine"
+      "VisibleCombatLasers"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
    "factionAvailableChance": 100,
-   "initialUnlockChance": 0,
-   "deltaUnlockChance": 15,
-   "maxUnlockChance": 50,
+   "initialUnlockChance": 50,
+   "deltaUnlockChance": 50,
+   "maxUnlockChance": 100,
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Improved Light Coilgun Batteries",
-   "dataName": "Project_LightCoilgunBatteryMk2",
+   "friendlyName": "Green Laser Cannon",
+   "dataName": "Project_240cmGreenLaserCannon",
    "techCategory": "MilitaryScience",
    "AI_techRole": "SpaceWar",
-   "AI_criticalTech": true,
-   "AI_projectRole": "Kinetics",
-   "researchCost": 4000,
+   "AI_projectRole": "EnergyWeapons",
+   "researchCost": 5000,
    "prereqs": [
-      "Project_LightCoilgunBatteryMk1",
-      "HighTemperatureSuperconductors"
+      "VisibleCombatLasers"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
    "factionAvailableChance": 100,
    "initialUnlockChance": 0,
-   "deltaUnlockChance": 15,
-   "maxUnlockChance": 50,
+   "deltaUnlockChance": 34,
+   "maxUnlockChance": 100,
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Improved Coilgun Batteries",
-   "dataName": "Project_CoilgunBatteryMk2",
+   "friendlyName": "Green Arc Laser Batteries",
+   "dataName": "Project_60cmGreenArcLaserBattery",
    "techCategory": "MilitaryScience",
    "AI_techRole": "SpaceWar",
    "AI_criticalTech": true,
-   "AI_projectRole": "Kinetics",
-   "researchCost": 4000,
+   "AI_projectRole": "EnergyWeapons",
+   "researchCost": 7500,
    "prereqs": [
-      "Project_CoilgunBatteryMk1",
-      "HighTemperatureSuperconductors"
+      "VisibleCombatLasers",
+      "ArcLasers"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
    "factionAvailableChance": 100,
-   "initialUnlockChance": 20,
-   "deltaUnlockChance": 20,
+   "initialUnlockChance": 50,
+   "deltaUnlockChance": 50,
    "maxUnlockChance": 100,
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Improved Heavy Coilgun Batteries",
-   "dataName": "Project_HeavyCoilgunBatteryMk2",
+   "friendlyName": "Green Arc Laser Cannon",
+   "dataName": "Project_240cmGreenArcLaserCannon",
    "techCategory": "MilitaryScience",
    "AI_techRole": "SpaceWar",
-   "AI_projectRole": "Kinetics",
-   "researchCost": 4000,
+   "AI_criticalTech": true,
+   "AI_projectRole": "EnergyWeapons",
+   "researchCost": 7500,
    "prereqs": [
-      "Project_HeavyCoilgunBatteryMk1",
-      "HighTemperatureSuperconductors"
+      "VisibleCombatLasers",
+      "ArcLasers"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
    "factionAvailableChance": 100,
    "initialUnlockChance": 0,
-   "deltaUnlockChance": 15,
-   "maxUnlockChance": 50,
+   "deltaUnlockChance": 34,
+   "maxUnlockChance": 100,
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Improved Coil Cannon",
-   "dataName": "Project_CoilCannonMk2",
+   "friendlyName": "Green Phaser Batteries",
+   "dataName": "Project_60cmGreenPhaserBattery",
    "techCategory": "MilitaryScience",
    "AI_techRole": "SpaceWar",
-   "AI_criticalTech": true,
-   "AI_projectRole": "Kinetics",
-   "researchCost": 4500,
+   "AI_projectRole": "EnergyWeapons",
+   "researchCost": 12000,
    "prereqs": [
-      "Project_CoilCannonMk1",
-      "HighTemperatureSuperconductors"
+      "VisibleCombatLasers",
+      "PhasedArrayLasers",
+      "Project_Exotics"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
    "factionAvailableChance": 100,
-   "initialUnlockChance": 0,
-   "deltaUnlockChance": 15,
-   "maxUnlockChance": 50,
+   "initialUnlockChance": 50,
+   "deltaUnlockChance": 50,
+   "maxUnlockChance": 100,
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Improved Spinal Mount Coilgun",
-   "dataName": "Project_SpinalCoilerMk2",
+   "friendlyName": "Green Phaser Cannon",
+   "dataName": "Project_240cmGreenPhaserCannon",
    "techCategory": "MilitaryScience",
    "AI_techRole": "SpaceWar",
-   "AI_projectRole": "Kinetics",
-   "researchCost": 4500,
+   "AI_projectRole": "EnergyWeapons",
+   "researchCost": 12000,
    "prereqs": [
-      "Project_SpinalCoilerMk1",
-      "HighTemperatureSuperconductors"
-   ],
-   "oneTimeGlobally": false,
-   "repeatable": false,
-   "factionAvailableChance": 100,
-   "initialUnlockChance": 0,
-   "deltaUnlockChance": 15,
-   "maxUnlockChance": 50,
-   "resourcesGranted": []
-},
- {
-   "friendlyName": "Advanced Light Coilgun Batteries",
-   "dataName": "Project_LightCoilgunBatteryMk3",
-   "techCategory": "MilitaryScience",
-   "AI_techRole": "SpaceWar",
-   "AI_criticalTech": true,
-   "AI_projectRole": "Kinetics",
-   "researchCost": 5000,
-   "prereqs": [
-      "Project_LightCoilgunBatteryMk2",
-      "Ultracapacitors"
+      "VisibleCombatLasers",
+      "PhasedArrayLasers",
+      "Project_Exotics"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
    "factionAvailableChance": 100,
    "initialUnlockChance": 0,
-   "deltaUnlockChance": 15,
-   "maxUnlockChance": 50,
+   "deltaUnlockChance": 34,
+   "maxUnlockChance": 100,
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Advanced Coilgun Batteries",
-   "dataName": "Project_CoilgunBatteryMk3",
+   "friendlyName": "UV Laser Batteries",
+   "dataName": "Project_60cmUVLaserBattery",
    "techCategory": "MilitaryScience",
    "AI_techRole": "SpaceWar",
-   "AI_criticalTech": true,
-   "AI_projectRole": "Kinetics",
-   "researchCost": 5000,
+   "AI_projectRole": "EnergyWeapons",
+   "researchCost": 7500,
    "prereqs": [
-      "Project_CoilgunBatteryMk2",
-      "Ultracapacitors"
+      "UltravioletCombatLasers"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
    "factionAvailableChance": 100,
-   "initialUnlockChance": 20,
-   "deltaUnlockChance": 20,
+   "initialUnlockChance": 50,
+   "deltaUnlockChance": 50,
    "maxUnlockChance": 100,
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Advanced Heavy Coilgun Batteries",
-   "dataName": "Project_HeavyCoilgunBatteryMk3",
+   "friendlyName": "UV Laser Cannon",
+   "dataName": "Project_240cmUVLaserCannon",
    "techCategory": "MilitaryScience",
    "AI_techRole": "SpaceWar",
-   "AI_projectRole": "Kinetics",
-   "researchCost": 5000,
+   "AI_projectRole": "EnergyWeapons",
+   "researchCost": 7500,
    "prereqs": [
-      "Project_HeavyCoilgunBatteryMk2",
-      "Ultracapacitors"
+      "UltravioletCombatLasers"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
    "factionAvailableChance": 100,
    "initialUnlockChance": 0,
-   "deltaUnlockChance": 15,
-   "maxUnlockChance": 50,
+   "deltaUnlockChance": 34,
+   "maxUnlockChance": 100,
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Advanced Coil Cannon",
-   "dataName": "Project_CoilCannonMk3",
+   "friendlyName": "UV Arc Laser Batteries",
+   "dataName": "Project_60cmUVArcLaserBattery",
    "techCategory": "MilitaryScience",
    "AI_techRole": "SpaceWar",
-   "AI_criticalTech": true,
-   "AI_projectRole": "Kinetics",
-   "researchCost": 5500,
+   "AI_projectRole": "EnergyWeapons",
+   "researchCost": 10000,
    "prereqs": [
-      "Project_CoilCannonMk2",
-      "Ultracapacitors"
+      "UltravioletCombatLasers",
+      "ArcLasers"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
    "factionAvailableChance": 100,
-   "initialUnlockChance": 0,
-   "deltaUnlockChance": 15,
-   "maxUnlockChance": 50,
+   "initialUnlockChance": 50,
+   "deltaUnlockChance": 50,
+   "maxUnlockChance": 100,
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Advanced Spinal Mount Coilgun",
-   "dataName": "Project_SpinalCoilerMk3",
+   "friendlyName": "UV Arc Laser Cannon",
+   "dataName": "Project_240cmUVArcLaserCannon",
    "techCategory": "MilitaryScience",
    "AI_techRole": "SpaceWar",
-   "AI_projectRole": "Kinetics",
-   "researchCost": 5500,
+   "AI_projectRole": "EnergyWeapons",
+   "researchCost": 10000,
    "prereqs": [
-      "Project_SpinalCoilerMk2",
-      "Ultracapacitors"
+      "UltravioletCombatLasers",
+      "ArcLasers"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
    "factionAvailableChance": 100,
    "initialUnlockChance": 0,
-   "deltaUnlockChance": 15,
-   "maxUnlockChance": 50,
+   "deltaUnlockChance": 34,
+   "maxUnlockChance": 100,
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Light Rail Cannon",
-   "dataName": "Project_LightRailCannonMk1",
+   "friendlyName": "UV Phaser Batteries",
+   "dataName": "Project_60cmUVPhaserBattery",
    "techCategory": "MilitaryScience",
    "AI_techRole": "SpaceWar",
    "AI_criticalTech": true,
-   "AI_projectRole": "Kinetics",
-   "researchCost": 1200,
+   "AI_projectRole": "EnergyWeapons",
+   "researchCost": 18000,
    "prereqs": [
-      "Railguns"
+      "UltravioletCombatLasers",
+      "PhasedArrayLasers",
+      "Project_ExoticHybridSystems",
+      "Project_ExoticHybridSystems"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
    "factionAvailableChance": 100,
-   "initialUnlockChance": 0,
-   "deltaUnlockChance": 20,
+   "initialUnlockChance": 50,
+   "deltaUnlockChance": 50,
    "maxUnlockChance": 100,
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Improved Light Rail Cannon",
-   "dataName": "Project_LightRailCannonMk2",
+   "friendlyName": "UV Phaser Cannon",
+   "dataName": "Project_240cmUVPhaserCannon",
    "techCategory": "MilitaryScience",
    "AI_techRole": "SpaceWar",
    "AI_criticalTech": true,
-   "AI_projectRole": "Kinetics",
-   "researchCost": 1800,
+   "AI_projectRole": "EnergyWeapons",
+   "researchCost": 18000,
    "prereqs": [
-      "Project_LightRailCannonMk1"
+      "UltravioletCombatLasers",
+      "PhasedArrayLasers",
+      "Project_ExoticHybridSystems",
+      "Project_ExoticHybridSystems"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
    "factionAvailableChance": 100,
    "initialUnlockChance": 0,
-   "deltaUnlockChance": 20,
-   "maxUnlockChance": 50,
+   "deltaUnlockChance": 15,
+   "maxUnlockChance": 60,
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Advanced Light Rail Cannon",
-   "dataName": "Project_LightRailCannonMk3",
-   "techCategory": "MilitaryScience",
-   "AI_techRole": "SpaceWar",
-   "AI_criticalTech": true,
-   "AI_projectRole": "Kinetics",
-   "researchCost": 2400,
+   "friendlyName": "Publicize Alien Threat",
+   "dataName": "Project_PublicizeAlienThreat",
+   "techCategory": "SocialScience",
+   "AI_techRole": "EarthPolitics",
+   "AI_projectRole": "Influence",
+   "researchCost": 500,
    "prereqs": [
-      "Project_LightRailCannonMk2",
-      "MagneticForceManipulation"
+      "WeAreNotAlone",
+      "Project_TheirOperations"
+   ],
+   "effects": [
+      "Effect_GlobalPropaganda"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
+   "factionPrereq": [
+      "ResistCouncil",
+      "DestroyCouncil",
+      "EscapeCouncil"
+   ],
    "factionAvailableChance": 100,
-   "initialUnlockChance": 0,
-   "deltaUnlockChance": 20,
-   "maxUnlockChance": 50,
+   "initialUnlockChance": 25,
+   "deltaUnlockChance": 25,
+   "maxUnlockChance": 100,
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Light Coil Cannon",
-   "dataName": "Project_LightCoilCannonMk1",
-   "techCategory": "MilitaryScience",
-   "AI_techRole": "SpaceWar",
-   "AI_criticalTech": true,
-   "AI_projectRole": "Kinetics",
-   "researchCost": 2500,
+   "friendlyName": "Global Listening Network",
+   "dataName": "Project_GlobalListeningNetwork",
+   "techCategory": "InformationScience",
+   "AI_techRole": "EarthPolitics",
+   "AI_projectRole": "PoliticalMissions",
+   "researchCost": 1000,
    "prereqs": [
-      "Coilguns"
+      "PhotonicComputing",
+      "Project_TheirOperations"
+   ],
+   "effects": [
+      "Effect_GlobalListeningNetwork"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
    "factionAvailableChance": 100,
-   "initialUnlockChance": 0,
-   "deltaUnlockChance": 20,
-   "maxUnlockChance": 50,
+   "initialUnlockChance": 25,
+   "deltaUnlockChance": 25,
+   "maxUnlockChance": 100,
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Improved Light Coil Cannon",
-   "dataName": "Project_LightCoilCannonMk2",
-   "techCategory": "MilitaryScience",
-   "AI_techRole": "SpaceWar",
+   "friendlyName": "Space Tugs",
+   "dataName": "Project_SpaceTugs",
+   "techCategory": "Energy",
+   "AI_techRole": "SpaceDevelopment",
    "AI_criticalTech": true,
-   "AI_projectRole": "Kinetics",
-   "researchCost": 3500,
+   "AI_projectRole": "Exploration",
+   "researchCost": 750,
    "prereqs": [
-      "Project_LightCoilCannonMk1",
-      "HighTemperatureSuperconductors"
+      "AdvancedChemicalRocketry"
+   ],
+   "effects": [
+      "Effect_SpaceTugs"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
-   "factionAvailableChance": 100,
+   "factionAvailableChance": 60,
    "initialUnlockChance": 0,
-   "deltaUnlockChance": 20,
-   "maxUnlockChance": 50,
+   "deltaUnlockChance": 25,
+   "maxUnlockChance": 75,
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Advanced Light Coil Cannon",
-   "dataName": "Project_LightCoilCannonMk3",
-   "techCategory": "MilitaryScience",
-   "AI_techRole": "SpaceWar",
+   "friendlyName": "Solar Steamers",
+   "dataName": "Project_SolarSteamers",
+   "techCategory": "Energy",
+   "AI_techRole": "SpaceDevelopment",
    "AI_criticalTech": true,
-   "AI_projectRole": "Kinetics",
-   "researchCost": 4500,
+   "AI_projectRole": "Exploration",
+   "researchCost": 1000,
    "prereqs": [
-      "Project_LightCoilCannonMk2",
-      "Ultracapacitors"
+      "ElectrothermalPropulsion"
+   ],
+   "effects": [
+      "Effect_SolarSteamers"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
-   "factionAvailableChance": 100,
+   "factionAvailableChance": 60,
    "initialUnlockChance": 0,
-   "deltaUnlockChance": 20,
-   "maxUnlockChance": 50,
+   "deltaUnlockChance": 25,
+   "maxUnlockChance": 75,
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Heavy Rail Cannon",
-   "dataName": "Project_HeavyRailCannonMk1",
-   "techCategory": "MilitaryScience",
-   "AI_techRole": "SpaceWar",
-   "AI_projectRole": "Kinetics",
-   "researchCost": 1200,
+   "friendlyName": "Nuclear Freighters",
+   "dataName": "Project_NuclearFreighters",
+   "techCategory": "Energy",
+   "AI_techRole": "SpaceDevelopment",
+   "AI_criticalTech": true,
+   "AI_projectRole": "Exploration",
+   "researchCost": 2000,
    "prereqs": [
-      "Railguns",
-      "Project_FleetCombatants"
+      "SolidCoreFissionSystems"
+   ],
+   "effects": [
+      "Effect_NuclearFreighters",
+      "Effect_NuclearRockets",
+      "Effect_HabNuclearFreighters"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
-   "factionAvailableChance": 100,
+   "factionAvailableChance": 60,
    "initialUnlockChance": 0,
    "deltaUnlockChance": 20,
-   "maxUnlockChance": 50,
+   "maxUnlockChance": 60,
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Improved Heavy Rail Cannon",
-   "dataName": "Project_HeavyRailCannonMk2",
-   "techCategory": "MilitaryScience",
-   "AI_techRole": "SpaceWar",
-   "AI_projectRole": "Kinetics",
-   "researchCost": 2500,
+   "friendlyName": "High Thrust Probes",
+   "dataName": "Project_HighThrustProbes",
+   "techCategory": "Energy",
+   "AI_techRole": "SpaceDevelopment",
+   "AI_criticalTech": true,
+   "AI_projectRole": "Exploration",
+   "researchCost": 600,
    "prereqs": [
-      "Project_HeavyRailCannonMk1"
+      "AdvancedChemicalRocketry"
+   ],
+   "effects": [
+      "Effect_FastProbes"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
-   "factionAvailableChance": 100,
+   "factionAvailableChance": 60,
    "initialUnlockChance": 0,
    "deltaUnlockChance": 20,
-   "maxUnlockChance": 50,
+   "maxUnlockChance": 60,
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Advanced Heavy Rail Cannon",
-   "dataName": "Project_HeavyRailCannonMk3",
-   "techCategory": "MilitaryScience",
-   "AI_techRole": "SpaceWar",
-   "AI_projectRole": "Kinetics",
-   "researchCost": 3500,
+   "friendlyName": "Clandestine Cells",
+   "dataName": "Project_ClandestineCells",
+   "techCategory": "SocialScience",
+   "AI_techRole": "EarthPolitics",
+   "AI_criticalTech": true,
+   "AI_projectRole": "Core",
+   "researchCost": 600,
    "prereqs": [
-      "Project_HeavyRailCannonMk2",
-      "MagneticForceManipulation"
+      "WeAreNotAlone"
+   ],
+   "effects": [
+      "Effect_IncreaseCouncilSize",
+      "Effect_ControlPointMaintenanceBonus10"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
    "factionAvailableChance": 100,
-   "initialUnlockChance": 0,
+   "initialUnlockChance": 60,
    "deltaUnlockChance": 20,
-   "maxUnlockChance": 50,
-   "resourcesGranted": []
-},
- {
-   "friendlyName": "Heavy Coil Cannon",
-   "dataName": "Project_HeavyCoilCannonMk1",
-   "techCategory": "MilitaryScience",
-   "AI_techRole": "SpaceWar",
-   "AI_projectRole": "Kinetics",
-   "researchCost": 3500,
-   "prereqs": [
-      "Coilguns",
-      "Project_FleetCombatants"
-   ],
-   "oneTimeGlobally": false,
-   "repeatable": false,
-   "factionAvailableChance": 100,
-   "initialUnlockChance": 0,
-   "deltaUnlockChance": 20,
-   "maxUnlockChance": 50,
-   "resourcesGranted": []
-},
- {
-   "friendlyName": "Improved Heavy Coil Cannon",
-   "dataName": "Project_HeavyCoilCannonMk2",
-   "techCategory": "MilitaryScience",
-   "AI_techRole": "SpaceWar",
-   "AI_projectRole": "Kinetics",
-   "researchCost": 4500,
-   "prereqs": [
-      "Project_HeavyCoilCannonMk1",
-      "HighTemperatureSuperconductors"
-   ],
-   "oneTimeGlobally": false,
-   "repeatable": false,
-   "factionAvailableChance": 100,
-   "initialUnlockChance": 0,
-   "deltaUnlockChance": 20,
-   "maxUnlockChance": 50,
-   "resourcesGranted": []
-},
- {
-   "friendlyName": "Advanced Heavy Coil Cannon",
-   "dataName": "Project_HeavyCoilCannonMk3",
-   "techCategory": "MilitaryScience",
-   "AI_techRole": "SpaceWar",
-   "AI_projectRole": "Kinetics",
-   "researchCost": 5000,
-   "prereqs": [
-      "Project_HeavyCoilCannonMk2",
-      "Ultracapacitors"
-   ],
-   "oneTimeGlobally": false,
-   "repeatable": false,
-   "factionAvailableChance": 100,
-   "initialUnlockChance": 0,
-   "deltaUnlockChance": 20,
-   "maxUnlockChance": 50,
-   "resourcesGranted": []
-},
- {
-   "friendlyName": "Point Defense Laser Turrets",
-   "dataName": "Project_PointDefenseLaserTurret",
-   "techCategory": "MilitaryScience",
-   "AI_techRole": "SpaceWar",
-   "AI_criticalTech": true,
-   "AI_projectRole": "EnergyWeapons",
-   "researchCost": 250,
-   "prereqs": [
-      "DirectedEnergyWarfareDoctrine"
-   ],
-   "oneTimeGlobally": false,
-   "repeatable": false,
-   "factionAvailableChance": 100,
-   "initialUnlockChance": 50,
-   "deltaUnlockChance": 50,
-   "maxUnlockChance": 100,
-   "resourcesGranted": []
-},
- {
-   "friendlyName": "Light IR Laser Batteries",
-   "dataName": "Project_60cmIRLaserBattery",
-   "techCategory": "MilitaryScience",
-   "AI_techRole": "SpaceWar",
-   "AI_criticalTech": true,
-   "AI_projectRole": "EnergyWeapons",
-   "researchCost": 500,
-   "prereqs": [
-      "InfraredCombatLasers"
-   ],
-   "oneTimeGlobally": false,
-   "repeatable": false,
-   "factionAvailableChance": 100,
-   "initialUnlockChance": 50,
-   "deltaUnlockChance": 25,
-   "maxUnlockChance": 100,
-   "resourcesGranted": []
-},
- {
-   "friendlyName": "Medium IR Laser Batteries",
-   "dataName": "Project_120cmIRLaserBattery",
-   "techCategory": "MilitaryScience",
-   "AI_techRole": "SpaceWar",
-   "AI_projectRole": "EnergyWeapons",
-   "researchCost": 600,
-   "prereqs": [
-      "InfraredCombatLasers",
-      "Project_PatrolVessels"
-   ],
-   "oneTimeGlobally": false,
-   "repeatable": false,
-   "factionAvailableChance": 100,
-   "initialUnlockChance": 0,
-   "deltaUnlockChance": 20,
-   "maxUnlockChance": 100,
-   "resourcesGranted": []
-},
- {
-   "friendlyName": "Heavy IR Laser Batteries",
-   "dataName": "Project_360cmIRLaserBattery",
-   "techCategory": "MilitaryScience",
-   "AI_techRole": "SpaceWar",
-   "AI_projectRole": "EnergyWeapons",
-   "researchCost": 800,
-   "prereqs": [
-      "InfraredCombatLasers",
-      "Project_FleetCombatants"
-   ],
-   "oneTimeGlobally": false,
-   "repeatable": false,
-   "factionAvailableChance": 100,
-   "initialUnlockChance": 0,
-   "deltaUnlockChance": 15,
-   "maxUnlockChance": 60,
-   "resourcesGranted": []
-},
- {
-   "friendlyName": "Light IR Laser Cannon",
-   "dataName": "Project_240cmIRLaserCannon",
-   "techCategory": "MilitaryScience",
-   "AI_techRole": "SpaceWar",
-   "AI_criticalTech": true,
-   "AI_projectRole": "EnergyWeapons",
-   "researchCost": 400,
-   "prereqs": [
-      "InfraredCombatLasers"
-   ],
-   "oneTimeGlobally": false,
-   "repeatable": false,
-   "factionAvailableChance": 100,
-   "initialUnlockChance": 0,
-   "deltaUnlockChance": 34,
-   "maxUnlockChance": 100,
-   "resourcesGranted": []
-},
- {
-   "friendlyName": "Medium IR Laser Cannon",
-   "dataName": "Project_480cmIRLaserCannon",
-   "techCategory": "MilitaryScience",
-   "AI_techRole": "SpaceWar",
-   "AI_criticalTech": true,
-   "AI_projectRole": "EnergyWeapons",
-   "researchCost": 600,
-   "prereqs": [
-      "InfraredCombatLasers",
-      "Project_PatrolVessels"
-   ],
-   "oneTimeGlobally": false,
-   "repeatable": false,
-   "factionAvailableChance": 100,
-   "initialUnlockChance": 0,
-   "deltaUnlockChance": 15,
-   "maxUnlockChance": 60,
-   "resourcesGranted": []
-},
- {
-   "friendlyName": "Heavy IR Laser Cannon",
-   "dataName": "Project_720cmIRLaserCannon",
-   "techCategory": "MilitaryScience",
-   "AI_techRole": "SpaceWar",
-   "AI_projectRole": "EnergyWeapons",
-   "researchCost": 800,
-   "prereqs": [
-      "InfraredCombatLasers",
-      "Project_FleetCombatants"
-   ],
-   "oneTimeGlobally": false,
-   "repeatable": false,
-   "factionAvailableChance": 100,
-   "initialUnlockChance": 0,
-   "deltaUnlockChance": 15,
-   "maxUnlockChance": 60,
-   "resourcesGranted": []
-},
- {
-   "friendlyName": "Superheavy IR Laser Cannon",
-   "dataName": "Project_960cmIRLaserCannon",
-   "techCategory": "MilitaryScience",
-   "AI_techRole": "SpaceWar",
-   "AI_projectRole": "EnergyWeapons",
-   "researchCost": 1000,
-   "prereqs": [
-      "InfraredCombatLasers",
-      "Project_ShipsoftheLine"
-   ],
-   "oneTimeGlobally": false,
-   "repeatable": false,
-   "factionAvailableChance": 100,
-   "initialUnlockChance": 0,
-   "deltaUnlockChance": 15,
-   "maxUnlockChance": 60,
-   "resourcesGranted": []
-},
- {
-   "friendlyName": "Point Defense Arc Laser Turrets",
-   "dataName": "Project_PointDefenseArcLaserTurret",
-   "techCategory": "MilitaryScience",
-   "AI_techRole": "SpaceWar",
-   "AI_criticalTech": true,
-   "AI_projectRole": "EnergyWeapons",
-   "researchCost": 1000,
-   "prereqs": [
-      "ArcLasers"
-   ],
-   "oneTimeGlobally": false,
-   "repeatable": false,
-   "factionAvailableChance": 100,
-   "initialUnlockChance": 50,
-   "deltaUnlockChance": 50,
-   "maxUnlockChance": 100,
-   "resourcesGranted": []
-},
- {
-   "friendlyName": "Light IR Arc Laser Batteries",
-   "dataName": "Project_60cmIRArcLaserBattery",
-   "techCategory": "MilitaryScience",
-   "AI_techRole": "SpaceWar",
-   "AI_projectRole": "EnergyWeapons",
-   "researchCost": 1500,
-   "prereqs": [
-      "ArcLasers"
-   ],
-   "oneTimeGlobally": false,
-   "repeatable": false,
-   "factionAvailableChance": 100,
-   "initialUnlockChance": 50,
-   "deltaUnlockChance": 25,
-   "maxUnlockChance": 100,
-   "resourcesGranted": []
-},
- {
-   "friendlyName": "Medium IR Arc Laser Batteries",
-   "dataName": "Project_120cmIRArcLaserBattery",
-   "techCategory": "MilitaryScience",
-   "AI_techRole": "SpaceWar",
-   "AI_projectRole": "EnergyWeapons",
-   "researchCost": 2000,
-   "prereqs": [
-      "ArcLasers",
-      "Project_PatrolVessels"
-   ],
-   "oneTimeGlobally": false,
-   "repeatable": false,
-   "factionAvailableChance": 100,
-   "initialUnlockChance": 0,
-   "deltaUnlockChance": 20,
-   "maxUnlockChance": 100,
-   "resourcesGranted": []
-},
- {
-   "friendlyName": "Heavy IR Arc Laser Batteries",
-   "dataName": "Project_360cmIRArcLaserBattery",
-   "techCategory": "MilitaryScience",
-   "AI_techRole": "SpaceWar",
-   "AI_projectRole": "EnergyWeapons",
-   "researchCost": 2500,
-   "prereqs": [
-      "ArcLasers",
-      "Project_FleetCombatants"
-   ],
-   "oneTimeGlobally": false,
-   "repeatable": false,
-   "factionAvailableChance": 100,
-   "initialUnlockChance": 0,
-   "deltaUnlockChance": 15,
-   "maxUnlockChance": 60,
-   "resourcesGranted": []
-},
- {
-   "friendlyName": "Light IR Arc Laser Cannon",
-   "dataName": "Project_240cmIRArcLaserCannon",
-   "techCategory": "MilitaryScience",
-   "AI_techRole": "SpaceWar",
-   "AI_projectRole": "EnergyWeapons",
-   "researchCost": 1500,
-   "prereqs": [
-      "ArcLasers"
-   ],
-   "oneTimeGlobally": false,
-   "repeatable": false,
-   "factionAvailableChance": 100,
-   "initialUnlockChance": 0,
-   "deltaUnlockChance": 34,
-   "maxUnlockChance": 100,
-   "resourcesGranted": []
-},
- {
-   "friendlyName": "Medium IR Arc Laser Cannon",
-   "dataName": "Project_480cmIRArcLaserCannon",
-   "techCategory": "MilitaryScience",
-   "AI_techRole": "SpaceWar",
-   "AI_projectRole": "EnergyWeapons",
-   "researchCost": 2000,
-   "prereqs": [
-      "ArcLasers",
-      "Project_PatrolVessels"
-   ],
-   "oneTimeGlobally": false,
-   "repeatable": false,
-   "factionAvailableChance": 100,
-   "initialUnlockChance": 0,
-   "deltaUnlockChance": 15,
-   "maxUnlockChance": 60,
-   "resourcesGranted": []
-},
- {
-   "friendlyName": "Heavy IR Arc Laser Cannon",
-   "dataName": "Project_720cmIRArcLaserCannon",
-   "techCategory": "MilitaryScience",
-   "AI_techRole": "SpaceWar",
-   "AI_projectRole": "EnergyWeapons",
-   "researchCost": 2500,
-   "prereqs": [
-      "ArcLasers",
-      "Project_FleetCombatants"
-   ],
-   "oneTimeGlobally": false,
-   "repeatable": false,
-   "factionAvailableChance": 100,
-   "initialUnlockChance": 0,
-   "deltaUnlockChance": 15,
-   "maxUnlockChance": 60,
-   "resourcesGranted": []
-},
- {
-   "friendlyName": "Superheavy IR Arc Laser Cannon",
-   "dataName": "Project_960cmIRArcLaserCannon",
-   "techCategory": "MilitaryScience",
-   "AI_techRole": "SpaceWar",
-   "AI_projectRole": "EnergyWeapons",
-   "researchCost": 3500,
-   "prereqs": [
-      "ArcLasers",
-      "Project_ShipsoftheLine"
-   ],
-   "oneTimeGlobally": false,
-   "repeatable": false,
-   "factionAvailableChance": 100,
-   "initialUnlockChance": 0,
-   "deltaUnlockChance": 15,
-   "maxUnlockChance": 60,
-   "resourcesGranted": []
-},
- {
-   "friendlyName": "Point Defense Phaser Turrets",
-   "dataName": "Project_PointDefensePhaserTurret",
-   "techCategory": "MilitaryScience",
-   "AI_techRole": "SpaceWar",
-   "AI_criticalTech": true,
-   "AI_projectRole": "EnergyWeapons",
-   "researchCost": 1500,
-   "prereqs": [
-      "PhasedArrayLasers"
-   ],
-   "oneTimeGlobally": false,
-   "repeatable": false,
-   "factionAvailableChance": 100,
-   "initialUnlockChance": 50,
-   "deltaUnlockChance": 50,
-   "maxUnlockChance": 100,
-   "resourcesGranted": []
-},
- {
-   "friendlyName": "Light IR Phaser Batteries",
-   "dataName": "Project_60cmIRPhaserBattery",
-   "techCategory": "MilitaryScience",
-   "AI_techRole": "SpaceWar",
-   "AI_projectRole": "EnergyWeapons",
-   "researchCost": 2250,
-   "prereqs": [
-      "PhasedArrayLasers"
-   ],
-   "oneTimeGlobally": false,
-   "repeatable": false,
-   "factionAvailableChance": 100,
-   "initialUnlockChance": 50,
-   "deltaUnlockChance": 25,
-   "maxUnlockChance": 100,
-   "resourcesGranted": []
-},
- {
-   "friendlyName": "Medium IR Phaser Batteries",
-   "dataName": "Project_120cmIRPhaserBattery",
-   "techCategory": "MilitaryScience",
-   "AI_techRole": "SpaceWar",
-   "AI_projectRole": "EnergyWeapons",
-   "researchCost": 3000,
-   "prereqs": [
-      "PhasedArrayLasers",
-      "Project_PatrolVessels"
-   ],
-   "oneTimeGlobally": false,
-   "repeatable": false,
-   "factionAvailableChance": 100,
-   "initialUnlockChance": 0,
-   "deltaUnlockChance": 20,
-   "maxUnlockChance": 100,
-   "resourcesGranted": []
-},
- {
-   "friendlyName": "Heavy IR Phaser Batteries",
-   "dataName": "Project_360cmIRPhaserBattery",
-   "techCategory": "MilitaryScience",
-   "AI_techRole": "SpaceWar",
-   "AI_projectRole": "EnergyWeapons",
-   "researchCost": 3750,
-   "prereqs": [
-      "PhasedArrayLasers",
-      "Project_FleetCombatants"
-   ],
-   "oneTimeGlobally": false,
-   "repeatable": false,
-   "factionAvailableChance": 100,
-   "initialUnlockChance": 0,
-   "deltaUnlockChance": 15,
-   "maxUnlockChance": 60,
-   "resourcesGranted": []
-},
- {
-   "friendlyName": "Light IR Phaser Cannon",
-   "dataName": "Project_240cmIRPhaserCannon",
-   "techCategory": "MilitaryScience",
-   "AI_techRole": "SpaceWar",
-   "AI_projectRole": "EnergyWeapons",
-   "researchCost": 2250,
-   "prereqs": [
-      "PhasedArrayLasers"
-   ],
-   "oneTimeGlobally": false,
-   "repeatable": false,
-   "factionAvailableChance": 100,
-   "initialUnlockChance": 0,
-   "deltaUnlockChance": 34,
-   "maxUnlockChance": 100,
-   "resourcesGranted": []
-},
- {
-   "friendlyName": "Medium IR Phaser Cannon",
-   "dataName": "Project_480cmIRPhaserCannon",
-   "techCategory": "MilitaryScience",
-   "AI_techRole": "SpaceWar",
-   "AI_projectRole": "EnergyWeapons",
-   "researchCost": 3000,
-   "prereqs": [
-      "PhasedArrayLasers",
-      "Project_PatrolVessels"
-   ],
-   "oneTimeGlobally": false,
-   "repeatable": false,
-   "factionAvailableChance": 100,
-   "initialUnlockChance": 0,
-   "deltaUnlockChance": 15,
-   "maxUnlockChance": 60,
-   "resourcesGranted": []
-},
- {
-   "friendlyName": "Heavy IR Phaser Cannon",
-   "dataName": "Project_720cmIRPhaserCannon",
-   "techCategory": "MilitaryScience",
-   "AI_techRole": "SpaceWar",
-   "AI_projectRole": "EnergyWeapons",
-   "researchCost": 3750,
-   "prereqs": [
-      "PhasedArrayLasers",
-      "Project_FleetCombatants"
-   ],
-   "oneTimeGlobally": false,
-   "repeatable": false,
-   "factionAvailableChance": 100,
-   "initialUnlockChance": 0,
-   "deltaUnlockChance": 15,
-   "maxUnlockChance": 60,
-   "resourcesGranted": []
-},
- {
-   "friendlyName": "Superheavy IR Phaser Cannon",
-   "dataName": "Project_960cmIRPhaserCannon",
-   "techCategory": "MilitaryScience",
-   "AI_techRole": "SpaceWar",
-   "AI_projectRole": "EnergyWeapons",
-   "researchCost": 5250,
-   "prereqs": [
-      "PhasedArrayLasers",
-      "Project_ShipsoftheLine"
-   ],
-   "oneTimeGlobally": false,
-   "repeatable": false,
-   "factionAvailableChance": 100,
-   "initialUnlockChance": 0,
-   "deltaUnlockChance": 15,
-   "maxUnlockChance": 60,
-   "resourcesGranted": []
-},
- {
-   "friendlyName": "Light Green Laser Batteries",
-   "dataName": "Project_60cmGreenLaserBattery",
-   "techCategory": "MilitaryScience",
-   "AI_techRole": "SpaceWar",
-   "AI_projectRole": "EnergyWeapons",
-   "researchCost": 5000,
-   "prereqs": [
-      "VisibleCombatLasers"
-   ],
-   "oneTimeGlobally": false,
-   "repeatable": false,
-   "factionAvailableChance": 100,
-   "initialUnlockChance": 50,
-   "deltaUnlockChance": 50,
-   "maxUnlockChance": 100,
-   "resourcesGranted": []
-},
- {
-   "friendlyName": "Medium Green Laser Batteries",
-   "dataName": "Project_120cmGreenLaserBattery",
-   "techCategory": "MilitaryScience",
-   "AI_techRole": "SpaceWar",
-   "AI_projectRole": "EnergyWeapons",
-   "researchCost": 6000,
-   "prereqs": [
-      "VisibleCombatLasers",
-      "Project_PatrolVessels"
-   ],
-   "oneTimeGlobally": false,
-   "repeatable": false,
-   "factionAvailableChance": 100,
-   "initialUnlockChance": 0,
-   "deltaUnlockChance": 34,
-   "maxUnlockChance": 100,
-   "resourcesGranted": []
-},
- {
-   "friendlyName": "Heavy Green Laser Batteries",
-   "dataName": "Project_360cmGreenLaserBattery",
-   "techCategory": "MilitaryScience",
-   "AI_techRole": "SpaceWar",
-   "AI_projectRole": "EnergyWeapons",
-   "researchCost": 7000,
-   "prereqs": [
-      "VisibleCombatLasers",
-      "Project_FleetCombatants"
-   ],
-   "oneTimeGlobally": false,
-   "repeatable": false,
-   "factionAvailableChance": 100,
-   "initialUnlockChance": 0,
-   "deltaUnlockChance": 15,
-   "maxUnlockChance": 60,
-   "resourcesGranted": []
-},
- {
-   "friendlyName": "Light Green Laser Cannon",
-   "dataName": "Project_240cmGreenLaserCannon",
-   "techCategory": "MilitaryScience",
-   "AI_techRole": "SpaceWar",
-   "AI_projectRole": "EnergyWeapons",
-   "researchCost": 5000,
-   "prereqs": [
-      "VisibleCombatLasers"
-   ],
-   "oneTimeGlobally": false,
-   "repeatable": false,
-   "factionAvailableChance": 100,
-   "initialUnlockChance": 0,
-   "deltaUnlockChance": 34,
-   "maxUnlockChance": 100,
-   "resourcesGranted": []
-},
- {
-   "friendlyName": "Medium Green Laser Cannon",
-   "dataName": "Project_480cmGreenLaserCannon",
-   "techCategory": "MilitaryScience",
-   "AI_techRole": "SpaceWar",
-   "AI_projectRole": "EnergyWeapons",
-   "researchCost": 6000,
-   "prereqs": [
-      "VisibleCombatLasers",
-      "Project_PatrolVessels"
-   ],
-   "oneTimeGlobally": false,
-   "repeatable": false,
-   "factionAvailableChance": 100,
-   "initialUnlockChance": 0,
-   "deltaUnlockChance": 15,
-   "maxUnlockChance": 60,
-   "resourcesGranted": []
-},
- {
-   "friendlyName": "Heavy Green Laser Cannon",
-   "dataName": "Project_720cmGreenLaserCannon",
-   "techCategory": "MilitaryScience",
-   "AI_techRole": "SpaceWar",
-   "AI_projectRole": "EnergyWeapons",
-   "researchCost": 7000,
-   "prereqs": [
-      "VisibleCombatLasers",
-      "Project_FleetCombatants"
-   ],
-   "oneTimeGlobally": false,
-   "repeatable": false,
-   "factionAvailableChance": 100,
-   "initialUnlockChance": 0,
-   "deltaUnlockChance": 15,
-   "maxUnlockChance": 60,
-   "resourcesGranted": []
-},
- {
-   "friendlyName": "Superheavy Green Laser Cannon",
-   "dataName": "Project_960cmGreenLaserCannon",
-   "techCategory": "MilitaryScience",
-   "AI_techRole": "SpaceWar",
-   "AI_projectRole": "EnergyWeapons",
-   "researchCost": 10000,
-   "prereqs": [
-      "VisibleCombatLasers",
-      "Project_ShipsoftheLine"
-   ],
-   "oneTimeGlobally": false,
-   "repeatable": false,
-   "factionAvailableChance": 100,
-   "initialUnlockChance": 0,
-   "deltaUnlockChance": 15,
-   "maxUnlockChance": 60,
-   "resourcesGranted": []
-},
- {
-   "friendlyName": "Light Green Arc Laser Batteries",
-   "dataName": "Project_60cmGreenArcLaserBattery",
-   "techCategory": "MilitaryScience",
-   "AI_techRole": "SpaceWar",
-   "AI_criticalTech": true,
-   "AI_projectRole": "EnergyWeapons",
-   "researchCost": 7500,
-   "prereqs": [
-      "VisibleCombatLasers",
-      "ArcLasers"
-   ],
-   "oneTimeGlobally": false,
-   "repeatable": false,
-   "factionAvailableChance": 100,
-   "initialUnlockChance": 50,
-   "deltaUnlockChance": 50,
-   "maxUnlockChance": 100,
-   "resourcesGranted": []
-},
- {
-   "friendlyName": "Medium Green Arc Laser Batteries",
-   "dataName": "Project_120cmGreenArcLaserBattery",
-   "techCategory": "MilitaryScience",
-   "AI_techRole": "SpaceWar",
-   "AI_criticalTech": true,
-   "AI_projectRole": "EnergyWeapons",
-   "researchCost": 9000,
-   "prereqs": [
-      "VisibleCombatLasers",
-      "ArcLasers"
-   ],
-   "oneTimeGlobally": false,
-   "repeatable": false,
-   "factionAvailableChance": 100,
-   "initialUnlockChance": 0,
-   "deltaUnlockChance": 34,
-   "maxUnlockChance": 100,
-   "resourcesGranted": []
-},
- {
-   "friendlyName": "Heavy Green Arc Laser Batteries",
-   "dataName": "Project_360cmGreenArcLaserBattery",
-   "techCategory": "MilitaryScience",
-   "AI_techRole": "SpaceWar",
-   "AI_criticalTech": true,
-   "AI_projectRole": "EnergyWeapons",
-   "researchCost": 10500,
-   "prereqs": [
-      "VisibleCombatLasers",
-      "ArcLasers",
-      "Project_FleetCombatants"
-   ],
-   "oneTimeGlobally": false,
-   "repeatable": false,
-   "factionAvailableChance": 100,
-   "initialUnlockChance": 0,
-   "deltaUnlockChance": 15,
-   "maxUnlockChance": 60,
-   "resourcesGranted": []
-},
- {
-   "friendlyName": "Light Green Arc Laser Cannon",
-   "dataName": "Project_240cmGreenArcLaserCannon",
-   "techCategory": "MilitaryScience",
-   "AI_techRole": "SpaceWar",
-   "AI_criticalTech": true,
-   "AI_projectRole": "EnergyWeapons",
-   "researchCost": 7500,
-   "prereqs": [
-      "VisibleCombatLasers",
-      "ArcLasers"
-   ],
-   "oneTimeGlobally": false,
-   "repeatable": false,
-   "factionAvailableChance": 100,
-   "initialUnlockChance": 0,
-   "deltaUnlockChance": 34,
-   "maxUnlockChance": 100,
-   "resourcesGranted": []
-},
- {
-   "friendlyName": "Medium Green Arc Laser Cannon",
-   "dataName": "Project_480cmGreenArcLaserCannon",
-   "techCategory": "MilitaryScience",
-   "AI_techRole": "SpaceWar",
-   "AI_criticalTech": true,
-   "AI_projectRole": "EnergyWeapons",
-   "researchCost": 9000,
-   "prereqs": [
-      "VisibleCombatLasers",
-      "ArcLasers",
-      "Project_PatrolVessels"
-   ],
-   "oneTimeGlobally": false,
-   "repeatable": false,
-   "factionAvailableChance": 100,
-   "initialUnlockChance": 0,
-   "deltaUnlockChance": 15,
-   "maxUnlockChance": 60,
-   "resourcesGranted": []
-},
- {
-   "friendlyName": "Heavy Green Arc Laser Cannon",
-   "dataName": "Project_720cmGreenArcLaserCannon",
-   "techCategory": "MilitaryScience",
-   "AI_techRole": "SpaceWar",
-   "AI_criticalTech": true,
-   "AI_projectRole": "EnergyWeapons",
-   "researchCost": 10500,
-   "prereqs": [
-      "VisibleCombatLasers",
-      "ArcLasers",
-      "Project_FleetCombatants"
-   ],
-   "oneTimeGlobally": false,
-   "repeatable": false,
-   "factionAvailableChance": 100,
-   "initialUnlockChance": 0,
-   "deltaUnlockChance": 15,
-   "maxUnlockChance": 60,
-   "resourcesGranted": []
-},
- {
-   "friendlyName": "Superheavy Green Arc Laser Cannon",
-   "dataName": "Project_960cmGreenArcLaserCannon",
-   "techCategory": "MilitaryScience",
-   "AI_techRole": "SpaceWar",
-   "AI_criticalTech": true,
-   "AI_projectRole": "EnergyWeapons",
-   "researchCost": 15000,
-   "prereqs": [
-      "VisibleCombatLasers",
-      "ArcLasers",
-      "Project_ShipsoftheLine"
-   ],
-   "oneTimeGlobally": false,
-   "repeatable": false,
-   "factionAvailableChance": 100,
-   "initialUnlockChance": 0,
-   "deltaUnlockChance": 15,
-   "maxUnlockChance": 60,
-   "resourcesGranted": []
-},
- {
-   "friendlyName": "Light Green Phaser Batteries",
-   "dataName": "Project_60cmGreenPhaserBattery",
-   "techCategory": "MilitaryScience",
-   "AI_techRole": "SpaceWar",
-   "AI_projectRole": "EnergyWeapons",
-   "researchCost": 11250,
-   "prereqs": [
-      "VisibleCombatLasers",
-      "PhasedArrayLasers"
-   ],
-   "oneTimeGlobally": false,
-   "repeatable": false,
-   "factionAvailableChance": 100,
-   "initialUnlockChance": 50,
-   "deltaUnlockChance": 50,
-   "maxUnlockChance": 100,
-   "resourcesGranted": []
-},
- {
-   "friendlyName": "Medium Green Phaser Batteries",
-   "dataName": "Project_120cmGreenPhaserBattery",
-   "techCategory": "MilitaryScience",
-   "AI_techRole": "SpaceWar",
-   "AI_projectRole": "EnergyWeapons",
-   "researchCost": 13500,
-   "prereqs": [
-      "VisibleCombatLasers",
-      "PhasedArrayLasers",
-      "Project_PatrolVessels"
-   ],
-   "oneTimeGlobally": false,
-   "repeatable": false,
-   "factionAvailableChance": 100,
-   "initialUnlockChance": 0,
-   "deltaUnlockChance": 34,
-   "maxUnlockChance": 100,
-   "resourcesGranted": []
-},
- {
-   "friendlyName": "Heavy Green Phaser Batteries",
-   "dataName": "Project_360cmGreenPhaserBattery",
-   "techCategory": "MilitaryScience",
-   "AI_techRole": "SpaceWar",
-   "AI_projectRole": "EnergyWeapons",
-   "researchCost": 15750,
-   "prereqs": [
-      "VisibleCombatLasers",
-      "PhasedArrayLasers",
-      "Project_FleetCombatants"
-   ],
-   "oneTimeGlobally": false,
-   "repeatable": false,
-   "factionAvailableChance": 100,
-   "initialUnlockChance": 0,
-   "deltaUnlockChance": 15,
-   "maxUnlockChance": 60,
-   "resourcesGranted": []
-},
- {
-   "friendlyName": "Light Green Phaser Cannon",
-   "dataName": "Project_240cmGreenPhaserCannon",
-   "techCategory": "MilitaryScience",
-   "AI_techRole": "SpaceWar",
-   "AI_projectRole": "EnergyWeapons",
-   "researchCost": 11250,
-   "prereqs": [
-      "VisibleCombatLasers",
-      "PhasedArrayLasers"
-   ],
-   "oneTimeGlobally": false,
-   "repeatable": false,
-   "factionAvailableChance": 100,
-   "initialUnlockChance": 0,
-   "deltaUnlockChance": 34,
-   "maxUnlockChance": 100,
-   "resourcesGranted": []
-},
- {
-   "friendlyName": "Medium Green Phaser Cannon",
-   "dataName": "Project_480cmGreenPhaserCannon",
-   "techCategory": "MilitaryScience",
-   "AI_techRole": "SpaceWar",
-   "AI_projectRole": "EnergyWeapons",
-   "researchCost": 13500,
-   "prereqs": [
-      "VisibleCombatLasers",
-      "PhasedArrayLasers",
-      "Project_PatrolVessels"
-   ],
-   "oneTimeGlobally": false,
-   "repeatable": false,
-   "factionAvailableChance": 100,
-   "initialUnlockChance": 0,
-   "deltaUnlockChance": 15,
-   "maxUnlockChance": 60,
-   "resourcesGranted": []
-},
- {
-   "friendlyName": "Heavy Green Phaser Cannon",
-   "dataName": "Project_720cmGreenPhaserCannon",
-   "techCategory": "MilitaryScience",
-   "AI_techRole": "SpaceWar",
-   "AI_projectRole": "EnergyWeapons",
-   "researchCost": 15750,
-   "prereqs": [
-      "VisibleCombatLasers",
-      "PhasedArrayLasers",
-      "Project_FleetCombatants"
-   ],
-   "oneTimeGlobally": false,
-   "repeatable": false,
-   "factionAvailableChance": 100,
-   "initialUnlockChance": 0,
-   "deltaUnlockChance": 15,
-   "maxUnlockChance": 60,
-   "resourcesGranted": []
-},
- {
-   "friendlyName": "Superheavy Green Phaser Cannon",
-   "dataName": "Project_960cmGreenPhaserCannon",
-   "techCategory": "MilitaryScience",
-   "AI_techRole": "SpaceWar",
-   "AI_projectRole": "EnergyWeapons",
-   "researchCost": 22500,
-   "prereqs": [
-      "VisibleCombatLasers",
-      "PhasedArrayLasers",
-      "Project_ShipsoftheLine"
-   ],
-   "oneTimeGlobally": false,
-   "repeatable": false,
-   "factionAvailableChance": 100,
-   "initialUnlockChance": 0,
-   "deltaUnlockChance": 15,
-   "maxUnlockChance": 60,
-   "resourcesGranted": []
-},
- {
-   "friendlyName": "Light UV Laser Batteries",
-   "dataName": "Project_60cmUVLaserBattery",
-   "techCategory": "MilitaryScience",
-   "AI_techRole": "SpaceWar",
-   "AI_projectRole": "EnergyWeapons",
-   "researchCost": 10000,
-   "prereqs": [
-      "UltravioletCombatLasers"
-   ],
-   "oneTimeGlobally": false,
-   "repeatable": false,
-   "factionAvailableChance": 100,
-   "initialUnlockChance": 50,
-   "deltaUnlockChance": 50,
-   "maxUnlockChance": 100,
-   "resourcesGranted": []
-},
- {
-   "friendlyName": "Medium UV Laser Batteries",
-   "dataName": "Project_120cmUVLaserBattery",
-   "techCategory": "MilitaryScience",
-   "AI_techRole": "SpaceWar",
-   "AI_projectRole": "EnergyWeapons",
-   "researchCost": 15000,
-   "prereqs": [
-      "UltravioletCombatLasers",
-      "Project_PatrolVessels"
-   ],
-   "oneTimeGlobally": false,
-   "repeatable": false,
-   "factionAvailableChance": 100,
-   "initialUnlockChance": 0,
-   "deltaUnlockChance": 34,
-   "maxUnlockChance": 100,
-   "resourcesGranted": []
-},
- {
-   "friendlyName": "Heavy UV Laser Batteries",
-   "dataName": "Project_360cmUVLaserBattery",
-   "techCategory": "MilitaryScience",
-   "AI_techRole": "SpaceWar",
-   "AI_projectRole": "EnergyWeapons",
-   "researchCost": 20000,
-   "prereqs": [
-      "UltravioletCombatLasers",
-      "Project_PatrolVessels",
-      "Project_FleetCombatants"
-   ],
-   "oneTimeGlobally": false,
-   "repeatable": false,
-   "factionAvailableChance": 100,
-   "initialUnlockChance": 0,
-   "deltaUnlockChance": 15,
-   "maxUnlockChance": 60,
-   "resourcesGranted": []
-},
- {
-   "friendlyName": "Light UV Laser Cannon",
-   "dataName": "Project_240cmUVLaserCannon",
-   "techCategory": "MilitaryScience",
-   "AI_techRole": "SpaceWar",
-   "AI_projectRole": "EnergyWeapons",
-   "researchCost": 10000,
-   "prereqs": [
-      "UltravioletCombatLasers"
-   ],
-   "oneTimeGlobally": false,
-   "repeatable": false,
-   "factionAvailableChance": 100,
-   "initialUnlockChance": 0,
-   "deltaUnlockChance": 34,
-   "maxUnlockChance": 100,
-   "resourcesGranted": []
-},
- {
-   "friendlyName": "Medium UV Laser Cannon",
-   "dataName": "Project_480cmUVLaserCannon",
-   "techCategory": "MilitaryScience",
-   "AI_techRole": "SpaceWar",
-   "AI_projectRole": "EnergyWeapons",
-   "researchCost": 15000,
-   "prereqs": [
-      "UltravioletCombatLasers",
-      "Project_PatrolVessels"
-   ],
-   "oneTimeGlobally": false,
-   "repeatable": false,
-   "factionAvailableChance": 100,
-   "initialUnlockChance": 0,
-   "deltaUnlockChance": 15,
-   "maxUnlockChance": 60,
-   "resourcesGranted": []
-},
- {
-   "friendlyName": "Heavy UV Laser Cannon",
-   "dataName": "Project_720cmUVLaserCannon",
-   "techCategory": "MilitaryScience",
-   "AI_techRole": "SpaceWar",
-   "AI_projectRole": "EnergyWeapons",
-   "researchCost": 20000,
-   "prereqs": [
-      "UltravioletCombatLasers",
-      "Project_PatrolVessels",
-      "Project_FleetCombatants"
-   ],
-   "oneTimeGlobally": false,
-   "repeatable": false,
-   "factionAvailableChance": 100,
-   "initialUnlockChance": 0,
-   "deltaUnlockChance": 15,
-   "maxUnlockChance": 60,
-   "resourcesGranted": []
-},
- {
-   "friendlyName": "Superheavy UV Laser Cannon",
-   "dataName": "Project_960cmUVLaserCannon",
-   "techCategory": "MilitaryScience",
-   "AI_techRole": "SpaceWar",
-   "AI_projectRole": "EnergyWeapons",
-   "researchCost": 15000,
-   "prereqs": [
-      "UltravioletCombatLasers",
-      "Project_PatrolVessels",
-      "Project_ShipsoftheLine"
-   ],
-   "oneTimeGlobally": false,
-   "repeatable": false,
-   "factionAvailableChance": 100,
-   "initialUnlockChance": 0,
-   "deltaUnlockChance": 15,
-   "maxUnlockChance": 60,
-   "resourcesGranted": []
-},
- {
-   "friendlyName": "Light UV Arc Laser Batteries",
-   "dataName": "Project_60cmUVArcLaserBattery",
-   "techCategory": "MilitaryScience",
-   "AI_techRole": "SpaceWar",
-   "AI_projectRole": "EnergyWeapons",
-   "researchCost": 15000,
-   "prereqs": [
-      "UltravioletCombatLasers",
-      "ArcLasers",
-      "Project_Exotics"
-   ],
-   "oneTimeGlobally": false,
-   "repeatable": false,
-   "factionAvailableChance": 100,
-   "initialUnlockChance": 50,
-   "deltaUnlockChance": 50,
-   "maxUnlockChance": 100,
-   "resourcesGranted": []
-},
- {
-   "friendlyName": "Medium UV Arc Laser Batteries",
-   "dataName": "Project_120cmUVArcLaserBattery",
-   "techCategory": "MilitaryScience",
-   "AI_techRole": "SpaceWar",
-   "AI_projectRole": "EnergyWeapons",
-   "researchCost": 22500,
-   "prereqs": [
-      "UltravioletCombatLasers",
-      "ArcLasers",
-      "Project_PatrolVessels",
-      "Project_Exotics"
-   ],
-   "oneTimeGlobally": false,
-   "repeatable": false,
-   "factionAvailableChance": 100,
-   "initialUnlockChance": 0,
-   "deltaUnlockChance": 34,
-   "maxUnlockChance": 100,
-   "resourcesGranted": []
-},
- {
-   "friendlyName": "Heavy UV Arc Laser Batteries",
-   "dataName": "Project_360cmUVArcLaserBattery",
-   "techCategory": "MilitaryScience",
-   "AI_techRole": "SpaceWar",
-   "AI_projectRole": "EnergyWeapons",
-   "researchCost": 30000,
-   "prereqs": [
-      "UltravioletCombatLasers",
-      "ArcLasers",
-      "Project_FleetCombatants",
-      "Project_Exotics"
-   ],
-   "oneTimeGlobally": false,
-   "repeatable": false,
-   "factionAvailableChance": 100,
-   "initialUnlockChance": 0,
-   "deltaUnlockChance": 15,
-   "maxUnlockChance": 60,
-   "resourcesGranted": []
-},
- {
-   "friendlyName": "Light UV Arc Laser Cannon",
-   "dataName": "Project_240cmUVArcLaserCannon",
-   "techCategory": "MilitaryScience",
-   "AI_techRole": "SpaceWar",
-   "AI_projectRole": "EnergyWeapons",
-   "researchCost": 15000,
-   "prereqs": [
-      "UltravioletCombatLasers",
-      "ArcLasers",
-      "Project_Exotics"
-   ],
-   "oneTimeGlobally": false,
-   "repeatable": false,
-   "factionAvailableChance": 100,
-   "initialUnlockChance": 0,
-   "deltaUnlockChance": 34,
-   "maxUnlockChance": 100,
-   "resourcesGranted": []
-},
- {
-   "friendlyName": "Medium UV Arc Laser Cannon",
-   "dataName": "Project_480cmUVArcLaserCannon",
-   "techCategory": "MilitaryScience",
-   "AI_techRole": "SpaceWar",
-   "AI_projectRole": "EnergyWeapons",
-   "researchCost": 22500,
-   "prereqs": [
-      "UltravioletCombatLasers",
-      "ArcLasers",
-      "Project_PatrolVessels",
-      "Project_Exotics"
-   ],
-   "oneTimeGlobally": false,
-   "repeatable": false,
-   "factionAvailableChance": 100,
-   "initialUnlockChance": 0,
-   "deltaUnlockChance": 15,
-   "maxUnlockChance": 60,
-   "resourcesGranted": []
-},
- {
-   "friendlyName": "Heavy UV Arc Laser Cannon",
-   "dataName": "Project_720cmUVArcLaserCannon",
-   "techCategory": "MilitaryScience",
-   "AI_techRole": "SpaceWar",
-   "AI_projectRole": "EnergyWeapons",
-   "researchCost": 30000,
-   "prereqs": [
-      "UltravioletCombatLasers",
-      "ArcLasers",
-      "Project_FleetCombatants",
-      "Project_Exotics"
-   ],
-   "oneTimeGlobally": false,
-   "repeatable": false,
-   "factionAvailableChance": 100,
-   "initialUnlockChance": 0,
-   "deltaUnlockChance": 15,
-   "maxUnlockChance": 60,
-   "resourcesGranted": []
-},
- {
-   "friendlyName": "Superheavy UV Arc Laser Cannon",
-   "dataName": "Project_960cmUVArcLaserCannon",
-   "techCategory": "MilitaryScience",
-   "AI_techRole": "SpaceWar",
-   "AI_projectRole": "EnergyWeapons",
-   "researchCost": 22500,
-   "prereqs": [
-      "UltravioletCombatLasers",
-      "ArcLasers",
-      "Project_ShipsoftheLine",
-      "Project_Exotics"
-   ],
-   "oneTimeGlobally": false,
-   "repeatable": false,
-   "factionAvailableChance": 100,
-   "initialUnlockChance": 0,
-   "deltaUnlockChance": 15,
-   "maxUnlockChance": 60,
-   "resourcesGranted": []
-},
- {
-   "friendlyName": "Light UV Phaser Batteries",
-   "dataName": "Project_60cmUVPhaserBattery",
-   "techCategory": "MilitaryScience",
-   "AI_techRole": "SpaceWar",
-   "AI_criticalTech": true,
-   "AI_projectRole": "EnergyWeapons",
-   "researchCost": 22500,
-   "prereqs": [
-      "UltravioletCombatLasers",
-      "PhasedArrayLasers",
-      "Project_ExoticHybridSystems",
-      "Project_ExoticHybridSystems"
-   ],
-   "oneTimeGlobally": false,
-   "repeatable": false,
-   "factionAvailableChance": 100,
-   "initialUnlockChance": 50,
-   "deltaUnlockChance": 50,
-   "maxUnlockChance": 100,
-   "resourcesGranted": []
-},
- {
-   "friendlyName": "Medium UV Phaser Batteries",
-   "dataName": "Project_120cmUVPhaserBattery",
-   "techCategory": "MilitaryScience",
-   "AI_techRole": "SpaceWar",
-   "AI_criticalTech": true,
-   "AI_projectRole": "EnergyWeapons",
-   "researchCost": 33750,
-   "prereqs": [
-      "UltravioletCombatLasers",
-      "PhasedArrayLasers",
-      "Project_PatrolVessels",
-      "Project_ExoticHybridSystems"
-   ],
-   "oneTimeGlobally": false,
-   "repeatable": false,
-   "factionAvailableChance": 100,
-   "initialUnlockChance": 0,
-   "deltaUnlockChance": 34,
-   "maxUnlockChance": 100,
-   "resourcesGranted": []
-},
- {
-   "friendlyName": "Heavy UV Phaser Batteries",
-   "dataName": "Project_360cmUVPhaserBattery",
-   "techCategory": "MilitaryScience",
-   "AI_techRole": "SpaceWar",
-   "AI_criticalTech": true,
-   "AI_projectRole": "EnergyWeapons",
-   "researchCost": 45000,
-   "prereqs": [
-      "UltravioletCombatLasers",
-      "PhasedArrayLasers",
-      "Project_FleetCombatants",
-      "Project_ExoticHybridSystems"
-   ],
-   "oneTimeGlobally": false,
-   "repeatable": false,
-   "factionAvailableChance": 100,
-   "initialUnlockChance": 0,
-   "deltaUnlockChance": 15,
-   "maxUnlockChance": 60,
-   "resourcesGranted": []
-},
- {
-   "friendlyName": "Light UV Phaser Cannon",
-   "dataName": "Project_240cmUVPhaserCannon",
-   "techCategory": "MilitaryScience",
-   "AI_techRole": "SpaceWar",
-   "AI_criticalTech": true,
-   "AI_projectRole": "EnergyWeapons",
-   "researchCost": 22500,
-   "prereqs": [
-      "UltravioletCombatLasers",
-      "PhasedArrayLasers",
-      "Project_ExoticHybridSystems",
-      "Project_ExoticHybridSystems"
-   ],
-   "oneTimeGlobally": false,
-   "repeatable": false,
-   "factionAvailableChance": 100,
-   "initialUnlockChance": 0,
-   "deltaUnlockChance": 15,
-   "maxUnlockChance": 60,
-   "resourcesGranted": []
-},
- {
-   "friendlyName": "Medium UV Phaser Cannon",
-   "dataName": "Project_480cmUVPhaserCannon",
-   "techCategory": "MilitaryScience",
-   "AI_techRole": "SpaceWar",
-   "AI_criticalTech": true,
-   "AI_projectRole": "EnergyWeapons",
-   "researchCost": 33750,
-   "prereqs": [
-      "UltravioletCombatLasers",
-      "PhasedArrayLasers",
-      "Project_PatrolVessels",
-      "Project_ExoticHybridSystems"
-   ],
-   "oneTimeGlobally": false,
-   "repeatable": false,
-   "factionAvailableChance": 100,
-   "initialUnlockChance": 0,
-   "deltaUnlockChance": 15,
-   "maxUnlockChance": 60,
-   "resourcesGranted": []
-},
- {
-   "friendlyName": "Heavy UV Phaser Cannon",
-   "dataName": "Project_720cmUVPhaserCannon",
-   "techCategory": "MilitaryScience",
-   "AI_techRole": "SpaceWar",
-   "AI_criticalTech": true,
-   "AI_projectRole": "EnergyWeapons",
-   "researchCost": 45000,
-   "prereqs": [
-      "UltravioletCombatLasers",
-      "PhasedArrayLasers",
-      "Project_FleetCombatants",
-      "Project_ExoticHybridSystems"
-   ],
-   "oneTimeGlobally": false,
-   "repeatable": false,
-   "factionAvailableChance": 100,
-   "initialUnlockChance": 0,
-   "deltaUnlockChance": 15,
-   "maxUnlockChance": 60,
-   "resourcesGranted": []
-},
- {
-   "friendlyName": "Superheavy UV Phaser Cannon",
-   "dataName": "Project_960cmUVPhaserCannon",
-   "techCategory": "MilitaryScience",
-   "AI_techRole": "SpaceWar",
-   "AI_criticalTech": true,
-   "AI_projectRole": "EnergyWeapons",
-   "researchCost": 33750,
-   "prereqs": [
-      "UltravioletCombatLasers",
-      "PhasedArrayLasers",
-      "Project_ShipsoftheLine",
-      "Project_ExoticHybridSystems"
-   ],
-   "oneTimeGlobally": false,
-   "repeatable": false,
-   "factionAvailableChance": 100,
-   "initialUnlockChance": 0,
-   "deltaUnlockChance": 15,
-   "maxUnlockChance": 60,
-   "resourcesGranted": []
-},
- {
-   "friendlyName": "Publicize Alien Threat",
-   "dataName": "Project_PublicizeAlienThreat",
-   "techCategory": "SocialScience",
-   "AI_techRole": "EarthPolitics",
-   "AI_projectRole": "Influence",
-   "researchCost": 500,
-   "prereqs": [
-      "WeAreNotAlone",
-      "Project_TheirOperations"
-   ],
-   "effects": [
-      "Effect_GlobalPropaganda"
-   ],
-   "oneTimeGlobally": false,
-   "repeatable": false,
-   "factionPrereq": [
-      "ResistCouncil",
-      "DestroyCouncil",
-      "EscapeCouncil"
-   ],
-   "factionAvailableChance": 100,
-   "initialUnlockChance": 25,
-   "deltaUnlockChance": 25,
-   "maxUnlockChance": 100,
-   "resourcesGranted": []
-},
- {
-   "friendlyName": "Global Listening Network",
-   "dataName": "Project_GlobalListeningNetwork",
-   "techCategory": "InformationScience",
-   "AI_techRole": "EarthPolitics",
-   "AI_projectRole": "PoliticalMissions",
-   "researchCost": 1000,
-   "prereqs": [
-      "PhotonicComputing",
-      "Project_TheirOperations"
-   ],
-   "effects": [
-      "Effect_GlobalListeningNetwork"
-   ],
-   "oneTimeGlobally": false,
-   "repeatable": false,
-   "factionAvailableChance": 100,
-   "initialUnlockChance": 25,
-   "deltaUnlockChance": 25,
-   "maxUnlockChance": 100,
-   "resourcesGranted": []
-},
- {
-   "friendlyName": "Space Tugs",
-   "dataName": "Project_SpaceTugs",
-   "techCategory": "Energy",
-   "AI_techRole": "SpaceDevelopment",
-   "AI_criticalTech": true,
-   "AI_projectRole": "Exploration",
-   "researchCost": 750,
-   "prereqs": [
-      "AdvancedChemicalRocketry"
-   ],
-   "effects": [
-      "Effect_SpaceTugs"
-   ],
-   "oneTimeGlobally": false,
-   "repeatable": false,
-   "factionAvailableChance": 60,
-   "initialUnlockChance": 0,
-   "deltaUnlockChance": 25,
-   "maxUnlockChance": 75,
-   "resourcesGranted": []
-},
- {
-   "friendlyName": "Solar Steamers",
-   "dataName": "Project_SolarSteamers",
-   "techCategory": "Energy",
-   "AI_techRole": "SpaceDevelopment",
-   "AI_criticalTech": true,
-   "AI_projectRole": "Exploration",
-   "researchCost": 1000,
-   "prereqs": [
-      "ElectrothermalPropulsion"
-   ],
-   "effects": [
-      "Effect_SolarSteamers"
-   ],
-   "oneTimeGlobally": false,
-   "repeatable": false,
-   "factionAvailableChance": 60,
-   "initialUnlockChance": 0,
-   "deltaUnlockChance": 25,
-   "maxUnlockChance": 75,
-   "resourcesGranted": []
-},
- {
-   "friendlyName": "Nuclear Freighters",
-   "dataName": "Project_NuclearFreighters",
-   "techCategory": "Energy",
-   "AI_techRole": "SpaceDevelopment",
-   "AI_criticalTech": true,
-   "AI_projectRole": "Exploration",
-   "researchCost": 2000,
-   "prereqs": [
-      "SolidCoreFissionSystems"
-   ],
-   "effects": [
-      "Effect_NuclearFreighters",
-      "Effect_NuclearRockets",
-      "Effect_HabNuclearFreighters"
-   ],
-   "oneTimeGlobally": false,
-   "repeatable": false,
-   "factionAvailableChance": 60,
-   "initialUnlockChance": 0,
-   "deltaUnlockChance": 20,
-   "maxUnlockChance": 60,
-   "resourcesGranted": []
-},
- {
-   "friendlyName": "High Thrust Probes",
-   "dataName": "Project_HighThrustProbes",
-   "techCategory": "Energy",
-   "AI_techRole": "SpaceDevelopment",
-   "AI_criticalTech": true,
-   "AI_projectRole": "Exploration",
-   "researchCost": 600,
-   "prereqs": [
-      "AdvancedChemicalRocketry"
-   ],
-   "effects": [
-      "Effect_FastProbes"
-   ],
-   "oneTimeGlobally": false,
-   "repeatable": false,
-   "factionAvailableChance": 60,
-   "initialUnlockChance": 0,
-   "deltaUnlockChance": 20,
-   "maxUnlockChance": 60,
-   "resourcesGranted": []
-},
- {
-   "friendlyName": "Clandestine Cells",
-   "dataName": "Project_ClandestineCells",
-   "techCategory": "SocialScience",
-   "AI_techRole": "EarthPolitics",
-   "AI_criticalTech": true,
-   "AI_projectRole": "Core",
-   "researchCost": 600,
-   "prereqs": [
-      "WeAreNotAlone"
-   ],
-   "effects": [
-      "Effect_IncreaseCouncilSize",
-      "Effect_ControlPointMaintenanceBonus10"
-   ],
-   "oneTimeGlobally": false,
-   "repeatable": false,
-   "factionAvailableChance": 100,
-   "initialUnlockChance": 60,
-   "deltaUnlockChance": 20,
-   "maxUnlockChance": 100,
+   "maxUnlockChance": 100,
    "resourcesGranted": []
 },
  {
@@ -11389,6 +10048,7 @@
    "dataName": "Project_NeuralEngineering",
    "techCategory": "InformationScience",
    "AI_techRole": "EarthPolitics",
+   "AI_criticalTech": true,
    "AI_projectRole": "Councilors",
    "researchCost": 5000,
    "prereqs": [
@@ -11408,6 +10068,7 @@
    "dataName": "Project_Cyborging",
    "techCategory": "InformationScience",
    "AI_techRole": "EarthPolitics",
+   "AI_criticalTech": true,
    "AI_projectRole": "Councilors",
    "researchCost": 15000,
    "prereqs": [
@@ -11474,7 +10135,7 @@
    "AI_projectRole": "Money",
    "researchCost": 2000,
    "prereqs": [
-      "AdministrationAlgorithms",
+      "WhiteCollarAutomation",
       "SpaceMiningandRefining"
    ],
    "effects": [
@@ -11649,7 +10310,7 @@
    "prereqs": [
       "AdvancedChemicalRocketry",
       "ArrivalEconomics",
-      "AdministrationAlgorithms"
+      "AppliedArtificialIntelligence"
    ],
    "effects": [
       "Effect_SpaceflightProgramPriorityBonus50"
@@ -11671,8 +10332,7 @@
    "AI_projectRole": "MissionControl",
    "researchCost": 1200,
    "prereqs": [
-      "AdministrationAlgorithms",
-      "QuantumEncryption",
+      "WhiteCollarAutomation",
       "SpaceCommerce"
    ],
    "effects": [
@@ -11847,7 +10507,7 @@
    "AI_techRole": "SpaceWar",
    "AI_criticalTech": true,
    "AI_projectRole": "Fleet",
-   "researchCost": 1500,
+   "researchCost": 5000,
    "prereqs": [
       "ImprovedShipbuildingTechniques",
       "SelfRepairingSoftware"
@@ -11927,6 +10587,7 @@
    "dataName": "Project_CorridorDiplomacy",
    "techCategory": "SocialScience",
    "AI_techRole": "EarthPolitics",
+   "AI_criticalTech": true,
    "AI_projectRole": "ExpandNation",
    "researchCost": 1000,
    "prereqs": [
@@ -11949,6 +10610,7 @@
    "dataName": "Project_CommonCause",
    "techCategory": "SocialScience",
    "AI_techRole": "EarthPolitics",
+   "AI_criticalTech": true,
    "AI_projectRole": "ExpandNation",
    "researchCost": 2000,
    "prereqs": [
@@ -11974,6 +10636,7 @@
    "dataName": "Project_UnitedEffort",
    "techCategory": "SocialScience",
    "AI_techRole": "EarthPolitics",
+   "AI_criticalTech": true,
    "AI_projectRole": "ExpandNation",
    "researchCost": 3000,
    "prereqs": [
@@ -11998,8 +10661,7 @@
    "dataName": "Project_ExecutiveProtection",
    "techCategory": "Xenology",
    "AI_techRole": "EarthPolitics",
-   "AI_criticalTech": true,
-   "AI_projectRole": "Xenology",
+   "AI_projectRole": "AlienMissionDefense",
    "researchCost": 5000,
    "prereqs": [
       "Project_Pherocytes",
@@ -12029,8 +10691,7 @@
    "dataName": "Project_SecurityMeasures",
    "techCategory": "Xenology",
    "AI_techRole": "EarthPolitics",
-   "AI_criticalTech": true,
-   "AI_projectRole": "Xenology",
+   "AI_projectRole": "AlienMissionDefense",
    "researchCost": 5000,
    "prereqs": [
       "Project_TheirOperations",
@@ -12175,7 +10836,7 @@
  {
    "friendlyName": "Singleton Viruses",
    "dataName": "Project_SingletonViruses",
-   "techCategory": "SocialScience",
+   "techCategory": "LifeScience",
    "AI_techRole": "EarthPolitics",
    "AI_projectRole": "Councilors",
    "researchCost": 10000,
@@ -12196,7 +10857,7 @@
  {
    "friendlyName": "Idea Viruses",
    "dataName": "Project_IdeaViruses",
-   "techCategory": "SocialScience",
+   "techCategory": "Xenology",
    "AI_techRole": "EarthPolitics",
    "AI_projectRole": "Councilors",
    "researchCost": 10000,
@@ -12233,7 +10894,8 @@
    ],
    "effects": [
       "Effect_ControlAssetDefense",
-      "Effect_IncreaseInspireAttack"
+      "Effect_IncreaseInspireAttack",
+      "Effect_ControlPointMaintenanceBonus10"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
@@ -12385,8 +11047,7 @@
    "AI_projectRole": "TerrestrialWarfare",
    "researchCost": 10000,
    "prereqs": [
-      "AdministrationAlgorithms",
-      "ArrivalSecurity",
+      "NetworkedGlobalDefense",
       "Project_CounterinsurgencyOperations",
       "Project_Psyops"
    ],
@@ -12526,7 +11187,7 @@
    "researchCost": 2500,
    "prereqs": [
       "IndustrializationofSpace",
-      "AdministrationAlgorithms"
+      "WhiteCollarAutomation"
    ],
    "effects": [
       "Effect_DummyTooltipDevolvedSpaceCommand1",
@@ -12678,7 +11339,7 @@
    "AI_techRole": "SpaceDevelopment",
    "AI_criticalTech": true,
    "AI_projectRole": "SpaceResources",
-   "researchCost": 20000,
+   "researchCost": 10000,
    "prereqs": [
       "Project_ProxySupportChannel",
       "SpaceCommerce",
@@ -12995,7 +11656,7 @@
    "techCategory": "MilitaryScience",
    "AI_techRole": "EarthPolitics",
    "AI_projectRole": "TerrestrialWarfare",
-   "researchCost": 10000,
+   "researchCost": 5000,
    "prereqs": [
       "TerrestrialMilitaryScience",
       "AdvancedNeuralNetworks"
@@ -13018,7 +11679,7 @@
    "techCategory": "MilitaryScience",
    "AI_techRole": "EarthPolitics",
    "AI_projectRole": "TerrestrialWarfare",
-   "researchCost": 10000,
+   "researchCost": 5000,
    "prereqs": [
       "TerrestrialMilitaryScience"
    ],
@@ -13137,7 +11798,7 @@
    "techCategory": "Xenology",
    "AI_techRole": "EarthPolitics",
    "AI_projectRole": "Xenology",
-   "researchCost": 20000,
+   "researchCost": 10000,
    "prereqs": [
       "Biotechnology"
    ],
@@ -13526,7 +12187,7 @@
    "researchCost": 15000,
    "prereqs": [
       "SpaceMiningandRefining",
-      "AdministrationAlgorithms"
+      "AppliedArtificialIntelligence"
    ],
    "effects": [
       "Effect_MiningMetalsBonus"
@@ -13540,11 +12201,10 @@
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Molecular Beneficiation",
+   "friendlyName": "Molecular Benefication",
    "dataName": "Project_MolecularBenefication",
    "techCategory": "Materials",
    "AI_techRole": "SpaceDevelopment",
-   "AI_criticalTech": true,
    "AI_projectRole": "SpaceResources",
    "researchCost": 20000,
    "prereqs": [
@@ -13571,7 +12231,8 @@
    "researchCost": 20000,
    "prereqs": [
       "SpaceMiningandRefining",
-      "AdministrationAlgorithms"
+      "MolecularAssemblers",
+      "AppliedArtificialIntelligence"
    ],
    "effects": [
       "Effect_MiningFissilesBonus"
@@ -13684,9 +12345,8 @@
       "ArrivalInternationalDevelopment"
    ],
    "effects": [
-      "Effect_EconomyPriorityBonus05",
-      "Effect_Economy_CO2_ppm50",
-      "Effect_Economy_CH4_ppm"
+      "Effect_EconomyPriorityBonus1",
+      "Effect_WelfarePriorityBonus05"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
@@ -13702,7 +12362,7 @@
    "techCategory": "InformationScience",
    "AI_techRole": "EarthPolitics",
    "AI_projectRole": "DevelopNation",
-   "researchCost": 15000,
+   "researchCost": 10000,
    "prereqs": [
       "AdministrationAlgorithms",
       "ArrivalEconomics"
@@ -13748,7 +12408,7 @@
    "techCategory": "InformationScience",
    "AI_techRole": "EarthPolitics",
    "AI_projectRole": "DevelopNation",
-   "researchCost": 25000,
+   "researchCost": 10000,
    "prereqs": [
       "QuantumComputing",
       "SpaceCommerce"
@@ -13798,7 +12458,7 @@
    "techCategory": "Materials",
    "AI_techRole": "EarthPolitics",
    "AI_projectRole": "DevelopNation",
-   "researchCost": 50000,
+   "researchCost": 10000,
    "prereqs": [
       "MolecularAssemblers",
       "ArrivalInternationalDevelopment",
@@ -13822,14 +12482,13 @@
    "techCategory": "Materials",
    "AI_techRole": "EarthPolitics",
    "AI_projectRole": "DevelopNation",
-   "researchCost": 15000,
+   "researchCost": 10000,
    "prereqs": [
       "ArrivalInternationalDevelopment",
       "Project_QuantumBattery"
    ],
    "effects": [
-      "Effect_WelfarePriorityBonus05",
-      "Effect_Economy_CO2_ppm90"
+      "Effect_WelfarePriorityBonus05"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
@@ -13845,7 +12504,7 @@
    "techCategory": "LifeScience",
    "AI_techRole": "EarthPolitics",
    "AI_projectRole": "DevelopNation",
-   "researchCost": 50000,
+   "researchCost": 5000,
    "prereqs": [
       "ClimateChangeMitigation"
    ],
@@ -13866,7 +12525,7 @@
    "techCategory": "LifeScience",
    "AI_techRole": "EarthPolitics",
    "AI_projectRole": "DevelopNation",
-   "researchCost": 30000,
+   "researchCost": 5000,
    "prereqs": [
       "DesignerLifeforms"
    ],
@@ -13887,7 +12546,7 @@
    "techCategory": "InformationScience",
    "AI_techRole": "EarthPolitics",
    "AI_projectRole": "DevelopNation",
-   "researchCost": 20000,
+   "researchCost": 5000,
    "prereqs": [
       "QuantumComputing",
       "Project_TheirComputers"
@@ -13911,8 +12570,7 @@
    "AI_projectRole": "DevelopNation",
    "researchCost": 10000,
    "prereqs": [
-      "WhiteCollarAutomation",
-      "ArrivalInternationalDevelopment"
+      "WhiteCollarAutomation"
    ],
    "effects": [
       "Effect_WelfarePriorityBonus05"
@@ -14021,7 +12679,7 @@
    "techCategory": "Materials",
    "AI_techRole": "EarthPolitics",
    "AI_projectRole": "TerrestrialWarfare",
-   "researchCost": 20000,
+   "researchCost": 10000,
    "prereqs": [
       "TerrestrialMilitaryScience",
       "MolecularAssemblers",
@@ -14045,7 +12703,7 @@
    "techCategory": "MilitaryScience",
    "AI_techRole": "EarthPolitics",
    "AI_projectRole": "TerrestrialWarfare",
-   "researchCost": 30000,
+   "researchCost": 10000,
    "prereqs": [
       "TransInterfaceWarfare",
       "Project_Warships"
@@ -14068,10 +12726,10 @@
    "techCategory": "InformationScience",
    "AI_techRole": "EarthPolitics",
    "AI_projectRole": "TerrestrialWarfare",
-   "researchCost": 30000,
+   "researchCost": 20000,
    "prereqs": [
-      "WhiteCollarAutomation",
-      "TerrestrialMilitaryScience"
+      "TerrestrialMilitaryScience",
+      "WhiteCollarAutomation"
    ],
    "effects": [
       "Effect_ArmyHealingRate005",
@@ -14114,10 +12772,10 @@
    "techCategory": "MilitaryScience",
    "AI_techRole": "EarthPolitics",
    "AI_projectRole": "TerrestrialWarfare",
-   "researchCost": 25000,
+   "researchCost": 5000,
    "prereqs": [
-      "SelfRepairingSoftware",
       "TerrestrialMilitaryScience",
+      "SelfRepairingSoftware",
       "Project_TheirRobotics"
    ],
    "effects": [
@@ -14138,7 +12796,7 @@
    "techCategory": "MilitaryScience",
    "AI_techRole": "EarthPolitics",
    "AI_projectRole": "TerrestrialWarfare",
-   "researchCost": 20000,
+   "researchCost": 5000,
    "prereqs": [
       "TerrestrialMilitaryScience",
       "WhiteCollarAutomation",
@@ -14184,7 +12842,7 @@
    "techCategory": "MilitaryScience",
    "AI_techRole": "EarthPolitics",
    "AI_projectRole": "TerrestrialWarfare",
-   "researchCost": 20000,
+   "researchCost": 5000,
    "prereqs": [
       "NetworkedGlobalDefense",
       "MolecularAssemblers",
@@ -14262,7 +12920,7 @@
    "techCategory": "MilitaryScience",
    "AI_techRole": "EarthPolitics",
    "AI_projectRole": "TerrestrialWarfare",
-   "researchCost": 10000,
+   "researchCost": 5000,
    "prereqs": [
       "TransInterfaceWarfare"
    ],
@@ -14463,8 +13121,7 @@
    "dataName": "Project_PherocyteScanners",
    "techCategory": "Xenology",
    "AI_techRole": "EarthPolitics",
-   "AI_criticalTech": true,   
-   "AI_projectRole": "Xenology",
+   "AI_projectRole": "AlienMissionDefense",
    "researchCost": 10000,
    "prereqs": [
       "MolecularAssemblers",
@@ -14494,9 +13151,8 @@
    "friendlyName": "Pherocyte Decon Operations",
    "dataName": "Project_PherocyteDeconOperations",
    "techCategory": "Xenology",
-   "AI_criticalTech": true,   
    "AI_techRole": "EarthPolitics",
-   "AI_projectRole": "Xenology",
+   "AI_projectRole": "AlienMissionDefense",
    "researchCost": 25000,
    "prereqs": [
       "DesignerLifeforms",
@@ -14528,8 +13184,7 @@
    "dataName": "Project_PherocyteInoculations",
    "techCategory": "Xenology",
    "AI_techRole": "EarthPolitics",
-   "AI_projectRole": "Xenology",
-   "AI_criticalTech": true,   
+   "AI_projectRole": "AlienMissionDefense",
    "researchCost": 35000,
    "prereqs": [
       "TransformPhages",
@@ -14680,7 +13335,7 @@
    ],
    "effects": [
       "Effect_CorruptionReduction20",
-      "Effect_ControlPointMaintenanceBonus10"
+      "Effect_ControlPointMaintenanceBonus20"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
@@ -14725,7 +13380,6 @@
    "dataName": "Project_Pherocyte-EnhancedInterrogations",
    "techCategory": "Xenology",
    "AI_techRole": "EarthPolitics",
-   "AI_criticalTech": true,
    "AI_projectRole": "PoliticalMissions",
    "researchCost": 8000,
    "prereqs": [
@@ -14753,6 +13407,7 @@
    "dataName": "Project_ECM1",
    "techCategory": "InformationScience",
    "AI_techRole": "SpaceWar",
+   "AI_criticalTech": true,
    "AI_projectRole": "Armor",
    "researchCost": 500,
    "prereqs": [
@@ -14771,6 +13426,7 @@
    "dataName": "Project_ECM2",
    "techCategory": "InformationScience",
    "AI_techRole": "SpaceWar",
+   "AI_criticalTech": true,
    "AI_projectRole": "Armor",
    "researchCost": 3000,
    "prereqs": [
@@ -14796,7 +13452,7 @@
    "researchCost": 10000,
    "prereqs": [
       "AdvancedMissileWarfareDoctrine",
-      "QuantumComputing",
+      "QuantumEncryption",
       "Project_ECM2"
    ],
    "oneTimeGlobally": false,
@@ -14844,6 +13500,7 @@
    "dataName": "Project_StrategicDeception",
    "techCategory": "Xenology",
    "AI_techRole": "SpaceWar",
+   "AI_criticalTech": true,
    "AI_projectRole": "Xenology",
    "researchCost": 10000,
    "prereqs": [
@@ -14860,7 +13517,8 @@
       "ResistCouncil",
       "ExploitCouncil",
       "CooperateCouncil",
-      "EscapeCouncil"
+      "EscapeCouncil",
+      "AppeaseCouncil"
    ],
    "factionAvailableChance": 100,
    "initialUnlockChance": 0,
@@ -14873,8 +13531,9 @@
    "dataName": "Project_OperationalMisdirection",
    "techCategory": "Xenology",
    "AI_techRole": "SpaceWar",
+   "AI_criticalTech": true,
    "AI_projectRole": "Xenology",
-   "researchCost": 15000,
+   "researchCost": 20000,
    "prereqs": [
       "FleetLogistics",
       "Project_StrategicDeception"
@@ -14889,7 +13548,8 @@
       "ResistCouncil",
       "ExploitCouncil",
       "CooperateCouncil",
-      "EscapeCouncil"
+      "EscapeCouncil",
+      "AppeaseCouncil"
    ],
    "factionAvailableChance": 50,
    "factionAlways": "ResistCouncil",
@@ -14903,8 +13563,9 @@
    "dataName": "Project_Maskirovka",
    "techCategory": "Xenology",
    "AI_techRole": "SpaceWar",
+   "AI_criticalTech": true,
    "AI_projectRole": "Xenology",
-   "researchCost": 20000,
+   "researchCost": 15000,
    "prereqs": [
       "QuantumEncryption",
       "Project_StrategicDeception",
@@ -14920,7 +13581,8 @@
       "ResistCouncil",
       "ExploitCouncil",
       "CooperateCouncil",
-      "EscapeCouncil"
+      "EscapeCouncil",
+      "AppeaseCouncil"
    ],
    "factionAvailableChance": 50,
    "factionAlways": "ExploitCouncil",
@@ -14934,8 +13596,7 @@
    "dataName": "Project_RegionalSecuritySweeps",
    "techCategory": "Xenology",
    "AI_techRole": "EarthPolitics",
-   "AI_criticalTech": true,   
-   "AI_projectRole": "Xenology",
+   "AI_projectRole": "AlienMissionDefense",
    "researchCost": 20000,
    "prereqs": [
       "NetworkedGlobalDefense",
@@ -14968,8 +13629,7 @@
    "dataName": "Project_PherocyteQuarantineProtocols",
    "techCategory": "Xenology",
    "AI_techRole": "EarthPolitics",
-   "AI_criticalTech": true,   
-   "AI_projectRole": "Xenology",
+   "AI_projectRole": "AlienMissionDefense",
    "researchCost": 10000,
    "prereqs": [
       "PredictiveGenetics",
@@ -15000,16 +13660,16 @@
    "dataName": "Project_PolicymakerBehaviorialAnalysis",
    "techCategory": "Xenology",
    "AI_techRole": "EarthPolitics",
-   "AI_criticalTech": true,   
-   "AI_projectRole": "Xenology",
+   "AI_projectRole": "AlienMissionDefense",
    "researchCost": 20000,
    "prereqs": [
       "ArrivalGovernance",
-      "AppliedArtificialIntelligence",
+      "WhiteCollarAutomation",
       "Project_Pherocytes"
    ],
    "effects": [
-      "Effect_EnthrallElitesDefense"
+      "Effect_EnthrallElitesDefense",
+      "Effect_ControlPointMaintenanceBonus20"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
@@ -15032,8 +13692,7 @@
    "dataName": "Project_AdvancedXenologicalMonitoring",
    "techCategory": "Xenology",
    "AI_techRole": "EarthPolitics",
-   "AI_criticalTech": true,  
-   "AI_projectRole": "Xenology",
+   "AI_projectRole": "AlienMissionDefense",
    "researchCost": 20000,
    "prereqs": [
       "AdministrationAlgorithms",
@@ -15067,8 +13726,7 @@
    "dataName": "Project_PredictiveAbductionModeling",
    "techCategory": "Xenology",
    "AI_techRole": "EarthPolitics",
-   "AI_projectRole": "Xenology",
-   "AI_criticalTech": true,   
+   "AI_projectRole": "AlienMissionDefense",
    "researchCost": 20000,
    "prereqs": [
       "WhiteCollarAutomation",
@@ -15100,7 +13758,7 @@
    "dataName": "Project_Hunter-KillerTacticalUnits",
    "techCategory": "Xenology",
    "AI_techRole": "EarthPolitics",
-   "AI_projectRole": "Xenology",
+   "AI_projectRole": "AlienMissionDefense",
    "researchCost": 20000,
    "prereqs": [
       "NetworkedGlobalDefense",
@@ -15133,8 +13791,7 @@
    "dataName": "Project_PherocyteExposureNetworkTracing",
    "techCategory": "Xenology",
    "AI_techRole": "EarthPolitics",
-   "AI_criticalTech": true,   
-   "AI_projectRole": "Xenology",
+   "AI_projectRole": "AlienMissionDefense",
    "researchCost": 20000,
    "prereqs": [
       "WhiteCollarAutomation",
@@ -15165,8 +13822,7 @@
    "dataName": "Project_AlienRedTeaming",
    "techCategory": "Xenology",
    "AI_techRole": "EarthPolitics",
-   "AI_projectRole": "Xenology",
-   "AI_criticalTech": true,   
+   "AI_projectRole": "AlienMissionDefense",
    "researchCost": 15000,
    "prereqs": [
       "MindandMachine",
@@ -15197,8 +13853,7 @@
    "dataName": "Project_PublicBehaviorialMonitoring",
    "techCategory": "Xenology",
    "AI_techRole": "EarthPolitics",
-   "AI_criticalTech": true,   
-   "AI_projectRole": "Xenology",
+   "AI_projectRole": "AlienMissionDefense",
    "researchCost": 30000,
    "prereqs": [
       "ArrivalCulture",
@@ -15230,8 +13885,7 @@
    "dataName": "Project_CommunityPolicingDrones",
    "techCategory": "Xenology",
    "AI_techRole": "EarthPolitics",
-   "AI_criticalTech": true,   
-   "AI_projectRole": "Xenology",
+   "AI_projectRole": "AlienMissionDefense",
    "researchCost": 20000,
    "prereqs": [
       "NextGenerationAerospace",
@@ -15264,8 +13918,7 @@
    "dataName": "Project_PherocyteLiabilityTheory",
    "techCategory": "Xenology",
    "AI_techRole": "EarthPolitics",
-   "AI_criticalTech": true,   
-   "AI_projectRole": "Xenology",
+   "AI_projectRole": "AlienMissionDefense",
    "researchCost": 10000,
    "prereqs": [
       "ArrivalLaw",
@@ -15295,8 +13948,7 @@
    "dataName": "Project_SecurityAccountabilityChaining",
    "techCategory": "Xenology",
    "AI_techRole": "EarthPolitics",
-   "AI_projectRole": "Xenology",
-   "AI_criticalTech": true,  
+   "AI_projectRole": "AlienMissionDefense",
    "researchCost": 15000,
    "prereqs": [
       "ArrivalSecurity",
@@ -15315,20 +13967,248 @@
       "EscapeCouncil",
       "AppeaseCouncil"
    ],
-   "factionAvailableChance": 90,
-   "factionAlways": "DestroyCouncil",
-   "initialUnlockChance": 20,
+   "factionAvailableChance": 90,
+   "factionAlways": "DestroyCouncil",
+   "initialUnlockChance": 20,
+   "deltaUnlockChance": 5,
+   "maxUnlockChance": 50,
+   "resourcesGranted": []
+},
+ {
+   "friendlyName": "Patagonia Independence Movement",
+   "dataName": "Project_PatagoniaIndependenceMovement",
+   "techCategory": "SocialScience",
+   "AI_techRole": "EarthPolitics",
+   "AI_projectRole": "NeutralizeNation",
+   "researchCost": 250,
+   "prereqs": [
+      "IndependenceMovements"
+   ],
+   "oneTimeGlobally": true,
+   "repeatable": false,
+   "factionAvailableChance": 100,
+   "initialUnlockChance": 0,
+   "deltaUnlockChance": 5,
+   "maxUnlockChance": 10,
+   "resourcesGranted": []
+},
+ {
+   "friendlyName": "Network Intrusion Protocols",
+   "dataName": "Project_NetworkIntrusionProtocols",
+   "techCategory": "InformationScience",
+   "AI_techRole": "EarthPolitics",
+   "AI_projectRole": "Research",
+   "researchCost": 15000,
+   "prereqs": [
+      "AppliedArtificialIntelligence",
+      "NetworkedGlobalDefense"
+   ],
+   "effects": [
+      "Effect_HackProject_Steal",
+      "Effect_HackProject_Sabotage"
+   ],
+   "oneTimeGlobally": false,
+   "repeatable": false,
+   "factionAvailableChance": 50,
+   "factionAlways": "ExploitCouncil",
+   "initialUnlockChance": 20,
+   "deltaUnlockChance": 10,
+   "maxUnlockChance": 100,
+   "resourcesGranted": []
+},
+ {
+   "friendlyName": "Hungarian Irredentism",
+   "dataName": "Project_HungarianIrredentism",
+   "techCategory": "SocialScience",
+   "AI_techRole": "EarthPolitics",
+   "AI_projectRole": "ExpandNation",
+   "researchCost": 1000,
+   "prereqs": [
+      "UnityMovements"
+   ],
+   "oneTimeGlobally": true,
+   "repeatable": false,
+   "requiresNation": "HUN",
+   "factionAvailableChance": 100,
+   "initialUnlockChance": 0,
+   "deltaUnlockChance": 5,
+   "maxUnlockChance": 50,
+   "resourcesGranted": []
+},
+ {
+   "friendlyName": "A Period of Unity",
+   "dataName": "Project_APeriodofUnity",
+   "techCategory": "SocialScience",
+   "AI_techRole": "EarthPolitics",
+   "AI_projectRole": "ExpandNation",
+   "researchCost": 1000,
+   "prereqs": [
+      "UnityMovements"
+   ],
+   "oneTimeGlobally": true,
+   "repeatable": false,
+   "requiresNation": "VNM",
+   "factionAvailableChance": 100,
+   "initialUnlockChance": 10,
+   "deltaUnlockChance": 10,
+   "maxUnlockChance": 50,
+   "resourcesGranted": []
+},
+ {
+   "friendlyName": "Central Asian Union",
+   "dataName": "Project_CentralAsianUnion",
+   "techCategory": "SocialScience",
+   "AI_techRole": "EarthPolitics",
+   "AI_projectRole": "ExpandNation",
+   "researchCost": 1000,
+   "prereqs": [
+      "UnityMovements"
+   ],
+   "oneTimeGlobally": true,
+   "repeatable": false,
+   "requiresNation": "KAZ",
+   "factionAvailableChance": 100,
+   "initialUnlockChance": 10,
+   "deltaUnlockChance": 10,
+   "maxUnlockChance": 90,
+   "resourcesGranted": []
+},
+ {
+   "friendlyName": "Maglev Trains",
+   "dataName": "Project_MaglevTrains",
+   "techCategory": "Materials",
+   "AI_techRole": "EarthPolitics",
+   "AI_projectRole": "DevelopNation",
+   "researchCost": 15000,
+   "prereqs": [
+      "SuperconductingMagnets"
+   ],
+   "effects": [
+      "Effect_EconomyPriorityBonus05"
+   ],
+   "oneTimeGlobally": false,
+   "repeatable": false,
+   "factionAvailableChance": 40,
+   "initialUnlockChance": 5,
+   "deltaUnlockChance": 5,
+   "maxUnlockChance": 80,
+   "resourcesGranted": []
+},
+ {
+   "friendlyName": "Self-driving vehicles",
+   "dataName": "Project_SelfDrivingVehicles",
+   "techCategory": "InformationScience",
+   "AI_techRole": "EarthPolitics",
+   "AI_projectRole": "DevelopNation",
+   "researchCost": 8000,
+   "prereqs": [
+      "AdvancedNeuralNetworks"
+   ],
+   "effects": [
+      "Effect_EconomyPriorityBonus05"
+   ],
+   "oneTimeGlobally": false,
+   "repeatable": false,
+   "factionAvailableChance": 50,
+   "initialUnlockChance": 5,
+   "deltaUnlockChance": 5,
+   "maxUnlockChance": 80,
+   "resourcesGranted": []
+},
+ {
+   "friendlyName": "Spartans",
+   "dataName": "Project_Spartans",
+   "techCategory": "MilitaryScience",
+   "AI_techRole": "SpaceWar",
+   "AI_projectRole": "Marines",
+   "researchCost": 10000,
+   "prereqs": [
+      "Project_EliteMarineAssaultUnit",
+      "Project_DestroyVictory",
+      "Project_CadreDevelopmentPrograms"
+   ],
+   "oneTimeGlobally": false,
+   "repeatable": false,
+   "factionPrereq": [
+      "DestroyCouncil"
+   ],
+   "factionAvailableChance": 100,
+   "initialUnlockChance": 20,
+   "deltaUnlockChance": 5,
+   "maxUnlockChance": 100,
+   "resourcesGranted": []
+},
+ {
+   "friendlyName": "Rangers",
+   "dataName": "Project_Rangers",
+   "techCategory": "MilitaryScience",
+   "AI_techRole": "SpaceWar",
+   "AI_projectRole": "Marines",
+   "researchCost": 10000,
+   "prereqs": [
+      "Project_EliteMarineAssaultUnit",
+      "Project_ResistVictory",
+      "Project_GuerrillaWarfare"
+   ],
+   "oneTimeGlobally": false,
+   "repeatable": false,
+   "factionPrereq": [
+      "ResistCouncil"
+   ],
+   "factionAvailableChance": 100,
+   "initialUnlockChance": 20,
+   "deltaUnlockChance": 5,
+   "maxUnlockChance": 100,
+   "resourcesGranted": []
+},
+ {
+   "friendlyName": "Immortals",
+   "dataName": "Project_Immortals",
+   "techCategory": "MilitaryScience",
+   "AI_techRole": "SpaceWar",
+   "AI_projectRole": "Marines",
+   "researchCost": 10000,
+   "prereqs": [
+      "Project_EliteMarineAssaultUnit",
+      "Project_SubmitVictory",
+      "Project_LoyaltyTraining"
+   ],
+   "oneTimeGlobally": false,
+   "repeatable": false,
+   "factionPrereq": [
+      "SubmitCouncil"
+   ],
+   "factionAvailableChance": 100,
+   "initialUnlockChance": 20,
+   "deltaUnlockChance": 5,
+   "maxUnlockChance": 100,
+   "resourcesGranted": []
+},
+ {
+   "friendlyName": "Mexican Liberation Movements",
+   "dataName": "Project_MexicanLiberationMovements",
+   "techCategory": "SocialScience",
+   "AI_techRole": "EarthPolitics",
+   "AI_projectRole": "NeutralizeNation",
+   "researchCost": 500,
+   "prereqs": [
+      "IndependenceMovements"
+   ],
+   "oneTimeGlobally": true,
+   "repeatable": false,
+   "factionAvailableChance": 100,
+   "initialUnlockChance": 0,
    "deltaUnlockChance": 5,
    "maxUnlockChance": 50,
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Patagonia Independence Movement",
-   "dataName": "Project_PatagoniaIndependenceMovement",
+   "friendlyName": "Nubian Awakening",
+   "dataName": "Project_NubianAwakening",
    "techCategory": "SocialScience",
    "AI_techRole": "EarthPolitics",
    "AI_projectRole": "NeutralizeNation",
-   "researchCost": 250,
+   "researchCost": 500,
    "prereqs": [
       "IndependenceMovements"
    ],
@@ -15337,36 +14217,49 @@
    "factionAvailableChance": 100,
    "initialUnlockChance": 0,
    "deltaUnlockChance": 5,
-   "maxUnlockChance": 10,
+   "maxUnlockChance": 50,
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Network Intrusion Protocols",
-   "dataName": "Project_NetworkIntrusionProtocols",
-   "techCategory": "InformationScience",
+   "friendlyName": "Iranian Separatism",
+   "dataName": "Project_IranianSeparatism",
+   "techCategory": "SocialScience",
    "AI_techRole": "EarthPolitics",
-   "AI_projectRole": "Research",
-   "researchCost": 15000,
+   "AI_projectRole": "NeutralizeNation",
+   "researchCost": 500,
    "prereqs": [
-      "AppliedArtificialIntelligence",
-      "NetworkedGlobalDefense"
+      "IndependenceMovements"
    ],
-   "effects": [
-      "Effect_HackProject_Steal",
-      "Effect_HackProject_Sabotage"
+   "oneTimeGlobally": true,
+   "repeatable": false,
+   "factionAvailableChance": 100,
+   "initialUnlockChance": 0,
+   "deltaUnlockChance": 5,
+   "maxUnlockChance": 50,
+   "resourcesGranted": []
+},
+ {
+   "friendlyName": "40mmAutocannon",
+   "dataName": "Project_40mmAutocannon",
+   "techCategory": "MilitaryScience",
+   "AI_techRole": "SpaceWar",
+   "AI_criticalTech": true,
+   "AI_projectRole": "Kinetics",
+   "researchCost": 250,
+   "prereqs": [
+      "Project_Warships"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
-   "factionAvailableChance": 50,
-   "factionAlways": "ExploitCouncil",
-   "initialUnlockChance": 20,
+   "factionAvailableChance": 100,
+   "initialUnlockChance": 0,
    "deltaUnlockChance": 10,
    "maxUnlockChance": 100,
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Hungarian Irredentism",
-   "dataName": "Project_HungarianIrredentism",
+   "friendlyName": "Steward of the Amazon",
+   "dataName": "Project_StewardoftheAmazon",
    "techCategory": "SocialScience",
    "AI_techRole": "EarthPolitics",
    "AI_projectRole": "ExpandNation",
@@ -15376,6 +14269,7 @@
    ],
    "oneTimeGlobally": true,
    "repeatable": false,
+   "requiresNation": "BRA",
    "factionAvailableChance": 100,
    "initialUnlockChance": 0,
    "deltaUnlockChance": 5,
@@ -15383,150 +14277,225 @@
    "resourcesGranted": []
 },
  {
-   "friendlyName": "A Period of Unity",
-   "dataName": "Project_APeriodofUnity",
-   "techCategory": "SocialScience",
-   "AI_techRole": "EarthPolitics",
-   "AI_projectRole": "ExpandNation",
-   "researchCost": 1000,
+   "friendlyName": "Flag Bridge",
+   "dataName": "Project_FlagBridge",
+   "techCategory": "MilitaryScience",
+   "AI_techRole": "SpaceWar",
+   "AI_projectRole": "Fleet",
+   "researchCost": 5000,
    "prereqs": [
-      "UnityMovements"
+      "SpaceNavies",
+      "Project_PatrolVessels"
    ],
-   "oneTimeGlobally": true,
+   "oneTimeGlobally": false,
    "repeatable": false,
-   "requiresNation": "VNM",
    "factionAvailableChance": 100,
-   "initialUnlockChance": 10,
+   "initialUnlockChance": 0,
    "deltaUnlockChance": 10,
-   "maxUnlockChance": 50,
+   "maxUnlockChance": 70,
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Central Asian Union",
-   "dataName": "Project_CentralAsianUnion",
-   "techCategory": "SocialScience",
-   "AI_techRole": "EarthPolitics",
-   "AI_projectRole": "ExpandNation",
-   "researchCost": 1000,
+   "friendlyName": "Targeting Computer I",
+   "dataName": "Project_TargetingComputer1",
+   "techCategory": "InformationScience",
+   "AI_techRole": "SpaceWar",
+   "AI_criticalTech": true,
+   "AI_projectRole": "Fleet",
+   "researchCost": 500,
    "prereqs": [
-      "UnityMovements"
+      "PhotonicComputing",
+      "Project_Warships"
    ],
-   "oneTimeGlobally": true,
+   "effects": [
+      "Effect_TargetingComputer1"
+   ],
+   "oneTimeGlobally": false,
    "repeatable": false,
-   "requiresNation": "KAZ",
    "factionAvailableChance": 100,
-   "initialUnlockChance": 10,
+   "initialUnlockChance": 0,
    "deltaUnlockChance": 10,
-   "maxUnlockChance": 90,
+   "maxUnlockChance": 100,
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Maglev Trains",
-   "dataName": "Project_MaglevTrains",
-   "techCategory": "Materials",
-   "AI_techRole": "EarthPolitics",
-   "AI_projectRole": "DevelopNation",
-   "researchCost": 20000,
+   "friendlyName": "Targeting Computer II",
+   "dataName": "Project_TargetingComputer2",
+   "techCategory": "InformationScience",
+   "AI_techRole": "SpaceWar",
+   "AI_criticalTech": true,
+   "AI_projectRole": "Fleet",
+   "researchCost": 3000,
    "prereqs": [
-      "SuperconductingMagnets"
+      "QuantumComputing",
+      "Project_TargetingComputer1"
    ],
    "effects": [
-      "Effect_EconomyPriorityBonus05"
+      "Effect_TargetingComputer2"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
-   "factionAvailableChance": 40,
-   "initialUnlockChance": 5,
+   "factionAvailableChance": 100,
+   "initialUnlockChance": 0,
    "deltaUnlockChance": 5,
-   "maxUnlockChance": 80,
+   "maxUnlockChance": 95,
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Self-driving vehicles",
-   "dataName": "Project_SelfDrivingVehicles",
+   "friendlyName": "Targeting Computer III",
+   "dataName": "Project_TargetingComputer3",
    "techCategory": "InformationScience",
-   "AI_techRole": "EarthPolitics",
-   "AI_projectRole": "DevelopNation",
-   "researchCost": 8000,
+   "AI_techRole": "SpaceWar",
+   "AI_criticalTech": true,
+   "AI_projectRole": "Fleet",
+   "researchCost": 10000,
    "prereqs": [
-      "AdvancedNeuralNetworks"
+      "AppliedArtificialIntelligence",
+      "Project_TargetingComputer2"
    ],
    "effects": [
-      "Effect_EconomyPriorityBonus05"
+      "Effect_TargetingComputer3"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
    "factionAvailableChance": 50,
-   "initialUnlockChance": 5,
+   "factionAlways": "Random",
+   "initialUnlockChance": 0,
    "deltaUnlockChance": 5,
-   "maxUnlockChance": 80,
+   "maxUnlockChance": 50,
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Spartans",
-   "dataName": "Project_Spartans",
-   "techCategory": "MilitaryScience",
+   "friendlyName": "Salvage Bay",
+   "dataName": "Project_SalvageBay",
+   "techCategory": "Materials",
    "AI_techRole": "SpaceWar",
-   "AI_projectRole": "Marines",
-   "researchCost": 10000,
+   "AI_projectRole": "SpaceResources",
+   "researchCost": 5000,
    "prereqs": [
-      "Project_EliteMarineAssaultUnit",
-      "Project_DestroyVictory",
-      "Project_CadreDevelopmentPrograms"
+      "IndustrializationofSpace",
+      "MolecularAssemblers"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
-   "factionPrereq": [
-      "DestroyCouncil"
+   "factionAvailableChance": 50,
+   "factionAlways": "ExploitCouncil",
+   "initialUnlockChance": 0,
+   "deltaUnlockChance": 10,
+   "maxUnlockChance": 70,
+   "resourcesGranted": []
+},
+ {
+   "friendlyName": "Armor Struts",
+   "dataName": "Project_ArmorStruts",
+   "techCategory": "Materials",
+   "AI_techRole": "SpaceWar",
+   "AI_projectRole": "Armor",
+   "researchCost": 1000,
+   "prereqs": [
+      "Superalloys",
+      "OrbitalShipbuilding"
    ],
-   "factionAvailableChance": 100,
-   "initialUnlockChance": 20,
+   "oneTimeGlobally": false,
+   "repeatable": false,
+   "factionAvailableChance": 90,
+   "initialUnlockChance": 0,
+   "deltaUnlockChance": 10,
+   "maxUnlockChance": 100,
+   "resourcesGranted": []
+},
+ {
+   "friendlyName": "Salt Water Core Reactor I",
+   "dataName": "Project_SaltWaterCoreReactorI",
+   "disable": true,
+   "techCategory": "Energy",
+   "AI_techRole": "SpaceDevelopment",
+   "AI_projectRole": "PowerPlant",
+   "researchCost": 10000,
+   "prereqs": [
+      "AdvancedFissionSystems",
+      "Ultracapacitors"
+   ],
+   "oneTimeGlobally": false,
+   "repeatable": false,
+   "factionAvailableChance": 0,
+   "initialUnlockChance": 0,
    "deltaUnlockChance": 5,
    "maxUnlockChance": 100,
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Rangers",
-   "dataName": "Project_Rangers",
-   "techCategory": "MilitaryScience",
-   "AI_techRole": "SpaceWar",
-   "AI_projectRole": "Marines",
+   "friendlyName": "Salt Water Core Reactor II",
+   "dataName": "Project_SaltWaterCoreReactorII",
+   "disable": true,
+   "techCategory": "Energy",
+   "AI_techRole": "SpaceDevelopment",
+   "AI_projectRole": "PowerPlant",
    "researchCost": 10000,
    "prereqs": [
-      "Project_EliteMarineAssaultUnit",
-      "Project_ResistVictory",
-      "Project_GuerrillaWarfare"
+      "Project_SaltWaterCoreReactorI"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
-   "factionPrereq": [
-      "ResistCouncil"
+   "factionAvailableChance": 0,
+   "initialUnlockChance": 0,
+   "deltaUnlockChance": 5,
+   "maxUnlockChance": 100,
+   "resourcesGranted": []
+},
+ {
+   "friendlyName": "Hall Drive",
+   "dataName": "Project_HallDrive",
+   "disable": true,
+   "techCategory": "SpaceScience",
+   "AI_techRole": "SpaceDevelopment",
+   "AI_projectRole": "Propulsion",
+   "researchCost": 100,
+   "prereqs": [
+      "ElectrostaticPropulsion"
    ],
+   "oneTimeGlobally": false,
+   "repeatable": false,
    "factionAvailableChance": 100,
-   "initialUnlockChance": 20,
+   "initialUnlockChance": 0,
    "deltaUnlockChance": 5,
-   "maxUnlockChance": 100,
+   "maxUnlockChance": 50,
    "resourcesGranted": []
 },
  {
-   "friendlyName": "Immortals",
-   "dataName": "Project_Immortals",
-   "techCategory": "MilitaryScience",
-   "AI_techRole": "SpaceWar",
-   "AI_projectRole": "Marines",
-   "researchCost": 10000,
+   "friendlyName": "Arcjet Drive",
+   "dataName": "Project_ArcjetDrive",
+   "disable": true,
+   "techCategory": "SpaceScience",
+   "AI_techRole": "SpaceDevelopment",
+   "AI_projectRole": "Propulsion",
+   "researchCost": 200,
    "prereqs": [
-      "Project_EliteMarineAssaultUnit",
-      "Project_SubmitVictory",
-      "Project_LoyaltyTraining"
+      "ElectrothermalPropulsion"
    ],
    "oneTimeGlobally": false,
    "repeatable": false,
-   "factionPrereq": [
-      "SubmitCouncil"
+   "factionAvailableChance": 100,
+   "initialUnlockChance": 0,
+   "deltaUnlockChance": 5,
+   "maxUnlockChance": 100,
+   "resourcesGranted": []
+},
+ {
+   "friendlyName": "Resistojet",
+   "dataName": "Project_Resistojet",
+   "disable": true,
+   "techCategory": "SpaceScience",
+   "AI_techRole": "SpaceDevelopment",
+   "AI_projectRole": "Propulsion",
+   "researchCost": 100,
+   "prereqs": [
+      "ElectrothermalPropulsion"
    ],
+   "oneTimeGlobally": false,
+   "repeatable": false,
    "factionAvailableChance": 100,
-   "initialUnlockChance": 20,
+   "initialUnlockChance": 0,
    "deltaUnlockChance": 5,
    "maxUnlockChance": 100,
    "resourcesGranted": []
diff --git a/app/game/templates/TIRadiatorTemplate.json b/app/game/templates/TIRadiatorTemplate.json
index 5455e3d..c4d4439 100644
--- a/app/game/templates/TIRadiatorTemplate.json
+++ b/app/game/templates/TIRadiatorTemplate.json
@@ -8,7 +8,7 @@
    "emissivity": 0.85,
    "vulnerability": 30,
    "collector": false,
-   "requiredProjectName": "",
+   "requiredProjectName": "Project_Warships",
    "crew": 1,
    "weightedBuildMaterials": {
       "volatiles": 0,
@@ -29,7 +29,7 @@
    "emissivity": 0.83,
    "vulnerability": 20,
    "collector": false,
-   "requiredProjectName": "",
+   "requiredProjectName": "Project_Warships",
    "crew": 1,
    "weightedBuildMaterials": {
       "volatiles": 0,
@@ -222,9 +222,9 @@
    "crew": 2,
    "weightedBuildMaterials": {
       "volatiles": 0.05,
-      "metals": 0.05,
+      "metals": 0.055,
       "nobleMetals": 0.89,
-      "exotics": 0.01
+      "exotics": 0.005
    },
    "iconResource": "shipbuildericons/ICO_ExoticSpikeRadiator",
    "combatUIpath": "spike",
@@ -264,7 +264,7 @@
    "crew": 1,
    "weightedBuildMaterials": {
       "volatiles": 0.9,
-      "metals": 0.04,
+      "metals": 0.09,
       "nobleMetals": 0,
       "exotics": 0.01
    },
diff --git a/app/game/templates/TIShipArmorTemplate.json b/app/game/templates/TIShipArmorTemplate.json
index 88ac598..fb88297 100644
--- a/app/game/templates/TIShipArmorTemplate.json
+++ b/app/game/templates/TIShipArmorTemplate.json
@@ -8,10 +8,24 @@
       "nobleMetals": 0,
       "exotics": 0
    },
-   "requiredProjectName": "",
+   "xRayHalfValue_cm": 2,
+   "baryonicHalfValue_cm": 7.5,
    "density_kgm3": 7850,
    "heatofVaporization_MJkg": 6.8,
-   "specialty": "ChippingResistance",
+   "specialties": [
+      {
+         "armorSpecialty": "XRayResistance",
+         "value": 1
+      },
+      {
+         "armorSpecialty": "BaryonicResistance",
+         "value": 1
+      },
+      {
+         "armorSpecialty": "ChippingResistance",
+         "value": 0.75
+      }
+   ],
    "iconResource": "shipbuildericons/ICO_SteelArmor"
 },
  {
@@ -19,14 +33,28 @@
    "friendlyName": "Titanium Armor",
    "weightedBuildMaterials": {
       "volatiles": 0,
-      "metals": 0,
-      "nobleMetals": 1,
+      "metals": 0.05,
+      "nobleMetals": 0.95,
       "exotics": 0
    },
-   "requiredProjectName": "",
-   "density_kgm3": 4500,
+   "xRayHalfValue_cm": 4.2,
+   "baryonicHalfValue_cm": 10.5,
+   "density_kgm3": 4820,
    "heatofVaporization_MJkg": 8.77,
-   "specialty": "ChippingResistance",
+   "specialties": [
+      {
+         "armorSpecialty": "XRayResistance",
+         "value": 2.816
+      },
+      {
+         "armorSpecialty": "BaryonicResistance",
+         "value": 1.07
+      },
+      {
+         "armorSpecialty": "ChippingResistance",
+         "value": 0.75
+      }
+   ],
    "iconResource": "shipbuildericons/ICO_TitaniumArmor"
 },
  {
@@ -38,10 +66,24 @@
       "nobleMetals": 0,
       "exotics": 0
    },
-   "requiredProjectName": "",
+   "xRayHalfValue_cm": 9.1,
+   "baryonicHalfValue_cm": 58,
    "density_kgm3": 3210,
    "heatofVaporization_MJkg": 9.9,
-   "specialty": "None",
+   "specialties": [
+      {
+         "armorSpecialty": "XRayResistance",
+         "value": 5.146
+      },
+      {
+         "armorSpecialty": "BaryonicResistance",
+         "value": 1.72
+      },
+      {
+         "armorSpecialty": "None",
+         "value": 0
+      }
+   ],
    "iconResource": "shipbuildericons/ICO_SiliconCarbideArmor"
 },
  {
@@ -53,10 +95,24 @@
       "nobleMetals": 0,
       "exotics": 0
    },
-   "requiredProjectName": "",
+   "xRayHalfValue_cm": 22.2,
+   "baryonicHalfValue_cm": 13.8,
    "density_kgm3": 2520,
    "heatofVaporization_MJkg": 7.14,
-   "specialty": "KineticsResistance",
+   "specialties": [
+      {
+         "armorSpecialty": "XRayResistance",
+         "value": 6.705
+      },
+      {
+         "armorSpecialty": "BaryonicResistance",
+         "value": 0.654
+      },
+      {
+         "armorSpecialty": "KineticsResistance",
+         "value": 0.75
+      }
+   ],
    "iconResource": "shipbuildericons/ICO_BoronCarbideArmor"
 },
  {
@@ -69,10 +125,55 @@
       "exotics": 0
    },
    "requiredProjectName": "Project_CompositeArmor",
+   "xRayHalfValue_cm": 15.3,
+   "baryonicHalfValue_cm": 72,
    "density_kgm3": 1930,
    "heatofVaporization_MJkg": 15,
-   "specialty": "None",
+   "specialties": [
+      {
+         "armorSpecialty": "XRayResistance",
+         "value": 7.178
+      },
+      {
+         "armorSpecialty": "BaryonicResistance",
+         "value": 1.75
+      },
+      {
+         "armorSpecialty": "None",
+         "value": 0
+      }
+   ],
    "iconResource": "shipbuildericons/ICO_CompositeArmor"
+},
+ {
+   "dataName": "FoamedMetalArmor",
+   "friendlyName": "Foamed Metal Armor",
+   "weightedBuildMaterials": {
+      "volatiles": 0.3,
+      "metals": 0.5,
+      "nobleMetals": 0.2,
+      "exotics": 0
+   },
+   "requiredProjectName": "Project_FoamedMetalArmor",
+   "xRayHalfValue_cm": 29.4,
+   "baryonicHalfValue_cm": 134.9,
+   "density_kgm3": 920,
+   "heatofVaporization_MJkg": 24,
+   "specialties": [
+      {
+         "armorSpecialty": "XRayResistance",
+         "value": 8.758
+      },
+      {
+         "armorSpecialty": "BaryonicResistance",
+         "value": 1.821
+      },
+      {
+         "armorSpecialty": "ChippingResistance",
+         "value": 0.75
+      }
+   ],
+   "iconResource": "shipbuildericons/ICO_FoamedMetalArmor"
 },
  {
    "dataName": "NanotubeArmor",
@@ -84,9 +185,24 @@
       "exotics": 0
    },
    "requiredProjectName": "Project_NanotubeArmor",
+   "xRayHalfValue_cm": 19.9,
+   "baryonicHalfValue_cm": 155.4,
    "density_kgm3": 1720,
    "heatofVaporization_MJkg": 29.6,
-   "specialty": "None",
+   "specialties": [
+      {
+         "armorSpecialty": "XRayResistance",
+         "value": 10.21
+      },
+      {
+         "armorSpecialty": "BaryonicResistance",
+         "value": 1.93
+      },
+      {
+         "armorSpecialty": "None",
+         "value": 0
+      }
+   ],
    "iconResource": "shipbuildericons/ICO_NanotubeArmor"
 },
  {
@@ -99,39 +215,84 @@
       "exotics": 0
    },
    "requiredProjectName": "Project_AdamantaneArmor",
+   "xRayHalfValue_cm": 18,
+   "baryonicHalfValue_cm": 115.8,
    "density_kgm3": 1800,
    "heatofVaporization_MJkg": 59.534,
-   "specialty": "KineticsResistance",
+   "specialties": [
+      {
+         "armorSpecialty": "XRayResistance",
+         "value": 11.627
+      },
+      {
+         "armorSpecialty": "BaryonicResistance",
+         "value": 1.955
+      },
+      {
+         "armorSpecialty": "KineticsResistance",
+         "value": 0.75
+      }
+   ],
    "iconResource": "shipbuildericons/ICO_AdamantaneArmor"
 },
  {
    "dataName": "ExoticArmor",
    "friendlyName": "Exotic Armor",
    "weightedBuildMaterials": {
-      "volatiles": 0.25,
-      "metals": 0.25,
-      "nobleMetals": 0.1,
-      "exotics": 0.4
+      "volatiles": 0.4,
+      "metals": 0.4,
+      "nobleMetals": 0.16,
+      "exotics": 0.04
    },
    "requiredProjectName": "Project_ExoticArmor",
+   "xRayHalfValue_cm": 5.2,
+   "baryonicHalfValue_cm": 12,
    "density_kgm3": 2200,
    "heatofVaporization_MJkg": 70,
-   "specialty": "None",
+   "specialties": [
+      {
+         "armorSpecialty": "XRayResistance",
+         "value": 9.495
+      },
+      {
+         "armorSpecialty": "BaryonicResistance",
+         "value": 1.72
+      },
+      {
+         "armorSpecialty": "None",
+         "value": 0
+      }
+   ],
    "iconResource": "shipbuildericons/ICO_ExoticArmor"
 },
  {
    "dataName": "HybridArmor",
    "friendlyName": "Hybrid Armor",
    "weightedBuildMaterials": {
-      "volatiles": 0.3,
-      "metals": 0.3,
-      "nobleMetals": 0.2,
-      "exotics": 0.2
+      "volatiles": 0.35,
+      "metals": 0.45,
+      "nobleMetals": 0.18,
+      "exotics": 0.02
    },
    "requiredProjectName": "Project_HybridArmor",
-   "density_kgm3": 1400,
+   "xRayHalfValue_cm": 4.5,
+   "baryonicHalfValue_cm": 11,
+   "density_kgm3": 2000,
    "heatofVaporization_MJkg": 80,
-   "specialty": "LaserResistance",
+   "specialties": [
+      {
+         "armorSpecialty": "XRayResistance",
+         "value": 9.133
+      },
+      {
+         "armorSpecialty": "BaryonicResistance",
+         "value": 1.707
+      },
+      {
+         "armorSpecialty": "LaserResistance",
+         "value": 0.75
+      }
+   ],
    "iconResource": "shipbuildericons/ICO_HybridArmor"
 },
  {
@@ -144,9 +305,24 @@
       "exotics": 0
    },
    "requiredProjectName": "Project_AlienMasterProject",
+   "xRayHalfValue_cm": 18,
+   "baryonicHalfValue_cm": 115.8,
    "density_kgm3": 1800,
    "heatofVaporization_MJkg": 59.534,
-   "specialty": "KineticsResistance",
+   "specialties": [
+      {
+         "armorSpecialty": "XRayResistance",
+         "value": 11.627
+      },
+      {
+         "armorSpecialty": "BaryonicResistance",
+         "value": 1.955
+      },
+      {
+         "armorSpecialty": "KineticsResistance",
+         "value": 0.75
+      }
+   ],
    "iconResource": "shipbuildericons/ICO_AdamantaneArmor"
 },
  {
@@ -154,14 +330,29 @@
    "friendlyName": "Alien Exotic Armor",
    "weightedBuildMaterials": {
       "volatiles": 0.4,
-      "metals": 0.4,
-      "nobleMetals": 0.1,
-      "exotics": 0.1
+      "metals": 0.42,
+      "nobleMetals": 0.14,
+      "exotics": 0.04
    },
    "requiredProjectName": "Project_AlienMasterProject",
+   "xRayHalfValue_cm": 5.2,
+   "baryonicHalfValue_cm": 12,
    "density_kgm3": 2200,
    "heatofVaporization_MJkg": 70,
-   "specialty": "LaserResistance",
+   "specialties": [
+      {
+         "armorSpecialty": "XRayResistance",
+         "value": 9.495
+      },
+      {
+         "armorSpecialty": "BaryonicResistance",
+         "value": 1.72
+      },
+      {
+         "armorSpecialty": "LaserResistance",
+         "value": 0.75
+      }
+   ],
    "iconResource": "shipbuildericons/ICO_ExoticArmor"
 }
 ]
\ No newline at end of file
diff --git a/app/game/templates/TIShipHullTemplate.json b/app/game/templates/TIShipHullTemplate.json
index aa32527..23b7d3d 100644
--- a/app/game/templates/TIShipHullTemplate.json
+++ b/app/game/templates/TIShipHullTemplate.json
@@ -6,14 +6,14 @@
    "hullHardpoints": 0,
    "internalModules": 1,
    "consTier": 1,
+   "maxOfficers": 1,
    "length_m": 50,
    "toylength_cm": 7.1,
    "width_m": 10,
    "volume": 1963,
    "thrusterMultiplier": 1,
    "structuralIntegrity": 3,
-   "altSI": 3,
-   "mass_tons": 200,
+   "mass_tons": 178,
    "crew": 3,
    "alien": false,
    "monthlyIncome_Money": -1,
@@ -106,14 +106,14 @@
    "hullHardpoints": 2,
    "internalModules": 2,
    "consTier": 1,
+   "maxOfficers": 1,
    "length_m": 50,
    "toylength_cm": 7.1,
    "width_m": 10,
    "volume": 1963,
    "thrusterMultiplier": 1,
    "structuralIntegrity": 5,
-   "altSI": 3,
-   "mass_tons": 200,
+   "mass_tons": 350,
    "crew": 4,
    "alien": false,
    "monthlyIncome_Money": -2,
@@ -216,14 +216,14 @@
    "hullHardpoints": 1,
    "internalModules": 2,
    "consTier": 1,
+   "maxOfficers": 2,
    "length_m": 65,
    "toylength_cm": 8.1,
    "width_m": 15,
    "volume": 7069,
    "thrusterMultiplier": 1,
    "structuralIntegrity": 6,
-   "altSI": 5,
-   "mass_tons": 350,
+   "mass_tons": 400,
    "crew": 8,
    "alien": false,
    "monthlyIncome_Money": -3,
@@ -326,13 +326,13 @@
    "hullHardpoints": 2,
    "internalModules": 4,
    "consTier": 1,
+   "maxOfficers": 3,
    "length_m": 100,
    "toylength_cm": 10,
    "width_m": 20,
    "volume": 23562,
    "thrusterMultiplier": 1,
    "structuralIntegrity": 9,
-   "altSI": 9,
    "mass_tons": 600,
    "crew": 20,
    "alien": false,
@@ -451,14 +451,14 @@
    "hullHardpoints": 4,
    "internalModules": 3,
    "consTier": 2,
+   "maxOfficers": 3,
    "length_m": 125,
    "toylength_cm": 11.2,
    "width_m": 20,
    "volume": 31416,
    "thrusterMultiplier": 1,
    "structuralIntegrity": 12,
-   "altSI": 13,
-   "mass_tons": 900,
+   "mass_tons": 800,
    "crew": 35,
    "alien": false,
    "monthlyIncome_Money": -4,
@@ -576,14 +576,14 @@
    "hullHardpoints": 2,
    "internalModules": 3,
    "consTier": 2,
+   "maxOfficers": 3,
    "length_m": 125,
    "toylength_cm": 11.2,
    "width_m": 20,
    "volume": 31416,
    "thrusterMultiplier": 1,
    "structuralIntegrity": 12,
-   "altSI": 13,
-   "mass_tons": 900,
+   "mass_tons": 825,
    "crew": 40,
    "alien": false,
    "monthlyIncome_Money": -5,
@@ -701,14 +701,14 @@
    "hullHardpoints": 3,
    "internalModules": 6,
    "consTier": 2,
+   "maxOfficers": 4,
    "length_m": 175,
    "toylength_cm": 13.2,
    "width_m": 20,
    "volume": 47124,
    "thrusterMultiplier": 1,
    "structuralIntegrity": 15,
-   "altSI": 18,
-   "mass_tons": 1200,
+   "mass_tons": 1000,
    "crew": 60,
    "alien": false,
    "monthlyIncome_Money": -10,
@@ -846,13 +846,13 @@
    "hullHardpoints": 2,
    "internalModules": 4,
    "consTier": 2,
+   "maxOfficers": 4,
    "length_m": 175,
    "toylength_cm": 13.2,
    "width_m": 20,
    "volume": 47124,
    "thrusterMultiplier": 1,
-   "structuralIntegrity": 15,
-   "altSI": 18,
+   "structuralIntegrity": 18,
    "mass_tons": 1200,
    "crew": 70,
    "alien": false,
@@ -981,14 +981,14 @@
    "hullHardpoints": 6,
    "internalModules": 5,
    "consTier": 3,
+   "maxOfficers": 5,
    "length_m": 200,
    "toylength_cm": 14.1,
    "width_m": 25,
    "volume": 85903,
    "thrusterMultiplier": 1,
    "structuralIntegrity": 24,
-   "altSI": 22,
-   "mass_tons": 1500,
+   "mass_tons": 1600,
    "crew": 80,
    "alien": false,
    "monthlyIncome_Money": -15,
@@ -1136,13 +1136,13 @@
    "hullHardpoints": 3,
    "internalModules": 6,
    "consTier": 3,
+   "maxOfficers": 5,
    "length_m": 250,
    "toylength_cm": 15.8,
    "width_m": 32,
    "volume": 180956,
    "thrusterMultiplier": 1,
    "structuralIntegrity": 30,
-   "altSI": 30,
    "mass_tons": 2000,
    "crew": 100,
    "alien": false,
@@ -1291,14 +1291,14 @@
    "hullHardpoints": 8,
    "internalModules": 6,
    "consTier": 3,
+   "maxOfficers": 5,
    "length_m": 275,
    "toylength_cm": 16.6,
    "width_m": 35,
    "volume": 240528,
    "thrusterMultiplier": 1,
    "structuralIntegrity": 36,
-   "altSI": 37,
-   "mass_tons": 2500,
+   "mass_tons": 2400,
    "crew": 120,
    "alien": false,
    "monthlyIncome_Money": -25,
@@ -1466,14 +1466,14 @@
    "hullHardpoints": 6,
    "internalModules": 8,
    "consTier": 3,
+   "maxOfficers": 6,
    "length_m": 300,
    "toylength_cm": 17.3,
    "width_m": 35,
    "volume": 264581,
    "thrusterMultiplier": 1,
    "structuralIntegrity": 48,
-   "altSI": 45,
-   "mass_tons": 3000,
+   "mass_tons": 3200,
    "crew": 120,
    "alien": false,
    "monthlyIncome_Money": -30,
@@ -1638,6 +1638,19 @@
          "y": 0
       }
    ]
+},
+ {
+   "dataName": "STOFighter",
+   "friendlyName": "STO Fighter",
+   "disable": true,
+   "internalModules": 0,
+   "thrusterMultiplier": 1,
+   "structuralIntegrity": 2,
+   "crew": 2,
+   "alien": false,
+   "monthlyIncome_Money": 0,
+   "missionControl": 0,
+   "shipModuleSlots": []
 },
  {
    "dataName": "AlienGunship",
@@ -1646,13 +1659,13 @@
    "hullHardpoints": 0,
    "internalModules": 2,
    "consTier": 1,
+   "maxOfficers": 0,
    "length_m": 50,
    "toylength_cm": 7.1,
    "width_m": 10,
    "volume": 1963,
    "thrusterMultiplier": 1,
    "structuralIntegrity": 6,
-   "altSI": 6,
    "mass_tons": 192,
    "crew": 1,
    "alien": true,
@@ -1679,8 +1692,8 @@
    "requiredProjectName": "Project_AlienMasterProject",
    "weightedBuildMaterials": {
       "volatiles": 0.1,
-      "metals": 0.6,
-      "nobleMetals": 0.3
+      "metals": 0.7,
+      "nobleMetals": 0.2
    },
    "shipModuleSlots": [
       {
@@ -1739,6 +1752,117 @@
          "y": 0
       }
    ]
+},
+ {
+   "dataName": "AlienEscort",
+   "friendlyName": "Alien Escort",
+   "noseHardpoints": 0,
+   "hullHardpoints": 2,
+   "internalModules": 3,
+   "consTier": 1,
+   "maxOfficers": 0,
+   "length_m": 75,
+   "toylength_cm": 8.7,
+   "width_m": 10,
+   "volume": 3927,
+   "thrusterMultiplier": 1,
+   "structuralIntegrity": 9,
+   "mass_tons": 288,
+   "crew": 2,
+   "alien": true,
+   "monthlyIncome_Money": 0,
+   "missionControl": 1,
+   "baseConstructionTime_days": 96,
+   "shipyardyOffset": [
+      0,
+      0,
+      0
+   ],
+   "modelResource": [
+      "ships/AlienEscort"
+   ],
+   "combatUIpath": [
+      "ui_spacecombat/OBJ_battle_hydra_ES"
+   ],
+   "path1": [
+      "hydra_ES/"
+   ],
+   "path2": [
+      "OBJ_battle_hydra_ES"
+   ],
+   "requiredProjectName": "Project_AlienMasterProject",
+   "weightedBuildMaterials": {
+      "volatiles": 0.1,
+      "metals": 0.7,
+      "nobleMetals": 0.2
+   },
+   "shipModuleSlots": [
+      {
+         "moduleSlotType": "Drive",
+         "x": 1,
+         "y": 3
+      },
+      {
+         "moduleSlotType": "PowerPlant",
+         "x": 2,
+         "y": 3
+      },
+      {
+         "moduleSlotType": "Battery",
+         "x": 3,
+         "y": 3
+      },
+      {
+         "moduleSlotType": "Radiator",
+         "x": 4,
+         "y": 3
+      },
+      {
+         "moduleSlotType": "TailArmor",
+         "x": 1,
+         "y": 7
+      },
+      {
+         "moduleSlotType": "LateralArmor",
+         "x": 4,
+         "y": 7
+      },
+      {
+         "moduleSlotType": "NoseArmor",
+         "x": 8,
+         "y": 7
+      },
+      {
+         "moduleSlotType": "HullHardPoint",
+         "x": 8,
+         "y": 3
+      },
+      {
+         "moduleSlotType": "HullHardPoint",
+         "x": 7,
+         "y": 3
+      },
+      {
+         "moduleSlotType": "Utility",
+         "x": 5,
+         "y": 4
+      },
+      {
+         "moduleSlotType": "Utility",
+         "x": 5,
+         "y": 2
+      },
+      {
+         "moduleSlotType": "Utility",
+         "x": 6,
+         "y": 3
+      },
+      {
+         "moduleSlotType": "Propellant",
+         "x": 1,
+         "y": 0
+      }
+   ]
 },
  {
    "dataName": "AlienCorvette",
@@ -1747,13 +1871,13 @@
    "hullHardpoints": 1,
    "internalModules": 3,
    "consTier": 1,
+   "maxOfficers": 0,
    "length_m": 75,
    "toylength_cm": 8.7,
    "width_m": 10,
    "volume": 3927,
    "thrusterMultiplier": 1,
    "structuralIntegrity": 9,
-   "altSI": 9,
    "mass_tons": 288,
    "crew": 3,
    "alien": true,
@@ -1780,8 +1904,8 @@
    "requiredProjectName": "Project_AlienMasterProject",
    "weightedBuildMaterials": {
       "volatiles": 0.1,
-      "metals": 0.6,
-      "nobleMetals": 0.3
+      "metals": 0.7,
+      "nobleMetals": 0.2
    },
    "shipModuleSlots": [
       {
@@ -1858,13 +1982,13 @@
    "hullHardpoints": 3,
    "internalModules": 4,
    "consTier": 1,
+   "maxOfficers": 0,
    "length_m": 125,
    "toylength_cm": 11.2,
    "width_m": 15,
    "volume": 17671,
    "thrusterMultiplier": 1,
-   "structuralIntegrity": 12,
-   "altSI": 17,
+   "structuralIntegrity": 18,
    "mass_tons": 576,
    "crew": 10,
    "alien": true,
@@ -1891,8 +2015,8 @@
    "requiredProjectName": "Project_AlienMasterProject",
    "weightedBuildMaterials": {
       "volatiles": 0.1,
-      "metals": 0.6,
-      "nobleMetals": 0.3
+      "metals": 0.7,
+      "nobleMetals": 0.2
    },
    "shipModuleSlots": [
       {
@@ -1976,6 +2100,137 @@
          "y": 0
       }
    ]
+},
+ {
+   "dataName": "AlienMonitor",
+   "friendlyName": "Alien Monitor",
+   "noseHardpoints": 1,
+   "hullHardpoints": 4,
+   "internalModules": 4,
+   "consTier": 2,
+   "maxOfficers": 0,
+   "length_m": 150,
+   "toylength_cm": 12.2,
+   "width_m": 15,
+   "volume": 22089,
+   "thrusterMultiplier": 1,
+   "structuralIntegrity": 21,
+   "mass_tons": 672,
+   "crew": 16,
+   "alien": true,
+   "monthlyIncome_Money": 0,
+   "missionControl": 1,
+   "baseConstructionTime_days": 256,
+   "shipyardyOffset": [
+      0,
+      0,
+      0
+   ],
+   "modelResource": [
+      "ships/AlienMonitor"
+   ],
+   "combatUIpath": [
+      "ui_spacecombat/OBJ_battle_hydra_MO"
+   ],
+   "path1": [
+      "hydra_MO/"
+   ],
+   "path2": [
+      "OBJ_battle_hydra_MO"
+   ],
+   "requiredProjectName": "Project_AlienMasterProject",
+   "weightedBuildMaterials": {
+      "volatiles": 0.1,
+      "metals": 0.7,
+      "nobleMetals": 0.2
+   },
+   "shipModuleSlots": [
+      {
+         "moduleSlotType": "Drive",
+         "x": 1,
+         "y": 3
+      },
+      {
+         "moduleSlotType": "PowerPlant",
+         "x": 2,
+         "y": 3
+      },
+      {
+         "moduleSlotType": "Battery",
+         "x": 3,
+         "y": 3
+      },
+      {
+         "moduleSlotType": "Radiator",
+         "x": 4,
+         "y": 3
+      },
+      {
+         "moduleSlotType": "TailArmor",
+         "x": 1,
+         "y": 7
+      },
+      {
+         "moduleSlotType": "LateralArmor",
+         "x": 4,
+         "y": 7
+      },
+      {
+         "moduleSlotType": "NoseArmor",
+         "x": 7,
+         "y": 7
+      },
+      {
+         "moduleSlotType": "NoseHardPoint",
+         "x": 7,
+         "y": 3
+      },
+      {
+         "moduleSlotType": "HullHardPoint",
+         "x": 5,
+         "y": 2
+      },
+      {
+         "moduleSlotType": "HullHardPoint",
+         "x": 5,
+         "y": 4
+      },
+      {
+         "moduleSlotType": "HullHardPoint",
+         "x": 6,
+         "y": 2
+      },
+      {
+         "moduleSlotType": "HullHardPoint",
+         "x": 6,
+         "y": 4
+      },
+      {
+         "moduleSlotType": "Utility",
+         "x": 5,
+         "y": 0
+      },
+      {
+         "moduleSlotType": "Utility",
+         "x": 5,
+         "y": 6
+      },
+      {
+         "moduleSlotType": "Utility",
+         "x": 6,
+         "y": 0
+      },
+      {
+         "moduleSlotType": "Utility",
+         "x": 6,
+         "y": 6
+      },
+      {
+         "moduleSlotType": "Propellant",
+         "x": 1,
+         "y": 0
+      }
+   ]
 },
  {
    "dataName": "AlienDestroyer",
@@ -1984,13 +2239,13 @@
    "hullHardpoints": 2,
    "internalModules": 4,
    "consTier": 2,
+   "maxOfficers": 0,
    "length_m": 150,
    "toylength_cm": 12.2,
    "width_m": 15,
    "volume": 22089,
    "thrusterMultiplier": 1,
    "structuralIntegrity": 24,
-   "altSI": 20,
    "mass_tons": 672,
    "crew": 20,
    "alien": true,
@@ -2017,8 +2272,8 @@
    "requiredProjectName": "Project_AlienMasterProject",
    "weightedBuildMaterials": {
       "volatiles": 0.1,
-      "metals": 0.6,
-      "nobleMetals": 0.3
+      "metals": 0.7,
+      "nobleMetals": 0.2
    },
    "shipModuleSlots": [
       {
@@ -2102,6 +2357,152 @@
          "y": 0
       }
    ]
+},
+ {
+   "dataName": "AlienCruiser",
+   "friendlyName": "Alien Cruiser",
+   "noseHardpoints": 2,
+   "hullHardpoints": 4,
+   "internalModules": 6,
+   "consTier": 2,
+   "maxOfficers": 0,
+   "length_m": 200,
+   "toylength_cm": 14.1,
+   "width_m": 20,
+   "volume": 54978,
+   "thrusterMultiplier": 1,
+   "structuralIntegrity": 32,
+   "mass_tons": 1056,
+   "crew": 25,
+   "alien": true,
+   "monthlyIncome_Money": 0,
+   "missionControl": 1,
+   "baseConstructionTime_days": 320,
+   "shipyardyOffset": [
+      0,
+      0,
+      0
+   ],
+   "modelResource": [
+      "ships/AlienCruiser"
+   ],
+   "combatUIpath": [
+      "ui_spacecombat/OBJ_battle_hydra_CR"
+   ],
+   "path1": [
+      "hydra_CR/"
+   ],
+   "path2": [
+      "OBJ_battle_hydra_CR"
+   ],
+   "requiredProjectName": "Project_AlienMasterProject",
+   "weightedBuildMaterials": {
+      "volatiles": 0.1,
+      "metals": 0.6,
+      "nobleMetals": 0.3
+   },
+   "shipModuleSlots": [
+      {
+         "moduleSlotType": "Drive",
+         "x": 1,
+         "y": 3
+      },
+      {
+         "moduleSlotType": "PowerPlant",
+         "x": 2,
+         "y": 3
+      },
+      {
+         "moduleSlotType": "Battery",
+         "x": 3,
+         "y": 3
+      },
+      {
+         "moduleSlotType": "Radiator",
+         "x": 4,
+         "y": 3
+      },
+      {
+         "moduleSlotType": "TailArmor",
+         "x": 1,
+         "y": 7
+      },
+      {
+         "moduleSlotType": "LateralArmor",
+         "x": 4,
+         "y": 7
+      },
+      {
+         "moduleSlotType": "NoseArmor",
+         "x": 8,
+         "y": 7
+      },
+      {
+         "moduleSlotType": "NoseHardPoint",
+         "x": 7,
+         "y": 2
+      },
+      {
+         "moduleSlotType": "NoseHardPoint",
+         "x": 7,
+         "y": 4
+      },
+      {
+         "moduleSlotType": "HullHardPoint",
+         "x": 5,
+         "y": 2
+      },
+      {
+         "moduleSlotType": "HullHardPoint",
+         "x": 5,
+         "y": 4
+      },
+      {
+         "moduleSlotType": "HullHardPoint",
+         "x": 6,
+         "y": 2
+      },
+      {
+         "moduleSlotType": "HullHardPoint",
+         "x": 6,
+         "y": 4
+      },
+      {
+         "moduleSlotType": "Utility",
+         "x": 5,
+         "y": 0
+      },
+      {
+         "moduleSlotType": "Utility",
+         "x": 5,
+         "y": 6
+      },
+      {
+         "moduleSlotType": "Utility",
+         "x": 6,
+         "y": 0
+      },
+      {
+         "moduleSlotType": "Utility",
+         "x": 6,
+         "y": 6
+      },
+      {
+         "moduleSlotType": "Utility",
+         "x": 4,
+         "y": 1
+      },
+      {
+         "moduleSlotType": "Utility",
+         "x": 4,
+         "y": 5
+      },
+      {
+         "moduleSlotType": "Propellant",
+         "x": 0,
+         "y": 0
+      }
+   ]
 },
  {
    "dataName": "AlienBattlecruiser",
@@ -2110,14 +2511,14 @@
    "hullHardpoints": 3,
    "internalModules": 5,
    "consTier": 2,
-   "length_m": 250,
-   "toylength_cm": 15.8,
+   "maxOfficers": 0,
+   "length_m": 245,
+   "toylength_cm": 15.7,
    "width_m": 25,
-   "volume": 110447,
+   "volume": 107992,
    "thrusterMultiplier": 1,
-   "structuralIntegrity": 32,
-   "altSI": 47,
-   "mass_tons": 1536,
+   "structuralIntegrity": 48,
+   "mass_tons": 1440,
    "crew": 35,
    "alien": true,
    "monthlyIncome_Money": 0,
@@ -2251,13 +2652,13 @@
    "hullHardpoints": 6,
    "internalModules": 6,
    "consTier": 2,
+   "maxOfficers": 0,
    "length_m": 250,
    "toylength_cm": 15.8,
    "width_m": 25,
    "volume": 110447,
    "thrusterMultiplier": 1,
    "structuralIntegrity": 48,
-   "altSI": 47,
    "mass_tons": 1536,
    "crew": 40,
    "alien": true,
@@ -2399,6 +2800,31 @@
          "y": 0
       }
    ]
+},
+ {
+   "dataName": "AlienLancer",
+   "friendlyName": "Alien Lancer",
+   "disable": true,
+   "noseHardpoints": 6,
+   "hullHardpoints": 4,
+   "maxOfficers": 0,
+   "length_m": 275,
+   "toylength_cm": 16.6,
+   "width_m": 25,
+   "volume": 122718,
+   "thrusterMultiplier": 1,
+   "structuralIntegrity": 48,
+   "mass_tons": 1536,
+   "alien": true,
+   "monthlyIncome_Money": 0,
+   "missionControl": 1,
+   "requiredProjectName": "Project_AlienMasterProject",
+   "weightedBuildMaterials": {
+      "volatiles": 0.1,
+      "metals": 0.6,
+      "nobleMetals": 0.3
+   },
+   "shipModuleSlots": []
 },
  {
    "dataName": "AlienDreadnought",
@@ -2407,13 +2833,13 @@
    "hullHardpoints": 8,
    "internalModules": 8,
    "consTier": 2,
+   "maxOfficers": 0,
    "length_m": 300,
    "toylength_cm": 17.3,
    "width_m": 30,
    "volume": 194386,
    "thrusterMultiplier": 1,
    "structuralIntegrity": 64,
-   "altSI": 61,
    "mass_tons": 2016,
    "crew": 50,
    "alien": true,
@@ -2585,6 +3011,31 @@
          "y": 0
       }
    ]
+},
+ {
+   "dataName": "AlienTitan",
+   "friendlyName": "Alien Titan",
+   "disable": true,
+   "noseHardpoints": 6,
+   "hullHardpoints": 8,
+   "maxOfficers": 0,
+   "length_m": 400,
+   "toylength_cm": 20,
+   "width_m": 30,
+   "volume": 265072,
+   "thrusterMultiplier": 1,
+   "structuralIntegrity": 72,
+   "mass_tons": 2304,
+   "alien": true,
+   "monthlyIncome_Money": 0,
+   "missionControl": 1,
+   "requiredProjectName": "Project_AlienMasterProject",
+   "weightedBuildMaterials": {
+      "volatiles": 0.1,
+      "metals": 0.6,
+      "nobleMetals": 0.3
+   },
+   "shipModuleSlots": []
 },
  {
    "dataName": "AlienAssaultCarrier",
@@ -2593,13 +3044,13 @@
    "hullHardpoints": 6,
    "internalModules": 5,
    "consTier": 3,
+   "maxOfficers": 0,
    "length_m": 300,
    "toylength_cm": 17.3,
    "width_m": 30,
    "volume": 194386,
    "thrusterMultiplier": 1,
    "structuralIntegrity": 96,
-   "altSI": 81,
    "mass_tons": 2688,
    "crew": 80,
    "alien": true,
@@ -2734,13 +3185,13 @@
    "hullHardpoints": 16,
    "internalModules": 6,
    "consTier": 3,
+   "maxOfficers": 0,
    "length_m": 600,
    "toylength_cm": 24.5,
    "width_m": 60,
    "volume": 1625774,
    "thrusterMultiplier": 3,
-   "structuralIntegrity": 128,
-   "altSI": 233,
+   "structuralIntegrity": 240,
    "mass_tons": 7680,
    "crew": 100,
    "alien": true,
@@ -2928,20 +3379,37 @@
          "y": 5
       },
       {
-         "moduleSlotType": "Propellant",
+         "moduleSlotType": "Utility",
          "x": 0,
-         "y": 0
+         "y": 5
       },
       {
          "moduleSlotType": "Utility",
          "x": 0,
-         "y": 4
+         "y": 1
       },
       {
-         "moduleSlotType": "Utility",
+         "moduleSlotType": "Propellant",
          "x": 0,
-         "y": 6
+         "y": 0
       }
    ]
+},
+ {
+   "dataName": "SalamanderGunship",
+   "friendlyName": "Salamander Gunship",
+   "disable": true,
+   "structuralIntegrity": 3,
+   "crew": 1,
+   "alien": true,
+   "monthlyIncome_Money": 0,
+   "missionControl": 1,
+   "requiredProjectName": "Project_AlienMasterProject",
+   "weightedBuildMaterials": {
+      "volatiles": 0.1,
+      "metals": 0.7,
+      "nobleMetals": 0.2
+   },
+   "shipModuleSlots": []
 }
 ]
\ No newline at end of file
diff --git a/app/game/templates/TITechTemplate.json b/app/game/templates/TITechTemplate.json
index 8ae1389..118d3e2 100644
--- a/app/game/templates/TITechTemplate.json
+++ b/app/game/templates/TITechTemplate.json
@@ -6,7 +6,7 @@
    "AI_techRole": "SpaceDevelopment",
    "AI_criticalTech": false,
    "endGameTech": false,
-   "researchCost": 50000,
+   "researchCost": 150000,
    "prereqs": [
       "MindandMachine",
       "IntegratedEarthSpaceEconomy",
@@ -36,10 +36,9 @@
    "AI_techRole": "Efficiency",
    "AI_criticalTech": false,
    "endGameTech": false,
-   "researchCost": 30000,
+   "researchCost": 50000,
    "prereqs": [
-      "AppliedArtificialIntelligence",
-      "SelfRepairingSoftware",
+      "WhiteCollarAutomation",
       "QuantumEncryption"
    ],
    "effects": [
@@ -87,7 +86,8 @@
    "researchCost": 25000,
    "prereqs": [
       "GasCoreFissionSystems",
-      "Diamondoids"
+      "Superalloys",
+      "Neutronics"
    ],
    "effects": [
       "Effect_GlobalFissionTechIncrease"
@@ -114,7 +114,8 @@
    "endGameTech": false,
    "researchCost": 20000,
    "prereqs": [
-      "SuperconductingMagnets"
+      "SuperconductingMagnets",
+      "Superalloys"
    ]
 },
  {
@@ -171,9 +172,9 @@
    "AI_techRole": "SpaceDevelopment",
    "AI_criticalTech": false,
    "endGameTech": false,
-   "researchCost": 50000,
+   "researchCost": 10000,
    "prereqs": [
-      "SuperconductingMagnets",
+      "AdvancedHydrogenContainment",
       "AdvancedAtomicManipulation"
    ],
    "effects": [
@@ -187,10 +188,11 @@
    "AI_techRole": "SpaceWar",
    "AI_criticalTech": false,
    "endGameTech": false,
-   "researchCost": 100000,
+   "researchCost": 125000,
    "prereqs": [
       "AntimatterContainment",
-      "OurSpaceFuture"
+      "OurSpaceFuture",
+      "ParticleCannon"
    ]
 },
  {
@@ -203,7 +205,7 @@
    "researchCost": 100000,
    "prereqs": [
       "AntimatterMassProduction",
-      "DeepSpacePropulsionConcepts"
+      "MagneticPlasmaConfinementTechniques"
    ]
 },
  {
@@ -213,9 +215,8 @@
    "AI_techRole": "SpaceWar",
    "AI_criticalTech": false,
    "endGameTech": false,
-   "researchCost": 70000,
+   "researchCost": 60000,
    "prereqs": [
-      "AdvancedMissileWarfareDoctrine",
       "AntimatterContainment",
       "MilitarizationofSpace"
    ]
@@ -314,6 +315,9 @@
    "prereqs": [
       "ArrivalEconomics",
       "ArrivalInternationalRelations"
+   ],
+   "effects": [
+      "Effect_EnvironmentBestSustainabilityValue05"
    ]
 },
  {
@@ -364,7 +368,7 @@
    "researchCost": 5000,
    "prereqs": [
       "WeAreNotAlone",
-      "Biotechnology"
+      "SpaceMedicine"
    ]
 },
  {
@@ -432,11 +436,11 @@
    "researchCost": 50000,
    "prereqs": [
       "DeuteriumHelium3Fusion",
-      "ArrivalEconomics"
+      "ArrivalInternationalDevelopment"
    ],
    "effects": [
+      "Effect_EnvironmentBestSustainabilityValue10",
       "Effect_WelfareReduction_CO2_ppm",
-      "Effect_Economy_CO2_ppm50",
       "Effect_WelfareReduction_CH4_ppm"
    ]
 },
@@ -451,9 +455,10 @@
    "prereqs": [
       "DesignerLifeforms",
       "CleanEnergy",
-      "ArrivalInternationalDevelopment"
+      "AdministrationAlgorithms"
    ],
    "effects": [
+      "Effect_EnvironmentBestSustainabilityValue10",
       "Effect_WelfareReduction_CO2_ppm",
       "Effect_WelfareReduction_CH4_ppm",
       "Effect_WelfareReduction_N2O_ppm",
@@ -551,7 +556,8 @@
    "effects": [
       "Effect_WelfareReduction_CO2_ppm",
       "Effect_WelfareReduction_CH4_ppm",
-      "Effect_WelfareReduction_N2O_ppm"
+      "Effect_WelfareReduction_N2O_ppm",
+      "Effect_EnvironmentBestSustainabilityValue05"
    ]
 },
  {
@@ -563,10 +569,12 @@
    "endGameTech": false,
    "researchCost": 75000,
    "prereqs": [
-      "DeuteriumTritiumFusion"
+      "DeuteriumTritiumFusion",
+      "Superalloys"
    ],
    "effects": [
-      "Effect_GlobalFusionTechIncrease"
+      "Effect_GlobalFusionTechIncrease",
+      "Effect_Economy_BasePCGDPIncrease02"
    ]
 },
  {
@@ -578,11 +586,12 @@
    "endGameTech": false,
    "researchCost": 75000,
    "prereqs": [
-      "DeuteriumTritiumFusion"
+      "DeuteriumDeuteriumFusion",
+      "HighTemperatureSuperconductors",
+      "CarbonNanotubes"
    ],
    "effects": [
       "Effect_GlobalFusionTechIncrease",
-      "Effect_Economy_CO2_ppm90",
       "Effect_Economy_BasePCGDPIncrease02"
    ]
 },
@@ -595,11 +604,11 @@
    "endGameTech": false,
    "researchCost": 50000,
    "prereqs": [
-      "NuclearFusioninSpace"
+      "NuclearFusioninSpace",
+      "Neutronics"
    ],
    "effects": [
       "Effect_GlobalFusionTechIncrease",
-      "Effect_Economy_CO2_ppm90",
       "Effect_Economy_BasePCGDPIncrease02"
    ]
 },
@@ -613,7 +622,7 @@
    "researchCost": 15000,
    "prereqs": [
       "CarbonNanotubes",
-      "AdvancedAtomicManipulation"
+      "MolecularAssemblers"
    ],
    "effects": [
       "Effect_IncreaseMaxArmyTechLevel"
@@ -652,7 +661,7 @@
    "AI_techRole": "SpaceDevelopment",
    "AI_criticalTech": false,
    "endGameTech": false,
-   "researchCost": 2500,
+   "researchCost": 1500,
    "prereqs": [
       "DeepSpacePropulsionConcepts"
    ]
@@ -666,8 +675,8 @@
    "endGameTech": false,
    "researchCost": 15000,
    "prereqs": [
-      "VacuumElectrostaticPrinciples",
-      "AdvancedSuperconductors"
+      "NuclearFusioninSpace",
+      "VacuumElectrostaticPrinciples"
    ]
 },
  {
@@ -675,9 +684,9 @@
    "dataName": "ElectrostaticPropulsion",
    "techCategory": "Energy",
    "AI_techRole": "SpaceDevelopment",
-   "AI_criticalTech": true,
+   "AI_criticalTech": false,
    "endGameTech": false,
-   "researchCost": 2500,
+   "researchCost": 3000,
    "prereqs": [
       "DeepSpacePropulsionConcepts",
       "VacuumElectrostaticPrinciples"
@@ -690,10 +699,9 @@
    "AI_techRole": "SpaceDevelopment",
    "AI_criticalTech": false,
    "endGameTech": false,
-   "researchCost": 2500,
+   "researchCost": 500,
    "prereqs": [
-      "DeepSpacePropulsionConcepts",
-      "AdvancedMagnetics"
+      "DeepSpacePropulsionConcepts"
    ]
 },
  {
@@ -705,7 +713,7 @@
    "endGameTech": false,
    "researchCost": 5000,
    "prereqs": [
-      "SpaceMedicine",
+      "InSituResourceUtilization",
       "SpaceAgriculture",
       "ArrivalPsychology"
    ]
@@ -733,7 +741,7 @@
    "researchCost": 25000,
    "prereqs": [
       "SolidCoreFissionSystems",
-      "Diamondoids",
+      "CarbonNanotubes",
       "ElectromagneticPropulsion"
    ]
 },
@@ -746,7 +754,7 @@
    "endGameTech": false,
    "researchCost": 45000,
    "prereqs": [
-      "MilitarizationofSpace",
+      "SpaceNavies",
       "IntegratedEarthSpaceEconomy",
       "ImprovedShipbuildingTechniques"
    ]
@@ -818,7 +826,10 @@
    "AI_techRole": "Efficiency",
    "AI_criticalTech": false,
    "endGameTech": true,
-   "researchCost": 100000
+   "researchCost": 100000,
+   "effects": [
+      "Effect_SpaceMineFreebies1"
+   ]
 },
  {
    "friendlyName": "Gas Core Fission Systems",
@@ -829,7 +840,8 @@
    "endGameTech": false,
    "researchCost": 20000,
    "prereqs": [
-      "MoltenCoreFissionSystems"
+      "MoltenCoreFissionSystems",
+      "AdvancedHeatManagementConcepts"
    ],
    "effects": [
       "Effect_GlobalFissionTechIncrease"
@@ -899,31 +911,7 @@
    "researchCost": 5000,
    "prereqs": [
       "ElectromagneticPropulsion",
-      "MagneticPlasmaConfinementTechniques"
-   ]
-},
- {
-   "friendlyName": "High-Energy Electrostatic Propulsion",
-   "dataName": "HighEnergyElectrostaticPropulsion",
-   "techCategory": "SpaceScience",
-   "AI_techRole": "SpaceDevelopment",
-   "AI_criticalTech": false,
-   "endGameTech": false,
-   "researchCost": 5000,
-   "prereqs": [
-      "ElectrostaticPropulsion"
-   ]
-},
- {
-   "friendlyName": "High-Energy Electrothermal Propulsion",
-   "dataName": "HighEnergyElectrothermalPropulsion",
-   "techCategory": "SpaceScience",
-   "AI_techRole": "SpaceDevelopment",
-   "AI_criticalTech": false,
-   "endGameTech": false,
-   "researchCost": 5000,
-   "prereqs": [
-      "ElectrothermalPropulsion"
+      "SuperconductingMagnets"
    ]
 },
  {
@@ -934,21 +922,6 @@
    "AI_criticalTech": false,
    "endGameTech": false,
    "researchCost": 1000
-},
- {
-   "friendlyName": "Hydrogen-Lithium-6 Fusion",
-   "dataName": "HydrogenLithium6Fusion",
-   "techCategory": "Energy",
-   "AI_techRole": "SpaceDevelopment",
-   "AI_criticalTech": false,
-   "endGameTech": false,
-   "researchCost": 75000,
-   "prereqs": [
-      "DeuteriumTritiumFusion"
-   ],
-   "effects": [
-      "Effect_GlobalFusionTechIncrease"
-   ]
 },
  {
    "friendlyName": "Improved Shipbuilding Techniques",
@@ -960,7 +933,8 @@
    "researchCost": 20000,
    "prereqs": [
       "IndustrializationofSpace",
-      "NextGenerationAerospace"
+      "NextGenerationAerospace",
+      "Superalloys"
    ]
 },
  {
@@ -1012,10 +986,10 @@
    "AI_techRole": "SpaceDevelopment",
    "AI_criticalTech": false,
    "endGameTech": false,
-   "researchCost": 35000,
+   "researchCost": 65000,
    "prereqs": [
-      "HighEnergyLasers",
-      "AdvancedNeuralNetworks",
+      "ArcLasers",
+      "NuclearFusioninSpace",
       "AdvancedAtomicManipulation"
    ]
 },
@@ -1051,7 +1025,8 @@
    ],
    "effects": [
       "Effect_Economy_BasePCGDPIncrease02",
-      "Effect_WelfareReduction_CO2_ppm"
+      "Effect_WelfareReduction_CO2_ppm",
+      "Effect_EnvironmentBestSustainabilityValue05"
    ]
 },
  {
@@ -1101,9 +1076,8 @@
    "endGameTech": false,
    "researchCost": 50000,
    "prereqs": [
-      "DeepSpacePropulsionConcepts",
       "MagneticPlasmaConfinementTechniques",
-      "SuperconductingMagnets"
+      "DeepSpacePropulsionConcepts"
    ]
 },
  {
@@ -1116,7 +1090,7 @@
    "researchCost": 35000,
    "prereqs": [
       "HighTemperatureSuperconductors",
-      "MagneticForceManipulation"
+      "SuperconductingMagnets"
    ]
 },
  {
@@ -1181,7 +1155,9 @@
       "MissiontotheAsteroids"
    ],
    "effects": [
-      "Effect_ExploreJupiter"
+      "Effect_ExploreJupiter",
+      "Effect_SpaceMineFreebies6",
+      "Effect_TechProbeSpeed"
    ]
 },
  {
@@ -1193,11 +1169,14 @@
    "endGameTech": false,
    "researchCost": 2500,
    "prereqs": [
-      "OutpostHabs"
+      "OutpostHabs",
+      "Skywatch"
    ],
    "effects": [
       "Effect_ExploreMars",
-      "Effect_ExploreEarthLagrangePoints"
+      "Effect_ExploreEarthLagrangePoints",
+      "Effect_SpaceMineFreebies6",
+      "Effect_TechProbeSpeed"
    ]
 },
  {
@@ -1213,7 +1192,9 @@
       "NuclearFissioninSpace"
    ],
    "effects": [
-      "Effect_ExploreSaturn"
+      "Effect_ExploreSaturn",
+      "Effect_SpaceMineFreebies6",
+      "Effect_TechProbeSpeed"
    ]
 },
  {
@@ -1235,11 +1216,29 @@
    "researchCost": 3500,
    "prereqs": [
       "MissiontoMars",
-      "Skywatch",
+      "SpaceMiningandRefining",
       "DeepSpacePropulsionConcepts"
    ],
    "effects": [
-      "Effect_ExploreAsteroids"
+      "Effect_ExploreAsteroids",
+      "Effect_SpaceMineFreebies6",
+      "Effect_TechProbeSpeed"
+   ]
+},
+ {
+   "friendlyName": "Mission to Venus",
+   "dataName": "MissiontoVenus",
+   "techCategory": "SpaceScience",
+   "AI_techRole": "SpaceExpansion",
+   "AI_criticalTech": false,
+   "endGameTech": false,
+   "researchCost": 2500,
+   "prereqs": [
+      "MissiontotheMoon",
+      "AdvancedHeatManagementConcepts"
+   ],
+   "effects": [
+      "Effect_ExploreVenus"
    ]
 },
  {
@@ -1251,11 +1250,13 @@
    "endGameTech": false,
    "researchCost": 15000,
    "prereqs": [
-      "MissiontoMars",
-      "AdvancedHeatManagementConcepts"
+      "MissiontoVenus",
+      "MissiontoMars"
    ],
    "effects": [
-      "Effect_ExploreInnerPlanets"
+      "Effect_ExploreInnerPlanets",
+      "Effect_SpaceMineFreebies3",
+      "Effect_TechProbeSpeed"
    ]
 },
  {
@@ -1270,7 +1271,9 @@
       "OutpostHabs"
    ],
    "effects": [
-      "Effect_ExploreLuna"
+      "Effect_ExploreLuna",
+      "Effect_SpaceMineFreebies3",
+      "Effect_TechProbeSpeed"
    ]
 },
  {
@@ -1288,7 +1291,9 @@
    ],
    "effects": [
       "Effect_ExploreOuterPlanets",
-      "Effect_ExploreKuiperBelt"
+      "Effect_ExploreKuiperBelt",
+      "Effect_SpaceMineFreebies6",
+      "Effect_TechProbeSpeed"
    ]
 },
  {
@@ -1312,7 +1317,8 @@
    "endGameTech": false,
    "researchCost": 10000,
    "prereqs": [
-      "SolidCoreFissionSystems"
+      "SolidCoreFissionSystems",
+      "AdvancedCarbonManipulation"
    ],
    "effects": [
       "Effect_GlobalFissionTechIncrease"
@@ -1348,15 +1354,17 @@
    ]
 },
  {
-   "friendlyName": "Neutronium Containment",
-   "dataName": "NeutroniumContainment",
-   "techCategory": "Energy",
+   "friendlyName": "Neutronics",
+   "dataName": "Neutronics",
+   "techCategory": "Materials",
    "AI_techRole": "SpaceDevelopment",
    "AI_criticalTech": false,
    "endGameTech": false,
-   "researchCost": 50000,
+   "researchCost": 15000,
    "prereqs": [
-      "Diamondoids"
+      "AdvancedAtomicManipulation",
+      "AdvancedNeuralNetworks",
+      "ParticleCannon"
    ]
 },
  {
@@ -1396,12 +1404,13 @@
    "dataName": "NuclearFusioninSpace",
    "techCategory": "SpaceScience",
    "AI_techRole": "SpaceDevelopment",
-   "AI_criticalTech": true,
+   "AI_criticalTech": false,
    "endGameTech": false,
    "researchCost": 50000,
    "prereqs": [
-      "HighTemperatureSuperconductors",
-      "NuclearFissioninSpace"
+      "AdvancedSuperconductors",
+      "NuclearFissioninSpace",
+      "AdvancedHeatManagementConcepts"
    ],
    "effects": [
       "Effect_GlobalFusionTechIncrease"
@@ -1454,7 +1463,7 @@
    "endGameTech": false,
    "researchCost": 30000,
    "prereqs": [
-      "MilitarizationofSpace",
+      "SpaceNavies",
       "DirectedSpaceResearch",
       "SpaceCommerce"
    ]
@@ -1472,16 +1481,16 @@
    ]
 },
  {
-   "friendlyName": "Particle Cannon",
+   "friendlyName": "Particle Beams",
    "dataName": "ParticleCannon",
-   "techCategory": "MilitaryScience",
+   "techCategory": "Energy",
    "AI_techRole": "SpaceWar",
    "AI_criticalTech": false,
    "endGameTech": false,
    "researchCost": 5000,
    "prereqs": [
       "VacuumElectrostaticPrinciples",
-      "DirectedEnergyWarfareDoctrine"
+      "HighEnergyLasers"
    ]
 },
  {
@@ -1548,8 +1557,8 @@
    ]
 },
  {
-   "friendlyName": "Proton-Boron Fusion",
-   "dataName": "ProtonBoronFusion",
+   "friendlyName": "Aneutronic Fusion",
+   "dataName": "AneutronicFusion",
    "techCategory": "Energy",
    "AI_techRole": "SpaceDevelopment",
    "AI_criticalTech": false,
@@ -1560,7 +1569,8 @@
       "AdvancedHydrogenContainment"
    ],
    "effects": [
-      "Effect_GlobalFusionTechIncrease"
+      "Effect_GlobalFusionTechIncrease",
+      "Effect_Economy_BasePCGDPIncrease02"
    ]
 },
  {
@@ -1572,10 +1582,12 @@
    "endGameTech": false,
    "researchCost": 100000,
    "prereqs": [
-      "ProtonBoronFusion"
+      "AneutronicFusion",
+      "Ultracapacitors"
    ],
    "effects": [
-      "Effect_GlobalFusionTechIncrease"
+      "Effect_GlobalFusionTechIncrease",
+      "Effect_Economy_BasePCGDPIncrease02"
    ]
 },
  {
@@ -1587,7 +1599,8 @@
    "endGameTech": false,
    "researchCost": 10000,
    "prereqs": [
-      "AdvancedAtomicManipulation"
+      "AdvancedAtomicManipulation",
+      "AdvancedNeuralNetworks"
    ]
 },
  {
@@ -1732,6 +1745,20 @@
       "MassDrivers",
       "OutpostHabs"
    ]
+},
+ {
+   "friendlyName": "Space Navies",
+   "dataName": "SpaceNavies",
+   "techCategory": "MilitaryScience",
+   "AI_techRole": "SpaceWar",
+   "AI_criticalTech": false,
+   "endGameTech": false,
+   "researchCost": 10000,
+   "prereqs": [
+      "MilitarizationofSpace",
+      "AdAstra",
+      "NuclearFissioninSpace"
+   ]
 },
  {
    "friendlyName": "Space Research",
@@ -1757,6 +1784,18 @@
    "prereqs": [
       "MissionToSpace"
    ]
+},
+ {
+   "friendlyName": "Superalloys",
+   "dataName": "Superalloys",
+   "techCategory": "Materials",
+   "AI_techRole": "SpaceWar",
+   "AI_criticalTech": false,
+   "endGameTech": false,
+   "researchCost": 5000,
+   "prereqs": [
+      "AdvancedAtomicManipulation"
+   ]
 },
  {
    "friendlyName": "Supercapacitors",
@@ -1796,6 +1835,20 @@
       "NetworkedGlobalDefense",
       "DesignerLifeforms"
    ]
+},
+ {
+   "friendlyName": "Tokamaks",
+   "dataName": "Tokamaks",
+   "techCategory": "Energy",
+   "AI_techRole": "SpaceDevelopment",
+   "AI_criticalTech": false,
+   "endGameTech": false,
+   "researchCost": 25000,
+   "prereqs": [
+      "MagneticPlasmaConfinementTechniques",
+      "NuclearFusioninSpace",
+      "AppliedArtificialIntelligence"
+   ]
 },
  {
    "friendlyName": "Terawatt Fusion Reactors",
@@ -1806,7 +1859,7 @@
    "endGameTech": false,
    "researchCost": 100000,
    "prereqs": [
-      "DeuteriumTritiumFusion",
+      "DeuteriumHelium3Fusion",
       "Ultracapacitors",
       "Diamondoids"
    ],
@@ -1871,6 +1924,9 @@
    "prereqs": [
       "PredictiveGenetics",
       "Cybernetics"
+   ],
+   "effects": [
+      "Effect_AllowDecontaminateRegion"
    ]
 },
  {
@@ -1960,7 +2016,7 @@
    "endGameTech": false,
    "researchCost": 40000,
    "prereqs": [
-      "ArrivalEconomics",
+      "ArrivalInternationalDevelopment",
       "SelfRepairingSoftware",
       "AppliedArtificialIntelligence"
    ]
@@ -1972,9 +2028,11 @@
    "AI_techRole": "SpaceDevelopment",
    "AI_criticalTech": false,
    "endGameTech": false,
-   "researchCost": 25000,
+   "researchCost": 50000,
    "prereqs": [
-      "MagneticPlasmaConfinementTechniques"
+      "MagneticPlasmaConfinementTechniques",
+      "NuclearFusioninSpace",
+      "Supercapacitors"
    ]
 }
 ]
\ No newline at end of file
diff --git a/app/game/templates/TIUtilityModuleTemplate.json b/app/game/templates/TIUtilityModuleTemplate.json
index 43422fb..f5a59b4 100644
--- a/app/game/templates/TIUtilityModuleTemplate.json
+++ b/app/game/templates/TIUtilityModuleTemplate.json
@@ -3,35 +3,23 @@
    "dataName": "ISRUModule",
    "friendlyName": "ISRU Module",
    "crew": 5,
-   "mass_tons": 40,
+   "mass_tons": 100,
    "grouping": 0,
    "requiredProjectName": "Project_ISRUModule",
+   "minConsTier": 0,
    "powerRequirement_MW": 0,
-   "laserPowerBonus_MW": 0,
-   "thrustMultiplier": 1,
-   "EVMultiplier": 1,
-   "requiresHydrogenPropellant": null,
-   "requiresNuclearDrive": null,
-   "requiresFusionDrive": null,
-   "noCombatRepair": null,
    "weightedBuildMaterials": {
       "water": 0.3,
       "volatiles": 0.34,
       "metals": 0.34,
-      "nobleMetals": 0.02,
-      "fissiles": null,
-      "antimatter": null,
-      "exotics": null
+      "nobleMetals": 0.02
    },
    "specialModuleRules": [
       "RefuelFromUnimprovedSites",
-      "",
-      ""
+      "RequiresNonISRUDrive",
+      "RadHardened"
    ],
-   "marineOpsValue": null,
-   "ECMValue": null,
-   "iconResource": "shipbuildericons/ICO_ISRUModule",
-   "modelResource": ""
+   "iconResource": "shipbuildericons/ICO_ISRUModule"
 },
  {
    "dataName": "RemassScoop",
@@ -40,134 +28,93 @@
    "mass_tons": 40,
    "grouping": 1,
    "requiredProjectName": "Project_RemassScoop",
+   "minConsTier": 0,
    "powerRequirement_MW": 0,
-   "laserPowerBonus_MW": 0,
-   "thrustMultiplier": 1,
-   "EVMultiplier": 1,
-   "requiresHydrogenPropellant": null,
-   "requiresNuclearDrive": null,
-   "requiresFusionDrive": null,
    "noCombatRepair": true,
    "weightedBuildMaterials": {
-      "water": null,
       "volatiles": 0.1,
       "metals": 0.5,
-      "nobleMetals": 0.4,
-      "fissiles": null,
-      "antimatter": null,
-      "exotics": null
+      "nobleMetals": 0.4
    },
    "specialModuleRules": [
       "ImmunetoAerobrakingDamage",
       "RefuelFromAtmospheres",
-      ""
+      "RadHardened"
    ],
-   "marineOpsValue": null,
-   "ECMValue": null,
-   "iconResource": "shipbuildericons/ICO_RemassScoop",
-   "modelResource": ""
+   "iconResource": "shipbuildericons/ICO_RemassScoop"
 },
  {
    "dataName": "MuonSpiker",
    "friendlyName": "Muon Spiker",
    "crew": 3,
-   "mass_tons": 40,
+   "mass_tons": 30,
    "grouping": 3,
    "requiredProjectName": "Project_MuonSpiker",
+   "minConsTier": 0,
    "powerRequirement_MW": 0,
-   "laserPowerBonus_MW": 0,
-   "thrustMultiplier": 1.2,
-   "EVMultiplier": 1,
-   "requiresHydrogenPropellant": null,
-   "requiresNuclearDrive": true,
-   "requiresFusionDrive": true,
-   "noCombatRepair": null,
    "weightedBuildMaterials": {
       "water": 0.1,
       "volatiles": 0.2,
       "metals": 0.325,
       "nobleMetals": 0.37498,
-      "fissiles": 0.00002,
-      "antimatter": null,
-      "exotics": null
+      "fissiles": 0.00002
    },
    "specialModuleRules": [
-      "",
-      "",
-      ""
+      "ThrustMultiplier",
+      "RequiresFusionDrive",
+      "RadHardened"
    ],
-   "marineOpsValue": null,
-   "ECMValue": null,
-   "iconResource": "shipbuildericons/ICO_MuonSpiker",
-   "modelResource": ""
+   "specialModuleValue": 1.1,
+   "iconResource": "shipbuildericons/ICO_MuonSpiker"
 },
  {
    "dataName": "NeutroniumSpiker",
    "friendlyName": "Neutronium Spiker",
    "crew": 3,
-   "mass_tons": 40,
+   "mass_tons": 30,
    "grouping": 3,
    "requiredProjectName": "Project_NeutroniumSpiker",
+   "minConsTier": 0,
    "powerRequirement_MW": 0,
-   "laserPowerBonus_MW": 0,
-   "thrustMultiplier": 1.35,
-   "EVMultiplier": 1,
-   "requiresHydrogenPropellant": null,
-   "requiresNuclearDrive": true,
-   "requiresFusionDrive": null,
-   "noCombatRepair": null,
    "weightedBuildMaterials": {
       "water": 0.1,
       "volatiles": 0.2,
       "metals": 0.3,
       "nobleMetals": 0.39995,
-      "fissiles": 0.00005,
-      "antimatter": null,
-      "exotics": null
+      "fissiles": 0.00005
    },
    "specialModuleRules": [
-      "",
-      "",
-      ""
+      "ThrustMultiplier",
+      "RequiresFissionDrive",
+      "RadHardened"
    ],
-   "marineOpsValue": null,
-   "ECMValue": null,
-   "iconResource": "shipbuildericons/ICO_NeutroniumSpiker",
-   "modelResource": ""
+   "specialModuleValue": 1.2,
+   "iconResource": "shipbuildericons/ICO_NeutroniumSpiker"
 },
  {
    "dataName": "AntimatterSpiker",
    "friendlyName": "Antimatter Spiker",
    "crew": 3,
-   "mass_tons": 40,
+   "mass_tons": 30,
    "grouping": 3,
    "requiredProjectName": "Project_AntimatterSpiker",
+   "minConsTier": 0,
    "powerRequirement_MW": 0,
-   "laserPowerBonus_MW": 0,
-   "thrustMultiplier": 1.5,
-   "EVMultiplier": 1,
-   "requiresHydrogenPropellant": null,
-   "requiresNuclearDrive": true,
-   "requiresFusionDrive": null,
-   "noCombatRepair": null,
    "weightedBuildMaterials": {
       "water": 0.1,
       "volatiles": 0.2,
       "metals": 0.3,
-      "nobleMetals": 0.39995999999,
+      "nobleMetals": 0.399959999999,
       "fissiles": 0.00004,
-      "antimatter": 0.0000000000075,
-      "exotics": null
+      "antimatter": 1e-12
    },
    "specialModuleRules": [
-      "",
-      "",
-      ""
+      "ThrustMultiplier",
+      "RequiresNuclearDrive",
+      "RadHardened"
    ],
-   "marineOpsValue": null,
-   "ECMValue": null,
-   "iconResource": "shipbuildericons/ICO_AntimatterSpiker",
-   "modelResource": ""
+   "specialModuleValue": 1.3,
+   "iconResource": "shipbuildericons/ICO_AntimatterSpiker"
 },
  {
    "dataName": "MobileSpaceScienceLab",
@@ -176,66 +123,62 @@
    "mass_tons": 200,
    "grouping": -1,
    "requiredProjectName": "Project_MobileSpaceScienceLab",
+   "minConsTier": 0,
    "powerRequirement_MW": 1,
-   "laserPowerBonus_MW": 0,
-   "thrustMultiplier": 1,
-   "EVMultiplier": 1,
-   "requiresHydrogenPropellant": null,
-   "requiresNuclearDrive": null,
-   "requiresFusionDrive": null,
-   "noCombatRepair": null,
    "weightedBuildMaterials": {
       "water": 0.05,
       "volatiles": 0.1,
       "metals": 0.65,
-      "nobleMetals": 0.2,
-      "fissiles": null,
-      "antimatter": null,
-      "exotics": null
+      "nobleMetals": 0.2
    },
    "specialModuleRules": [
       "GenerateSpaceScienceBonus",
-      "Prospector",
-      ""
+      "Prospector"
    ],
-   "marineOpsValue": null,
-   "ECMValue": null,
-   "iconResource": "shipbuildericons/ICO_MobileSpaceScienceLab",
-   "modelResource": ""
+   "specialModuleValue": 0.05,
+   "iconResource": "shipbuildericons/ICO_MobileSpaceScienceLab"
 },
  {
    "dataName": "RepairBay",
    "friendlyName": "Repair Bay",
    "crew": 10,
-   "mass_tons": 500,
+   "mass_tons": 700,
    "grouping": -1,
    "requiredProjectName": "Project_RepairBay",
+   "minConsTier": 0,
    "powerRequirement_MW": 0,
-   "laserPowerBonus_MW": 0,
-   "thrustMultiplier": 1,
-   "EVMultiplier": 1,
-   "requiresHydrogenPropellant": null,
-   "requiresNuclearDrive": null,
-   "requiresFusionDrive": null,
-   "noCombatRepair": null,
    "weightedBuildMaterials": {
       "water": 0.05,
       "volatiles": 0.2,
       "metals": 0.5,
-      "nobleMetals": 0.25,
-      "fissiles": null,
-      "antimatter": null,
-      "exotics": null
+      "nobleMetals": 0.25
+   },
+   "specialModuleRules": [
+      "Repair"
+   ],
+   "iconResource": "shipbuildericons/ICO_RepairBay"
+},
+ {
+   "dataName": "SalvageBay",
+   "friendlyName": "Salvage Bay",
+   "crew": 20,
+   "mass_tons": 1000,
+   "grouping": 11,
+   "requiredProjectName": "Project_SalvageBay",
+   "minConsTier": 2,
+   "powerRequirement_MW": 5,
+   "noCombatRepair": true,
+   "weightedBuildMaterials": {
+      "water": 0.05,
+      "volatiles": 0.1,
+      "metals": 0.7,
+      "nobleMetals": 0.15
    },
    "specialModuleRules": [
-      "Repair",
-      "",
-      ""
+      "SalvageBonus"
    ],
-   "marineOpsValue": null,
-   "ECMValue": null,
-   "iconResource": "shipbuildericons/ICO_RepairBay",
-   "modelResource": ""
+   "specialModuleValue": 0.1,
+   "iconResource": "shipbuildericons/ICO_SalvageBay"
 },
  {
    "dataName": "MarineAssaultUnit",
@@ -244,32 +187,20 @@
    "mass_tons": 200,
    "grouping": -1,
    "requiredProjectName": "Project_MarineAssaultUnit",
+   "minConsTier": 0,
    "powerRequirement_MW": 0,
-   "laserPowerBonus_MW": 0,
-   "thrustMultiplier": 1,
-   "EVMultiplier": 1,
-   "requiresHydrogenPropellant": null,
-   "requiresNuclearDrive": null,
-   "requiresFusionDrive": null,
    "noCombatRepair": true,
    "weightedBuildMaterials": {
       "water": 0.05,
       "volatiles": 0.4,
       "metals": 0.3,
-      "nobleMetals": 0.25,
-      "fissiles": null,
-      "antimatter": null,
-      "exotics": null
+      "nobleMetals": 0.25
    },
    "specialModuleRules": [
-      "Assault",
-      "",
-      ""
+      "Assault"
    ],
-   "marineOpsValue": 4,
-   "ECMValue": null,
-   "iconResource": "shipbuildericons/ICO_MarineAssaultUnit",
-   "modelResource": ""
+   "specialModuleValue": 4,
+   "iconResource": "shipbuildericons/ICO_MarineAssaultUnit"
 },
  {
    "dataName": "AdvancedMarineAssaultUnit",
@@ -278,32 +209,20 @@
    "mass_tons": 200,
    "grouping": -1,
    "requiredProjectName": "Project_AdvancedMarineAssaultUnit",
+   "minConsTier": 0,
    "powerRequirement_MW": 0,
-   "laserPowerBonus_MW": 0,
-   "thrustMultiplier": 1,
-   "EVMultiplier": 1,
-   "requiresHydrogenPropellant": null,
-   "requiresNuclearDrive": null,
-   "requiresFusionDrive": null,
    "noCombatRepair": true,
    "weightedBuildMaterials": {
       "water": 0.05,
       "volatiles": 0.4,
       "metals": 0.3,
-      "nobleMetals": 0.25,
-      "fissiles": null,
-      "antimatter": null,
-      "exotics": null
+      "nobleMetals": 0.25
    },
    "specialModuleRules": [
-      "Assault",
-      "",
-      ""
+      "Assault"
    ],
-   "marineOpsValue": 6,
-   "ECMValue": null,
-   "iconResource": "shipbuildericons/ICO_AdvancedMarineAssaultUnit",
-   "modelResource": ""
+   "specialModuleValue": 6,
+   "iconResource": "shipbuildericons/ICO_AdvancedMarineAssaultUnit"
 },
  {
    "dataName": "EliteMarineAssaultUnit",
@@ -312,32 +231,20 @@
    "mass_tons": 200,
    "grouping": -1,
    "requiredProjectName": "Project_EliteMarineAssaultUnit",
+   "minConsTier": 0,
    "powerRequirement_MW": 0,
-   "laserPowerBonus_MW": 0,
-   "thrustMultiplier": 1,
-   "EVMultiplier": 1,
-   "requiresHydrogenPropellant": null,
-   "requiresNuclearDrive": null,
-   "requiresFusionDrive": null,
    "noCombatRepair": true,
    "weightedBuildMaterials": {
       "water": 0.05,
       "volatiles": 0.4,
       "metals": 0.3,
-      "nobleMetals": 0.25,
-      "fissiles": null,
-      "antimatter": null,
-      "exotics": null
+      "nobleMetals": 0.25
    },
    "specialModuleRules": [
-      "Assault",
-      "",
-      ""
+      "Assault"
    ],
-   "marineOpsValue": 8,
-   "ECMValue": null,
-   "iconResource": "shipbuildericons/ICO_EliteMarineAssaultUnit",
-   "modelResource": ""
+   "specialModuleValue": 8,
+   "iconResource": "shipbuildericons/ICO_EliteMarineAssaultUnit"
 },
  {
    "dataName": "Spartans",
@@ -346,32 +253,20 @@
    "mass_tons": 200,
    "grouping": -1,
    "requiredProjectName": "Project_Spartans",
+   "minConsTier": 0,
    "powerRequirement_MW": 0,
-   "laserPowerBonus_MW": 0,
-   "thrustMultiplier": 1,
-   "EVMultiplier": 1,
-   "requiresHydrogenPropellant": null,
-   "requiresNuclearDrive": null,
-   "requiresFusionDrive": null,
    "noCombatRepair": true,
    "weightedBuildMaterials": {
       "water": 0.05,
       "volatiles": 0.35,
       "metals": 0.3,
-      "nobleMetals": 0.3,
-      "fissiles": null,
-      "antimatter": null,
-      "exotics": null
+      "nobleMetals": 0.3
    },
    "specialModuleRules": [
-      "Assault",
-      "",
-      ""
+      "Assault"
    ],
-   "marineOpsValue": 10,
-   "ECMValue": null,
-   "iconResource": "shipbuildericons/ICO_Spartans",
-   "modelResource": ""
+   "specialModuleValue": 10,
+   "iconResource": "shipbuildericons/ICO_Spartans"
 },
  {
    "dataName": "Rangers",
@@ -380,32 +275,20 @@
    "mass_tons": 200,
    "grouping": -1,
    "requiredProjectName": "Project_Rangers",
+   "minConsTier": 0,
    "powerRequirement_MW": 0,
-   "laserPowerBonus_MW": 0,
-   "thrustMultiplier": 1,
-   "EVMultiplier": 1,
-   "requiresHydrogenPropellant": null,
-   "requiresNuclearDrive": null,
-   "requiresFusionDrive": null,
    "noCombatRepair": true,
    "weightedBuildMaterials": {
       "water": 0.05,
       "volatiles": 0.35,
       "metals": 0.3,
-      "nobleMetals": 0.3,
-      "fissiles": null,
-      "antimatter": null,
-      "exotics": null
+      "nobleMetals": 0.3
    },
    "specialModuleRules": [
-      "Assault",
-      "",
-      ""
+      "Assault"
    ],
-   "marineOpsValue": 10,
-   "ECMValue": null,
-   "iconResource": "shipbuildericons/ICO_Rangers",
-   "modelResource": ""
+   "specialModuleValue": 10,
+   "iconResource": "shipbuildericons/ICO_Rangers"
 },
  {
    "dataName": "Immortals",
@@ -414,32 +297,20 @@
    "mass_tons": 200,
    "grouping": -1,
    "requiredProjectName": "Project_Immortals",
+   "minConsTier": 0,
    "powerRequirement_MW": 0,
-   "laserPowerBonus_MW": 0,
-   "thrustMultiplier": 1,
-   "EVMultiplier": 1,
-   "requiresHydrogenPropellant": null,
-   "requiresNuclearDrive": null,
-   "requiresFusionDrive": null,
    "noCombatRepair": true,
    "weightedBuildMaterials": {
       "water": 0.05,
       "volatiles": 0.35,
       "metals": 0.3,
-      "nobleMetals": 0.3,
-      "fissiles": null,
-      "antimatter": null,
-      "exotics": null
+      "nobleMetals": 0.3
    },
    "specialModuleRules": [
-      "Assault",
-      "",
-      ""
+      "Assault"
    ],
-   "marineOpsValue": 10,
-   "ECMValue": null,
-   "iconResource": "shipbuildericons/ICO_Immortals",
-   "modelResource": ""
+   "specialModuleValue": 10,
+   "iconResource": "shipbuildericons/ICO_Immortals"
 },
  {
    "dataName": "LaserEngine",
@@ -448,32 +319,18 @@
    "mass_tons": 25,
    "grouping": -1,
    "requiredProjectName": "Project_LaserEngine",
+   "minConsTier": 0,
    "powerRequirement_MW": 5,
-   "laserPowerBonus_MW": 5,
-   "thrustMultiplier": 1,
-   "EVMultiplier": 1,
-   "requiresHydrogenPropellant": null,
-   "requiresNuclearDrive": null,
-   "requiresFusionDrive": null,
-   "noCombatRepair": null,
    "weightedBuildMaterials": {
-      "water": null,
       "volatiles": 0.3,
       "metals": 0.35,
-      "nobleMetals": 0.35,
-      "fissiles": null,
-      "antimatter": null,
-      "exotics": null
+      "nobleMetals": 0.35
    },
    "specialModuleRules": [
-      "",
-      "",
-      ""
+      "LaserPowerBonus"
    ],
-   "marineOpsValue": null,
-   "ECMValue": null,
-   "iconResource": "shipbuildericons/ICO_LaserEngine",
-   "modelResource": ""
+   "specialModuleValue": 10,
+   "iconResource": "shipbuildericons/ICO_LaserEngine"
 },
  {
    "dataName": "AdvancedLaserEngine",
@@ -482,32 +339,18 @@
    "mass_tons": 50,
    "grouping": -1,
    "requiredProjectName": "Project_AdvancedLaserEngine",
+   "minConsTier": 0,
    "powerRequirement_MW": 10,
-   "laserPowerBonus_MW": 10,
-   "thrustMultiplier": 1,
-   "EVMultiplier": 1,
-   "requiresHydrogenPropellant": null,
-   "requiresNuclearDrive": null,
-   "requiresFusionDrive": null,
-   "noCombatRepair": null,
    "weightedBuildMaterials": {
-      "water": null,
       "volatiles": 0.3,
       "metals": 0.35,
-      "nobleMetals": 0.35,
-      "fissiles": null,
-      "antimatter": null,
-      "exotics": null
+      "nobleMetals": 0.35
    },
    "specialModuleRules": [
-      "",
-      "",
-      ""
+      "LaserPowerBonus"
    ],
-   "marineOpsValue": null,
-   "ECMValue": null,
-   "iconResource": "shipbuildericons/ICO_AdvancedLaserEngine",
-   "modelResource": ""
+   "specialModuleValue": 20,
+   "iconResource": "shipbuildericons/ICO_AdvancedLaserEngine"
 },
  {
    "dataName": "LiquidHydrogenContainment",
@@ -516,32 +359,20 @@
    "mass_tons": 5,
    "grouping": 4,
    "requiredProjectName": "Project_LiquidHydrogenContainment",
+   "minConsTier": 0,
    "powerRequirement_MW": 0,
-   "laserPowerBonus_MW": 0,
-   "thrustMultiplier": 1,
-   "EVMultiplier": 1.1,
-   "requiresHydrogenPropellant": true,
-   "requiresNuclearDrive": null,
-   "requiresFusionDrive": null,
-   "noCombatRepair": null,
    "weightedBuildMaterials": {
-      "water": null,
       "volatiles": 0.35,
       "metals": 0.35,
-      "nobleMetals": 0.3,
-      "fissiles": null,
-      "antimatter": null,
-      "exotics": null
+      "nobleMetals": 0.3
    },
    "specialModuleRules": [
-      "",
-      "",
-      ""
+      "EVMultiplier",
+      "RequiresHydrogenPropellant",
+      "RadHardened"
    ],
-   "marineOpsValue": null,
-   "ECMValue": null,
-   "iconResource": "shipbuildericons/ICO_LiquidHydrogenContainment",
-   "modelResource": ""
+   "specialModuleValue": 1.2,
+   "iconResource": "shipbuildericons/ICO_LiquidHydrogenContainment"
 },
  {
    "dataName": "SlushHydrogenTankage",
@@ -550,32 +381,20 @@
    "mass_tons": 10,
    "grouping": 4,
    "requiredProjectName": "Project_SlushHydrogenTankage",
+   "minConsTier": 0,
    "powerRequirement_MW": 0,
-   "laserPowerBonus_MW": 0,
-   "thrustMultiplier": 1,
-   "EVMultiplier": 1.5,
-   "requiresHydrogenPropellant": true,
-   "requiresNuclearDrive": null,
-   "requiresFusionDrive": null,
-   "noCombatRepair": null,
    "weightedBuildMaterials": {
-      "water": null,
       "volatiles": 0.35,
       "metals": 0.35,
-      "nobleMetals": 0.3,
-      "fissiles": null,
-      "antimatter": null,
-      "exotics": null
+      "nobleMetals": 0.3
    },
    "specialModuleRules": [
-      "",
-      "",
-      ""
+      "EVMultiplier",
+      "RequiresHydrogenPropellant",
+      "RadHardened"
    ],
-   "marineOpsValue": null,
-   "ECMValue": null,
-   "iconResource": "shipbuildericons/ICO_SlushHydrogenTankage",
-   "modelResource": ""
+   "specialModuleValue": 1.35,
+   "iconResource": "shipbuildericons/ICO_SlushHydrogenTankage"
 },
  {
    "dataName": "HydronTrap",
@@ -584,32 +403,21 @@
    "mass_tons": 20,
    "grouping": 4,
    "requiredProjectName": "Project_HydronTrap",
+   "minConsTier": 0,
    "powerRequirement_MW": 0,
-   "laserPowerBonus_MW": 0,
-   "thrustMultiplier": 1,
-   "EVMultiplier": 2,
-   "requiresHydrogenPropellant": true,
-   "requiresNuclearDrive": null,
-   "requiresFusionDrive": null,
-   "noCombatRepair": null,
    "weightedBuildMaterials": {
-      "water": null,
       "volatiles": 0.25,
       "metals": 0.35,
       "nobleMetals": 0.35,
-      "fissiles": null,
-      "antimatter": null,
       "exotics": 0.05
    },
    "specialModuleRules": [
-      "",
-      "",
-      ""
+      "EVMultiplier",
+      "RequiresHydrogenPropellant",
+      "RadHardened"
    ],
-   "marineOpsValue": null,
-   "ECMValue": null,
-   "iconResource": "shipbuildericons/ICO_HydronTrap",
-   "modelResource": ""
+   "specialModuleValue": 1.5,
+   "iconResource": "shipbuildericons/ICO_HydronTrap"
 },
  {
    "dataName": "Magazine",
@@ -618,32 +426,18 @@
    "mass_tons": 150,
    "grouping": -1,
    "requiredProjectName": "Project_Magazine",
+   "minConsTier": 0,
    "powerRequirement_MW": 0,
-   "laserPowerBonus_MW": 0,
-   "thrustMultiplier": 1,
-   "EVMultiplier": 1,
-   "requiresHydrogenPropellant": null,
-   "requiresNuclearDrive": null,
-   "requiresFusionDrive": null,
-   "noCombatRepair": null,
    "weightedBuildMaterials": {
-      "water": null,
       "volatiles": 0.1,
       "metals": 0.8,
-      "nobleMetals": 0.1,
-      "fissiles": null,
-      "antimatter": null,
-      "exotics": null
+      "nobleMetals": 0.1
    },
    "specialModuleRules": [
       "Magazine",
-      "",
-      ""
+      "RadHardened"
    ],
-   "marineOpsValue": null,
-   "ECMValue": null,
-   "iconResource": "shipbuildericons/ICO_Magazine",
-   "modelResource": ""
+   "iconResource": "shipbuildericons/ICO_Magazine"
 },
  {
    "dataName": "ComponentArmor",
@@ -652,32 +446,20 @@
    "mass_tons": 500,
    "grouping": 2,
    "requiredProjectName": "Project_ComponentArmor",
+   "minConsTier": 0,
    "powerRequirement_MW": 0,
-   "laserPowerBonus_MW": 0,
-   "thrustMultiplier": 1,
-   "EVMultiplier": 1,
-   "requiresHydrogenPropellant": null,
-   "requiresNuclearDrive": null,
-   "requiresFusionDrive": null,
-   "noCombatRepair": null,
+   "noCombatRepair": true,
    "weightedBuildMaterials": {
-      "water": null,
       "volatiles": 0.5,
-      "metals": 0.5,
-      "nobleMetals": null,
-      "fissiles": null,
-      "antimatter": null,
-      "exotics": null
+      "metals": 0.5
    },
    "specialModuleRules": [
       "ComponentArmor",
-      "",
-      ""
+      "RadHardened",
+      "ImmuneToDamage"
    ],
-   "marineOpsValue": null,
-   "ECMValue": null,
-   "iconResource": "shipbuildericons/ICO_ComponentArmor",
-   "modelResource": ""
+   "specialModuleValue": 0.75,
+   "iconResource": "shipbuildericons/ICO_ComponentArmor"
 },
  {
    "dataName": "SolarPlatformKit",
@@ -686,32 +468,18 @@
    "mass_tons": 200,
    "grouping": -1,
    "requiredProjectName": "Project_SolarPlatformKit",
+   "minConsTier": 0,
    "powerRequirement_MW": 0,
-   "laserPowerBonus_MW": 0,
-   "thrustMultiplier": 1,
-   "EVMultiplier": 1,
-   "requiresHydrogenPropellant": null,
-   "requiresNuclearDrive": null,
-   "requiresFusionDrive": null,
    "noCombatRepair": true,
    "weightedBuildMaterials": {
-      "water": null,
       "volatiles": 0.4,
       "metals": 0.4,
-      "nobleMetals": 0.2,
-      "fissiles": null,
-      "antimatter": null,
-      "exotics": null
+      "nobleMetals": 0.2
    },
    "specialModuleRules": [
-      "FoundSolarPlatform",
-      "",
-      ""
+      "FoundSolarPlatform"
    ],
-   "marineOpsValue": null,
-   "ECMValue": null,
-   "iconResource": "shipbuildericons/ICO_SolarPlatformKit",
-   "modelResource": ""
+   "iconResource": "shipbuildericons/ICO_SolarPlatformKit"
 },
  {
    "dataName": "SolarOutpostKit",
@@ -720,32 +488,18 @@
    "mass_tons": 250,
    "grouping": -1,
    "requiredProjectName": "Project_SolarOutpostKit",
+   "minConsTier": 0,
    "powerRequirement_MW": 0,
-   "laserPowerBonus_MW": 0,
-   "thrustMultiplier": 1,
-   "EVMultiplier": 1,
-   "requiresHydrogenPropellant": null,
-   "requiresNuclearDrive": null,
-   "requiresFusionDrive": null,
    "noCombatRepair": true,
    "weightedBuildMaterials": {
-      "water": null,
       "volatiles": 0.4,
       "metals": 0.4,
-      "nobleMetals": 0.2,
-      "fissiles": null,
-      "antimatter": null,
-      "exotics": null
+      "nobleMetals": 0.2
    },
    "specialModuleRules": [
-      "FoundSolarOutpost",
-      "",
-      ""
+      "FoundSolarOutpost"
    ],
-   "marineOpsValue": null,
-   "ECMValue": null,
-   "iconResource": "shipbuildericons/ICO_SolarOutpostKit",
-   "modelResource": ""
+   "iconResource": "shipbuildericons/ICO_SolarOutpostKit"
 },
  {
    "dataName": "FissionPlatformKit",
@@ -754,32 +508,20 @@
    "mass_tons": 250,
    "grouping": -1,
    "requiredProjectName": "Project_FissionPlatformKit",
+   "minConsTier": 0,
    "powerRequirement_MW": 0,
-   "laserPowerBonus_MW": 0,
-   "thrustMultiplier": 1,
-   "EVMultiplier": 1,
-   "requiresHydrogenPropellant": null,
-   "requiresNuclearDrive": null,
-   "requiresFusionDrive": null,
    "noCombatRepair": true,
    "weightedBuildMaterials": {
       "water": 0.1,
       "volatiles": 0.25,
       "metals": 0.4,
       "nobleMetals": 0.2,
-      "fissiles": 0.05,
-      "antimatter": null,
-      "exotics": null
+      "fissiles": 0.05
    },
    "specialModuleRules": [
-      "FoundFissionPlatform",
-      "",
-      ""
+      "FoundFissionPlatform"
    ],
-   "marineOpsValue": null,
-   "ECMValue": null,
-   "iconResource": "shipbuildericons/ICO_FissionPlatformKit",
-   "modelResource": ""
+   "iconResource": "shipbuildericons/ICO_FissionPlatformKit"
 },
  {
    "dataName": "FissionOutpostKit",
@@ -788,32 +530,20 @@
    "mass_tons": 300,
    "grouping": -1,
    "requiredProjectName": "Project_FissionOutpostKit",
+   "minConsTier": 0,
    "powerRequirement_MW": 0,
-   "laserPowerBonus_MW": 0,
-   "thrustMultiplier": 1,
-   "EVMultiplier": 1,
-   "requiresHydrogenPropellant": null,
-   "requiresNuclearDrive": null,
-   "requiresFusionDrive": null,
    "noCombatRepair": true,
    "weightedBuildMaterials": {
       "water": 0.1,
       "volatiles": 0.25,
       "metals": 0.4,
       "nobleMetals": 0.2,
-      "fissiles": 0.05,
-      "antimatter": null,
-      "exotics": null
+      "fissiles": 0.05
    },
    "specialModuleRules": [
-      "FoundFissionOutpost",
-      "",
-      ""
+      "FoundFissionOutpost"
    ],
-   "marineOpsValue": null,
-   "ECMValue": null,
-   "iconResource": "shipbuildericons/ICO_FissionOutpostKit",
-   "modelResource": ""
+   "iconResource": "shipbuildericons/ICO_FissionOutpostKit"
 },
  {
    "dataName": "FusionPlatformKit",
@@ -822,32 +552,20 @@
    "mass_tons": 250,
    "grouping": -1,
    "requiredProjectName": "Project_FusionPlatformKit",
+   "minConsTier": 0,
    "powerRequirement_MW": 0,
-   "laserPowerBonus_MW": 0,
-   "thrustMultiplier": 1,
-   "EVMultiplier": 1,
-   "requiresHydrogenPropellant": null,
-   "requiresNuclearDrive": null,
-   "requiresFusionDrive": null,
    "noCombatRepair": true,
    "weightedBuildMaterials": {
       "water": 0.05,
       "volatiles": 0.2,
       "metals": 0.4,
       "nobleMetals": 0.33,
-      "fissiles": 0.02,
-      "antimatter": null,
-      "exotics": null
+      "fissiles": 0.02
    },
    "specialModuleRules": [
-      "FoundFusionPlatform",
-      "",
-      ""
+      "FoundFusionPlatform"
    ],
-   "marineOpsValue": null,
-   "ECMValue": null,
-   "iconResource": "shipbuildericons/ICO_FusionPlatformKit",
-   "modelResource": ""
+   "iconResource": "shipbuildericons/ICO_FusionPlatformKit"
 },
  {
    "dataName": "FusionOutpostKit",
@@ -856,32 +574,20 @@
    "mass_tons": 300,
    "grouping": -1,
    "requiredProjectName": "Project_FusionOutpostKit",
+   "minConsTier": 0,
    "powerRequirement_MW": 0,
-   "laserPowerBonus_MW": 0,
-   "thrustMultiplier": 1,
-   "EVMultiplier": 1,
-   "requiresHydrogenPropellant": null,
-   "requiresNuclearDrive": null,
-   "requiresFusionDrive": null,
    "noCombatRepair": true,
    "weightedBuildMaterials": {
       "water": 0.05,
       "volatiles": 0.2,
       "metals": 0.4,
       "nobleMetals": 0.33,
-      "fissiles": 0.02,
-      "antimatter": null,
-      "exotics": null
+      "fissiles": 0.02
    },
    "specialModuleRules": [
-      "FoundFusionOutpost",
-      "",
-      ""
+      "FoundFusionOutpost"
    ],
-   "marineOpsValue": null,
-   "ECMValue": null,
-   "iconResource": "shipbuildericons/ICO_FusionOutpostKit",
-   "modelResource": ""
+   "iconResource": "shipbuildericons/ICO_FusionOutpostKit"
 },
  {
    "dataName": "AutomatedSolarPlatformKit",
@@ -890,32 +596,18 @@
    "mass_tons": 250,
    "grouping": -1,
    "requiredProjectName": "Project_AutomatedSolarPlatformKit",
+   "minConsTier": 0,
    "powerRequirement_MW": 0,
-   "laserPowerBonus_MW": 0,
-   "thrustMultiplier": 1,
-   "EVMultiplier": 1,
-   "requiresHydrogenPropellant": null,
-   "requiresNuclearDrive": null,
-   "requiresFusionDrive": null,
    "noCombatRepair": true,
    "weightedBuildMaterials": {
-      "water": null,
       "volatiles": 0.4,
       "metals": 0.4,
-      "nobleMetals": 0.2,
-      "fissiles": null,
-      "antimatter": null,
-      "exotics": null
+      "nobleMetals": 0.2
    },
    "specialModuleRules": [
-      "FoundAutomatedSolarPlatform",
-      "",
-      ""
+      "FoundAutomatedSolarPlatform"
    ],
-   "marineOpsValue": null,
-   "ECMValue": null,
-   "iconResource": "shipbuildericons/ICO_AutomatedSolarPlatformKit",
-   "modelResource": ""
+   "iconResource": "shipbuildericons/ICO_AutomatedSolarPlatformKit"
 },
  {
    "dataName": "AutomatedSolarOutpostKit",
@@ -924,32 +616,18 @@
    "mass_tons": 1200,
    "grouping": -1,
    "requiredProjectName": "Project_AutomatedSolarOutpostKit",
+   "minConsTier": 0,
    "powerRequirement_MW": 0,
-   "laserPowerBonus_MW": 0,
-   "thrustMultiplier": 1,
-   "EVMultiplier": 1,
-   "requiresHydrogenPropellant": null,
-   "requiresNuclearDrive": null,
-   "requiresFusionDrive": null,
    "noCombatRepair": true,
    "weightedBuildMaterials": {
-      "water": null,
       "volatiles": 0.4,
       "metals": 0.4,
-      "nobleMetals": 0.2,
-      "fissiles": null,
-      "antimatter": null,
-      "exotics": null
+      "nobleMetals": 0.2
    },
    "specialModuleRules": [
-      "FoundAutomatedSolarOutpost",
-      "",
-      ""
+      "FoundAutomatedSolarOutpost"
    ],
-   "marineOpsValue": null,
-   "ECMValue": null,
-   "iconResource": "shipbuildericons/ICO_AutomatedSolarOutpostKit",
-   "modelResource": ""
+   "iconResource": "shipbuildericons/ICO_AutomatedSolarOutpostKit"
 },
  {
    "dataName": "AutomatedFissionPlatformKit",
@@ -958,32 +636,20 @@
    "mass_tons": 300,
    "grouping": -1,
    "requiredProjectName": "Project_AutomatedFissionPlatformKit",
+   "minConsTier": 0,
    "powerRequirement_MW": 0,
-   "laserPowerBonus_MW": 0,
-   "thrustMultiplier": 1,
-   "EVMultiplier": 1,
-   "requiresHydrogenPropellant": null,
-   "requiresNuclearDrive": null,
-   "requiresFusionDrive": null,
    "noCombatRepair": true,
    "weightedBuildMaterials": {
       "water": 0.1,
       "volatiles": 0.25,
       "metals": 0.4,
       "nobleMetals": 0.2,
-      "fissiles": 0.05,
-      "antimatter": null,
-      "exotics": null
+      "fissiles": 0.05
    },
    "specialModuleRules": [
-      "FoundAutomatedFissionPlatform",
-      "",
-      ""
+      "FoundAutomatedFissionPlatform"
    ],
-   "marineOpsValue": null,
-   "ECMValue": null,
-   "iconResource": "shipbuildericons/ICO_AutomatedFissionPlatformKit",
-   "modelResource": ""
+   "iconResource": "shipbuildericons/ICO_AutomatedFissionPlatformKit"
 },
  {
    "dataName": "AutomatedFissionOutpostKit",
@@ -992,32 +658,20 @@
    "mass_tons": 1800,
    "grouping": -1,
    "requiredProjectName": "Project_AutomatedFissionOutpostKit",
+   "minConsTier": 0,
    "powerRequirement_MW": 0,
-   "laserPowerBonus_MW": 0,
-   "thrustMultiplier": 1,
-   "EVMultiplier": 1,
-   "requiresHydrogenPropellant": null,
-   "requiresNuclearDrive": null,
-   "requiresFusionDrive": null,
    "noCombatRepair": true,
    "weightedBuildMaterials": {
       "water": 0.1,
       "volatiles": 0.25,
       "metals": 0.4,
       "nobleMetals": 0.2,
-      "fissiles": 0.05,
-      "antimatter": null,
-      "exotics": null
+      "fissiles": 0.05
    },
    "specialModuleRules": [
-      "FoundAutomatedFissionOutpost",
-      "",
-      ""
+      "FoundAutomatedFissionOutpost"
    ],
-   "marineOpsValue": null,
-   "ECMValue": null,
-   "iconResource": "shipbuildericons/ICO_AutomatedFissionOutpostKit",
-   "modelResource": ""
+   "iconResource": "shipbuildericons/ICO_AutomatedFissionOutpostKit"
 },
  {
    "dataName": "ElectronicCountermeasures1",
@@ -1026,32 +680,18 @@
    "mass_tons": 10,
    "grouping": 9,
    "requiredProjectName": "Project_ECM1",
+   "minConsTier": 0,
    "powerRequirement_MW": 2,
-   "laserPowerBonus_MW": 0,
-   "thrustMultiplier": 1,
-   "EVMultiplier": 1,
-   "requiresHydrogenPropellant": null,
-   "requiresNuclearDrive": null,
-   "requiresFusionDrive": null,
-   "noCombatRepair": null,
    "weightedBuildMaterials": {
-      "water": null,
       "volatiles": 0.2,
       "metals": 0.4,
-      "nobleMetals": 0.4,
-      "fissiles": null,
-      "antimatter": null,
-      "exotics": null
+      "nobleMetals": 0.4
    },
    "specialModuleRules": [
-      "ECM",
-      "",
-      ""
+      "ECM"
    ],
-   "marineOpsValue": null,
-   "ECMValue": 0.2,
-   "iconResource": "shipbuildericons/ICO_ECM_A",
-   "modelResource": ""
+   "specialModuleValue": 0.2,
+   "iconResource": "shipbuildericons/ICO_ECM_A"
 },
  {
    "dataName": "ElectronicCountermeasures2",
@@ -1060,32 +700,18 @@
    "mass_tons": 10,
    "grouping": 9,
    "requiredProjectName": "Project_ECM2",
+   "minConsTier": 0,
    "powerRequirement_MW": 3,
-   "laserPowerBonus_MW": 0,
-   "thrustMultiplier": 1,
-   "EVMultiplier": 1,
-   "requiresHydrogenPropellant": null,
-   "requiresNuclearDrive": null,
-   "requiresFusionDrive": null,
-   "noCombatRepair": null,
    "weightedBuildMaterials": {
-      "water": null,
       "volatiles": 0.2,
       "metals": 0.4,
-      "nobleMetals": 0.4,
-      "fissiles": null,
-      "antimatter": null,
-      "exotics": null
+      "nobleMetals": 0.4
    },
    "specialModuleRules": [
-      "ECM",
-      "",
-      ""
+      "ECM"
    ],
-   "marineOpsValue": null,
-   "ECMValue": 0.4,
-   "iconResource": "shipbuildericons/ICO_ECM_B",
-   "modelResource": ""
+   "specialModuleValue": 0.4,
+   "iconResource": "shipbuildericons/ICO_ECM_B"
 },
  {
    "dataName": "ElectronicCountermeasures3",
@@ -1094,32 +720,158 @@
    "mass_tons": 10,
    "grouping": 9,
    "requiredProjectName": "Project_ECM3",
+   "minConsTier": 0,
    "powerRequirement_MW": 4,
-   "laserPowerBonus_MW": 0,
-   "thrustMultiplier": 1,
-   "EVMultiplier": 1,
-   "requiresHydrogenPropellant": null,
-   "requiresNuclearDrive": null,
-   "requiresFusionDrive": null,
-   "noCombatRepair": null,
    "weightedBuildMaterials": {
-      "water": null,
       "volatiles": 0.2,
       "metals": 0.4,
-      "nobleMetals": 0.4,
-      "fissiles": null,
-      "antimatter": null,
-      "exotics": null
+      "nobleMetals": 0.4
    },
    "specialModuleRules": [
-      "ECM",
-      "",
-      ""
+      "ECM"
    ],
-   "marineOpsValue": null,
-   "ECMValue": 0.6,
-   "iconResource": "shipbuildericons/ICO_ECM_C",
-   "modelResource": ""
+   "specialModuleValue": 0.6,
+   "iconResource": "shipbuildericons/ICO_ECM_C"
+},
+ {
+   "dataName": "FlagBridge",
+   "friendlyName": "Flag Bridge",
+   "crew": 18,
+   "mass_tons": 90,
+   "grouping": 14,
+   "requiredProjectName": "Project_FlagBridge",
+   "minConsTier": 2,
+   "powerRequirement_MW": 1,
+   "weightedBuildMaterials": {
+      "metals": 0.95,
+      "nobleMetals": 0.05
+   },
+   "specialModuleRules": [
+      "ReduceFleetMCConsumption"
+   ],
+   "specialModuleValue": 0.8,
+   "iconResource": "shipbuildericons/ICO_FlagBridge"
+},
+ {
+   "dataName": "TargetingComputer1",
+   "friendlyName": "Targeting Computer 1",
+   "crew": 1,
+   "mass_tons": 10,
+   "grouping": 10,
+   "requiredProjectName": "Project_TargetingComputer1",
+   "minConsTier": 0,
+   "powerRequirement_MW": 1,
+   "weightedBuildMaterials": {
+      "volatiles": 0.1,
+      "metals": 0.6,
+      "nobleMetals": 0.3
+   },
+   "specialModuleRules": [
+      "TargetingComputer"
+   ],
+   "specialModuleValue": 0.1,
+   "iconResource": "shipbuildericons/ICO_TargetingComputer1"
+},
+ {
+   "dataName": "TargetingComputer2",
+   "friendlyName": "Targeting Computer 2",
+   "crew": 1,
+   "mass_tons": 10,
+   "grouping": 10,
+   "requiredProjectName": "Project_TargetingComputer2",
+   "minConsTier": 0,
+   "powerRequirement_MW": 1,
+   "weightedBuildMaterials": {
+      "volatiles": 0.1,
+      "metals": 0.6,
+      "nobleMetals": 0.3
+   },
+   "specialModuleRules": [
+      "TargetingComputer"
+   ],
+   "specialModuleValue": 0.3,
+   "iconResource": "shipbuildericons/ICO_TargetingComputer2"
+},
+ {
+   "dataName": "TargetingComputer3",
+   "friendlyName": "Targeting Computer 3",
+   "crew": 1,
+   "mass_tons": 10,
+   "grouping": 10,
+   "requiredProjectName": "Project_TargetingComputer3",
+   "minConsTier": 0,
+   "powerRequirement_MW": 1,
+   "weightedBuildMaterials": {
+      "volatiles": 0.1,
+      "metals": 0.6,
+      "nobleMetals": 0.3
+   },
+   "specialModuleRules": [
+      "TargetingComputer"
+   ],
+   "specialModuleValue": 0.5,
+   "iconResource": "shipbuildericons/ICO_TargetingComputer3"
+},
+ {
+   "dataName": "ArmorStruts",
+   "friendlyName": "Armor Struts",
+   "crew": 0,
+   "mass_tons": 100,
+   "grouping": 12,
+   "requiredProjectName": "Project_ArmorStruts",
+   "minConsTier": 0,
+   "powerRequirement_MW": 0,
+   "noCombatRepair": true,
+   "weightedBuildMaterials": {
+      "volatiles": 0.1,
+      "metals": 0.9
+   },
+   "specialModuleRules": [
+      "ArmorStruts"
+   ],
+   "specialModuleValue": 1,
+   "iconResource": "shipbuildericons/ICO_ArmorStruts"
+},
+ {
+   "dataName": "Cyclotron",
+   "friendlyName": "Cyclotron",
+   "crew": 3,
+   "mass_tons": 50,
+   "grouping": -1,
+   "requiredProjectName": "Project_Cyclotron",
+   "minConsTier": 0,
+   "powerRequirement_MW": 5,
+   "weightedBuildMaterials": {
+      "volatiles": 0.1,
+      "metals": 0.6,
+      "nobleMetals": 0.3
+   },
+   "specialModuleRules": [
+      "ParticleBeamPowerBonus",
+      "RadHardened"
+   ],
+   "specialModuleValue": 20,
+   "iconResource": "shipbuildericons/ICO_Cyclotron"
+},
+ {
+   "dataName": "VectorThrusters",
+   "friendlyName": "VectorThrusters",
+   "crew": 0,
+   "mass_tons": 20,
+   "grouping": 13,
+   "requiredProjectName": "Project_PatrolVessels",
+   "minConsTier": 0,
+   "powerRequirement_MW": 0,
+   "weightedBuildMaterials": {
+      "volatiles": 0.1,
+      "metals": 0.9
+   },
+   "specialModuleRules": [
+      "RotationalThrust",
+      "ImmuneToDamage"
+   ],
+   "specialModuleValue": 1500000,
+   "iconResource": "shipbuildericons/ICO_AdditionalVectorThrusters"
 },
  {
    "dataName": "HydraInfiltrationPod",
@@ -1128,32 +880,22 @@
    "mass_tons": 10,
    "grouping": 5,
    "requiredProjectName": "Project_AlienMasterProject",
+   "minConsTier": 0,
    "powerRequirement_MW": 0,
-   "laserPowerBonus_MW": 0,
-   "thrustMultiplier": 1,
-   "EVMultiplier": 1,
-   "requiresHydrogenPropellant": null,
-   "requiresNuclearDrive": null,
-   "requiresFusionDrive": null,
    "noCombatRepair": true,
    "weightedBuildMaterials": {
       "water": 0.1,
       "volatiles": 0.6,
       "metals": 0.25,
-      "nobleMetals": 0.05,
-      "fissiles": null,
-      "antimatter": null,
-      "exotics": null
+      "nobleMetals": 0.05
    },
    "specialModuleRules": [
       "Crashdown",
       "LandHydra",
-      "ImmunetoAerobrakingDamage"
+      "ImmunetoAerobrakingDamage",
+      "RadHardened"
    ],
-   "marineOpsValue": null,
-   "ECMValue": null,
-   "iconResource": "shipbuildericons/ICO_Unknown",
-   "modelResource": ""
+   "iconResource": "shipbuildericons/ICO_Unknown"
 },
  {
    "dataName": "SalamanderTerrorUnitPod",
@@ -1162,32 +904,23 @@
    "mass_tons": 10,
    "grouping": 6,
    "requiredProjectName": "Project_AlienMasterProject",
+   "minConsTier": 0,
    "powerRequirement_MW": 0,
-   "laserPowerBonus_MW": 0,
-   "thrustMultiplier": 1,
-   "EVMultiplier": 1,
-   "requiresHydrogenPropellant": null,
-   "requiresNuclearDrive": null,
-   "requiresFusionDrive": null,
    "noCombatRepair": true,
    "weightedBuildMaterials": {
       "water": 0.1,
       "volatiles": 0.6,
       "metals": 0.25,
-      "nobleMetals": 0.05,
-      "fissiles": null,
-      "antimatter": null,
-      "exotics": null
+      "nobleMetals": 0.05
    },
    "specialModuleRules": [
       "Crashdown",
       "Assault",
-      "ImmunetoAerobrakingDamage"
+      "ImmunetoAerobrakingDamage",
+      "RadHardened"
    ],
-   "marineOpsValue": 9,
-   "ECMValue": null,
-   "iconResource": "shipbuildericons/ICO_Unknown",
-   "modelResource": ""
+   "specialModuleValue": 9,
+   "iconResource": "shipbuildericons/ICO_Unknown"
 },
  {
    "dataName": "AlienArmyPod",
@@ -1196,32 +929,23 @@
    "mass_tons": 10000,
    "grouping": 7,
    "requiredProjectName": "Project_AlienMasterProject",
+   "minConsTier": 3,
    "powerRequirement_MW": 0,
-   "laserPowerBonus_MW": 0,
-   "thrustMultiplier": 1,
-   "EVMultiplier": 1,
-   "requiresHydrogenPropellant": null,
-   "requiresNuclearDrive": null,
-   "requiresFusionDrive": null,
    "noCombatRepair": true,
    "weightedBuildMaterials": {
       "water": 0.1,
       "volatiles": 0.35,
       "metals": 0.4,
       "nobleMetals": 0.125,
-      "fissiles": null,
-      "antimatter": null,
       "exotics": 0.025
    },
    "specialModuleRules": [
-      "LandArmy",
+      "MarineOpsDefenseOnly",
       "ImmunetoAerobrakingDamage",
-      "MarineOpsDefenseOnly"
+      "LandArmy"
    ],
-   "marineOpsValue": 50,
-   "ECMValue": null,
-   "iconResource": "shipbuildericons/ICO_Unknown",
-   "modelResource": ""
+   "specialModuleValue": 50,
+   "iconResource": "shipbuildericons/ICO_Unknown"
 },
  {
    "dataName": "AlienFusionOutpostKit",
@@ -1230,32 +954,20 @@
    "mass_tons": 500,
    "grouping": -1,
    "requiredProjectName": "Project_AlienMasterProject",
+   "minConsTier": 0,
    "powerRequirement_MW": 0,
-   "laserPowerBonus_MW": 0,
-   "thrustMultiplier": 1,
-   "EVMultiplier": 1,
-   "requiresHydrogenPropellant": null,
-   "requiresNuclearDrive": null,
-   "requiresFusionDrive": null,
    "noCombatRepair": true,
    "weightedBuildMaterials": {
       "water": 0.05,
-      "volatiles": 0.2,
+      "volatiles": 0.24,
       "metals": 0.4,
-      "nobleMetals": 0.34,
-      "fissiles": 0.01,
-      "antimatter": null,
-      "exotics": null
+      "nobleMetals": 0.3,
+      "fissiles": 0.01
    },
    "specialModuleRules": [
-      "FoundFusionOutpost",
-      "",
-      ""
+      "FoundFusionOutpost"
    ],
-   "marineOpsValue": null,
-   "ECMValue": null,
-   "iconResource": "shipbuildericons/ICO_Unknown",
-   "modelResource": ""
+   "iconResource": "shipbuildericons/ICO_Unknown"
 },
  {
    "dataName": "AlienFusionPlatformKit",
@@ -1264,66 +976,44 @@
    "mass_tons": 500,
    "grouping": -1,
    "requiredProjectName": "Project_AlienMasterProject",
+   "minConsTier": 0,
    "powerRequirement_MW": 0,
-   "laserPowerBonus_MW": 0,
-   "thrustMultiplier": 1,
-   "EVMultiplier": 1,
-   "requiresHydrogenPropellant": null,
-   "requiresNuclearDrive": null,
-   "requiresFusionDrive": null,
    "noCombatRepair": true,
    "weightedBuildMaterials": {
       "water": 0.05,
-      "volatiles": 0.2,
+      "volatiles": 0.24,
       "metals": 0.4,
-      "nobleMetals": 0.34,
-      "fissiles": 0.01,
-      "antimatter": null,
-      "exotics": null
+      "nobleMetals": 0.3,
+      "fissiles": 0.01
    },
    "specialModuleRules": [
-      "FoundFusionPlatform",
-      "",
-      ""
+      "FoundFusionPlatform"
    ],
-   "marineOpsValue": null,
-   "ECMValue": null,
-   "iconResource": "shipbuildericons/ICO_Unknown",
-   "modelResource": ""
+   "iconResource": "shipbuildericons/ICO_Unknown"
 },
  {
-   "dataName": "AlienNeutroniumSpiker",
-   "friendlyName": "Alien Neutronium Spiker",
+   "dataName": "AlienMuonSpiker",
+   "friendlyName": "Alien Muon Spiker",
    "crew": 0,
-   "mass_tons": 30,
+   "mass_tons": 10,
    "grouping": 3,
    "requiredProjectName": "Project_AlienMasterProject",
+   "minConsTier": 0,
    "powerRequirement_MW": 0,
-   "laserPowerBonus_MW": 0,
-   "thrustMultiplier": 1.35,
-   "EVMultiplier": 1,
-   "requiresHydrogenPropellant": null,
-   "requiresNuclearDrive": null,
-   "requiresFusionDrive": null,
-   "noCombatRepair": null,
    "weightedBuildMaterials": {
       "water": 0.1,
       "volatiles": 0.2,
-      "metals": 0.3,
-      "nobleMetals": 0.39,
-      "fissiles": 0.01,
-      "antimatter": null,
-      "exotics": null
+      "metals": 0.5,
+      "nobleMetals": 0.19998,
+      "fissiles": 0.00002
    },
    "specialModuleRules": [
-      "",
-      "",
-      ""
+      "ThrustMultiplier",
+      "RequiresFusionDrive",
+      "RadHardened"
    ],
-   "marineOpsValue": null,
-   "ECMValue": null,
-   "iconResource": "shipbuildericons/ICO_Unknown",
-   "modelResource": ""
+   "specialModuleValue": 1.35,
+   "iconResource": "shipbuildericons/ICO_Unknown"
 },
  {
    "dataName": "AlienSlushHydrogenTankage",
@@ -1332,32 +1022,20 @@
    "mass_tons": 10,
    "grouping": 4,
    "requiredProjectName": "Project_AlienMasterProject",
+   "minConsTier": 0,
    "powerRequirement_MW": 0,
-   "laserPowerBonus_MW": 0,
-   "thrustMultiplier": 1,
-   "EVMultiplier": 1.5,
-   "requiresHydrogenPropellant": true,
-   "requiresNuclearDrive": null,
-   "requiresFusionDrive": null,
-   "noCombatRepair": null,
    "weightedBuildMaterials": {
-      "water": null,
       "volatiles": 0.35,
       "metals": 0.35,
-      "nobleMetals": 0.3,
-      "fissiles": null,
-      "antimatter": null,
-      "exotics": null
+      "nobleMetals": 0.3
    },
    "specialModuleRules": [
-      "",
-      "",
-      ""
+      "EVMultiplier",
+      "RequiresHydrogenPropellant",
+      "RadHardened"
    ],
-   "marineOpsValue": null,
-   "ECMValue": null,
-   "iconResource": "shipbuildericons/ICO_Unknown",
-   "modelResource": ""
+   "specialModuleValue": 1.5,
+   "iconResource": "shipbuildericons/ICO_Unknown"
 },
  {
    "dataName": "AlienHydronTrap",
@@ -1366,32 +1044,21 @@
    "mass_tons": 10,
    "grouping": 4,
    "requiredProjectName": "Project_AlienMasterProject",
+   "minConsTier": 0,
    "powerRequirement_MW": 0,
-   "laserPowerBonus_MW": 0,
-   "thrustMultiplier": 1,
-   "EVMultiplier": 2,
-   "requiresHydrogenPropellant": true,
-   "requiresNuclearDrive": null,
-   "requiresFusionDrive": null,
-   "noCombatRepair": null,
    "weightedBuildMaterials": {
-      "water": null,
       "volatiles": 0.25,
       "metals": 0.35,
       "nobleMetals": 0.35,
-      "fissiles": null,
-      "antimatter": null,
       "exotics": 0.05
    },
    "specialModuleRules": [
-      "",
-      "",
-      ""
+      "EVMultiplier",
+      "RequiresHydrogenPropellant",
+      "RadHardened"
    ],
-   "marineOpsValue": null,
-   "ECMValue": null,
-   "iconResource": "shipbuildericons/ICO_Unknown",
-   "modelResource": ""
+   "specialModuleValue": 2,
+   "iconResource": "shipbuildericons/ICO_Unknown"
 },
  {
    "dataName": "AlienSurveillanceModule",
@@ -1400,32 +1067,17 @@
    "mass_tons": 20,
    "grouping": 8,
    "requiredProjectName": "Project_AlienMasterProject",
+   "minConsTier": 0,
    "powerRequirement_MW": 0,
-   "laserPowerBonus_MW": 0,
-   "thrustMultiplier": 1,
-   "EVMultiplier": 1,
-   "requiresHydrogenPropellant": null,
-   "requiresNuclearDrive": null,
-   "requiresFusionDrive": null,
-   "noCombatRepair": null,
    "weightedBuildMaterials": {
-      "water": null,
       "volatiles": 0.1,
       "metals": 0.6,
-      "nobleMetals": 0.3,
-      "fissiles": null,
-      "antimatter": null,
-      "exotics": null
+      "nobleMetals": 0.3
    },
    "specialModuleRules": [
-      "Surveillance",
-      "",
-      ""
+      "Surveillance"
    ],
-   "marineOpsValue": null,
-   "ECMValue": null,
-   "iconResource": "shipbuildericons/ICO_Unknown",
-   "modelResource": ""
+   "iconResource": "shipbuildericons/ICO_Unknown"
 },
  {
    "dataName": "AlienECM",
@@ -1434,99 +1086,83 @@
    "mass_tons": 10,
    "grouping": 9,
    "requiredProjectName": "Project_AlienMasterProject",
+   "minConsTier": 0,
    "powerRequirement_MW": 2,
-   "laserPowerBonus_MW": 0,
-   "thrustMultiplier": 1,
-   "EVMultiplier": 1,
-   "requiresHydrogenPropellant": null,
-   "requiresNuclearDrive": null,
-   "requiresFusionDrive": null,
-   "noCombatRepair": null,
    "weightedBuildMaterials": {
-      "water": null,
       "volatiles": 0.2,
       "metals": 0.4,
-      "nobleMetals": 0.4,
-      "fissiles": null,
-      "antimatter": null,
-      "exotics": null
+      "nobleMetals": 0.4
+   },
+   "specialModuleRules": [
+      "ECM"
+   ],
+   "specialModuleValue": 0.6,
+   "iconResource": "shipbuildericons/ICO_Unknown"
+},
+ {
+   "dataName": "AlienTargetingComputer",
+   "friendlyName": "Alien Targeting Computer",
+   "crew": 1,
+   "mass_tons": 10,
+   "grouping": 10,
+   "requiredProjectName": "Project_AlienMasterProject",
+   "minConsTier": 0,
+   "powerRequirement_MW": 1,
+   "weightedBuildMaterials": {
+      "volatiles": 0.1,
+      "metals": 0.7,
+      "nobleMetals": 0.2
    },
    "specialModuleRules": [
-      "ECM",
-      "",
-      ""
+      "TargetingComputer"
    ],
-   "marineOpsValue": null,
-   "ECMValue": 0.6,
-   "iconResource": "shipbuildericons/ICO_Unknown",
-   "modelResource": ""
+   "specialModuleValue": 0.5,
+   "iconResource": "shipbuildericons/ICO_Unknown"
 },
  {
    "dataName": "AlienRepairBay",
    "friendlyName": "Alien Repair Bay",
-   "crew": 1,
+   "crew": 4,
    "mass_tons": 500,
    "grouping": -1,
    "requiredProjectName": "Project_AlienMasterProject",
+   "minConsTier": 0,
    "powerRequirement_MW": 0,
-   "laserPowerBonus_MW": 0,
-   "thrustMultiplier": 1,
-   "EVMultiplier": 1,
-   "requiresHydrogenPropellant": null,
-   "requiresNuclearDrive": null,
-   "requiresFusionDrive": null,
-   "noCombatRepair": null,
    "weightedBuildMaterials": {
-      "water": null,
       "volatiles": 0.2,
       "metals": 0.6,
-      "nobleMetals": 0.2,
-      "fissiles": null,
-      "antimatter": null,
-      "exotics": null
+      "nobleMetals": 0.2
    },
    "specialModuleRules": [
-      "Repair",
-      "",
-      ""
+      "Repair"
    ],
-   "marineOpsValue": null,
-   "ECMValue": null,
-   "iconResource": "shipbuildericons/ICO_Unknown",
-   "modelResource": ""
+   "iconResource": "shipbuildericons/ICO_Unknown"
 },
  {
-   "dataName": "Empty",
-   "friendlyName": "Empty",
-   "crew": 0,
-   "mass_tons": 0,
+   "dataName": "AlienMagazine",
+   "friendlyName": "Alien Magazine",
+   "crew": 1,
+   "mass_tons": 100,
    "grouping": -1,
-   "requiredProjectName": "",
-   "powerRequirement_MW": null,
-   "laserPowerBonus_MW": 0,
-   "thrustMultiplier": 1,
-   "EVMultiplier": 1,
-   "requiresHydrogenPropellant": null,
-   "requiresNuclearDrive": null,
-   "requiresFusionDrive": null,
-   "noCombatRepair": null,
+   "requiredProjectName": "Project_AlienMasterProject",
+   "minConsTier": 0,
+   "powerRequirement_MW": 0,
    "weightedBuildMaterials": {
-      "water": null,
-      "volatiles": null,
-      "metals": null,
-      "nobleMetals": null,
-      "fissiles": null,
-      "antimatter": null,
-      "exotics": null
+      "volatiles": 0.1,
+      "metals": 0.9
    },
    "specialModuleRules": [
-      "",
-      "",
-      ""
+      "Magazine",
+      "RadHardened"
    ],
-   "marineOpsValue": null,
-   "ECMValue": null,
-   "iconResource": "",
-   "modelResource": ""
+   "iconResource": "shipbuildericons/ICO_Unknown"
+},
+ {
+   "dataName": "Empty",
+   "friendlyName": "Empty",
+   "crew": 0,
+   "mass_tons": 0,
+   "grouping": -1,
+   "minConsTier": 0
 }
 ]
\ No newline at end of file