diff --git a/.gitignore b/.gitignore
index 7f66379..d03a1e0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,4 @@ node_modules
 node_modules/*
 *.log
 .idea
-
+.vscode/
diff --git a/dist/index.js b/dist/index.js
index dd1b479..f65c463 100644
--- a/dist/index.js
+++ b/dist/index.js
@@ -16,7 +16,7 @@ module.exports = {
         hardness: 35,
         hullMass: 35,
         masslock: 7,
-        pipSpeed: .13625,
+        pipSpeed: .13636363636364,
         pitch: 38,
         roll: 100,
         yaw: 14,
@@ -106,7 +106,7 @@ module.exports = {
         hardness: 65,
         hullMass: 400,
         masslock: 13,
-        pipSpeed: .085,
+        pipSpeed: .08695652173913,
         pitch: 39,
         roll: 92,
         yaw: 16,
@@ -207,6 +207,123 @@ module.exports = {
         internal: [ "04", "4e", "02", "", "2h", "", "", "" ]
       }
     },
+    alliance_challenger: {
+      edID: 128816588,
+      eddbID: 33,
+      properties: {
+        name: "Alliance Challenger",
+        manufacturer: "Lakon",
+        class: 2,
+        hullCost: 28041035,
+        speed: 130,
+        boost: 310,
+        boostEnergy: 19,
+        baseShieldStrength: 220,
+        baseArmour: 300,
+        hardness: 65,
+        hullMass: 450,
+        masslock: 13,
+        pipSpeed: .0875,
+        pitch: 32,
+        roll: 90,
+        yaw: 16,
+        crew: 2
+      },
+      retailCost: 30472265,
+      requirements: {
+        horizons: true
+      },
+      bulkheads: [ {
+        id: "0K",
+        edID: 128816590,
+        eddbID: 1640,
+        grp: "bh",
+        cost: 0,
+        mass: 0,
+        explres: -.4,
+        kinres: -.2,
+        thermres: 0,
+        hullboost: .8
+      }, {
+        id: "0P",
+        edID: 128816591,
+        eddbID: 1641,
+        grp: "bh",
+        cost: 6803170,
+        mass: 40,
+        explres: -.4,
+        kinres: -.2,
+        thermres: 0,
+        hullboost: 1.52
+      }, {
+        id: "0Q",
+        edID: 128816592,
+        eddbID: 1642,
+        grp: "bh",
+        cost: 15307134,
+        mass: 78,
+        explres: -.4,
+        kinres: -.2,
+        thermres: 0,
+        hullboost: 2.5
+      }, {
+        id: "0R",
+        edID: 128816593,
+        eddbID: 1643,
+        grp: "bh",
+        cost: 36175859,
+        mass: 78,
+        explres: -.5,
+        kinres: -.75,
+        thermres: .5,
+        hullboost: 2.5
+      }, {
+        id: "0S",
+        edID: 128816594,
+        eddbID: 1644,
+        grp: "bh",
+        cost: 40087682,
+        mass: 78,
+        explres: .2,
+        kinres: .25,
+        thermres: -.4,
+        hullboost: 2.5
+      } ],
+      slots: {
+        standard: [ 6, 6, 5, 5, 6, 4, 4 ],
+        hardpoints: [ 3, 2, 2, 2, 1, 1, 1, 0, 0, 0, 0 ],
+        internal: [ 6, 6, 3, 3, 2, 2, {
+          class: 4,
+          name: "Military",
+          eligible: {
+            hr: 1,
+            scb: 1,
+            mrp: 1
+          }
+        }, {
+          class: 4,
+          name: "Military",
+          eligible: {
+            hr: 1,
+            scb: 1,
+            mrp: 1
+          }
+        }, {
+          class: 4,
+          name: "Military",
+          eligible: {
+            hr: 1,
+            scb: 1,
+            mrp: 1
+          }
+        } ]
+      },
+      defaults: {
+        standard: [ "6E", "6E", "5E", "5E", "6E", "4E", "4C" ],
+        hardpoints: [ 17, 0, 17, 0, 0, 0, 0, 0, 0, 0 ],
+        internal: [ "04", "4h", "01", "01", "2h", "", "", "", "" ]
+      }
+    },
     anaconda: {
       edID: 128049363,
       eddbID: 2,
@@ -223,7 +340,7 @@ module.exports = {
         hardness: 65,
         hullMass: 400,
         masslock: 23,
-        pipSpeed: .13875,
+        pipSpeed: .13888888888889,
         fighterHangars: true,
         pitch: 25,
         roll: 60,
@@ -824,7 +941,7 @@ module.exports = {
         hardness: 42,
         hullMass: 260,
         masslock: 10,
-        pipSpeed: .09625,
+        pipSpeed: .098214285714286,
         pitch: 35,
         roll: 90,
         yaw: 13,
@@ -914,7 +1031,7 @@ module.exports = {
         hardness: 40,
         hullMass: 170,
         masslock: 8,
-        pipSpeed: .09875,
+        pipSpeed: .096153846153846,
         pitch: 42,
         roll: 100,
         yaw: 15,
@@ -1207,7 +1324,7 @@ module.exports = {
         hardness: 60,
         hullMass: 480,
         masslock: 14,
-        pipSpeed: .11125,
+        pipSpeed: .071428571428571,
         pitch: 38,
         roll: 90,
         yaw: 19,
@@ -1426,7 +1543,7 @@ module.exports = {
         hardness: 60,
         hullMass: 580,
         masslock: 14,
-        pipSpeed: .0725,
+        pipSpeed: .11111111111111,
         pitch: 30,
         roll: 80,
         yaw: 14,
@@ -1535,7 +1652,7 @@ module.exports = {
         hardness: 60,
         hullMass: 580,
         masslock: 14,
-        pipSpeed: .1025,
+        pipSpeed: .10294117647059,
         fighterHangars: true,
         pitch: 25,
         roll: 80,
@@ -1653,7 +1770,7 @@ module.exports = {
         hardness: 70,
         hullMass: 250,
         masslock: 12,
-        pipSpeed: .03875,
+        pipSpeed: .038461538461538,
         pitch: 38,
         roll: 90,
         yaw: 12,
@@ -1926,7 +2043,7 @@ module.exports = {
         hardness: 30,
         hullMass: 35,
         masslock: 7,
-        pipSpeed: .05375,
+        pipSpeed: .053571428571429,
         pitch: 38,
         roll: 90,
         yaw: 16,
@@ -2302,6 +2419,97 @@ module.exports = {
         internal: [ "03", "03", "02", "44", "00", "2h" ]
       }
     },
+    krait_mkii: {
+      edID: 128816567,
+      eddbID: 17,
+      properties: {
+        name: "Krait MkII",
+        manufacturer: "Faulcon DeLacy",
+        class: 2,
+        hullCost: 42409425,
+        speed: 150,
+        boost: 330,
+        boostEnergy: 13,
+        baseShieldStrength: 220,
+        baseArmour: 220,
+        hardness: 55,
+        hullMass: 320,
+        masslock: 17,
+        pipSpeed: .09375,
+        fighterHangars: true,
+        pitch: 26,
+        roll: 90,
+        yaw: 10,
+        crew: 3
+      },
+      retailCost: 45814205,
+      bulkheads: [ {
+        id: "bO",
+        edID: 128816569,
+        eddbID: 808,
+        grp: "bh",
+        cost: 0,
+        mass: 0,
+        explres: -.4,
+        kinres: -.2,
+        thermres: 0,
+        hullboost: .8
+      }, {
+        id: "bP",
+        edID: 128816570,
+        eddbID: 809,
+        grp: "bh",
+        cost: 22791270,
+        mass: 36,
+        explres: -.4,
+        kinres: -.2,
+        thermres: 0,
+        hullboost: 1.52
+      }, {
+        id: "bQ",
+        edID: 128816571,
+        eddbID: 810,
+        grp: "bh",
+        cost: 51280360,
+        mass: 67,
+        explres: -.4,
+        kinres: -.2,
+        thermres: 0,
+        hullboost: 2.5
+      }, {
+        id: "bR",
+        edID: 128816572,
+        eddbID: 811,
+        grp: "bh",
+        cost: 121192590,
+        mass: 67,
+        explres: -.5,
+        kinres: -.75,
+        thermres: .5,
+        hullboost: 2.5
+      }, {
+        id: "bS",
+        edID: 128816573,
+        eddbID: 812,
+        grp: "bh",
+        cost: 134297570,
+        mass: 67,
+        explres: .2,
+        kinres: .25,
+        thermres: -.4,
+        hullboost: 2.5
+      } ],
+      slots: {
+        standard: [ 7, 6, 5, 4, 7, 6, 5 ],
+        hardpoints: [ 3, 3, 3, 2, 2, 0, 0, 0, 0 ],
+        internal: [ 6, 6, 5, 5, 4, 3, 3, 2 ]
+      },
+      defaults: {
+        standard: [ "7E", "6E", "5E", "4E", "7E", "6E", "5C" ],
+        hardpoints: [ 0, 0, 0, 17, 17, 0, 0, 0, 0 ],
+        internal: [ "4h", "04", "04", "03", 0, "2h", 0, "00" ]
+      }
+    },
     orca: {
       edID: 128049327,
       eddbID: 16,
@@ -2318,7 +2526,7 @@ module.exports = {
         hardness: 55,
         hullMass: 290,
         masslock: 16,
-        pipSpeed: .08375,
+        pipSpeed: .083333333333333,
         luxuryCabins: true,
         pitch: 25,
         roll: 55,
@@ -2431,7 +2639,7 @@ module.exports = {
         hardness: 65,
         hullMass: 350,
         masslock: 17,
-        pipSpeed: .0975,
+        pipSpeed: .097826086956522,
         pitch: 29,
         roll: 90,
         yaw: 10,
@@ -2521,7 +2729,7 @@ module.exports = {
         hardness: 20,
         hullMass: 25,
         masslock: 6,
-        pipSpeed: .1375,
+        pipSpeed: .13636363636364,
         pitch: 42,
         roll: 110,
         yaw: 16,
@@ -2611,7 +2819,7 @@ module.exports = {
         hardness: 35,
         hullMass: 155,
         masslock: 8,
-        pipSpeed: .1475,
+        pipSpeed: .14772727272727,
         pitch: 30,
         roll: 100,
         yaw: 17,
@@ -2701,7 +2909,7 @@ module.exports = {
         hardness: 54,
         hullMass: 350,
         masslock: 10,
-        pipSpeed: .16625,
+        pipSpeed: .16666666666667,
         pitch: 22,
         roll: 60,
         yaw: 22,
@@ -2791,7 +2999,7 @@ module.exports = {
         hardness: 65,
         hullMass: 850,
         masslock: 16,
-        pipSpeed: .17375,
+        pipSpeed: .17307692307692,
         fighterHangars: true,
         pitch: 20,
         roll: 20,
@@ -2882,7 +3090,7 @@ module.exports = {
         hardness: 75,
         hullMass: 1200,
         masslock: 26,
-        pipSpeed: .17375,
+        pipSpeed: .041666666666667,
         fighterHangars: true,
         pitch: 20,
         roll: 20,
@@ -2891,7 +3099,7 @@ module.exports = {
       },
       retailCost: 121454652,
       bulkheads: [ {
-        id: "Bx",
+        id: "1Q",
         edID: 128785621,
         eddbID: 1627,
         grp: "bh",
@@ -2902,7 +3110,7 @@ module.exports = {
         thermres: 0,
         hullboost: .8
       }, {
-        id: "By",
+        id: "1R",
         edID: 128785622,
         eddbID: 1628,
         grp: "bh",
@@ -2913,7 +3121,7 @@ module.exports = {
         thermres: 0,
         hullboost: 1.52
       }, {
-        id: "Bz",
+        id: "1S",
         edID: 128785623,
         eddbID: 1629,
         grp: "bh",
@@ -2924,7 +3132,7 @@ module.exports = {
         thermres: 0,
         hullboost: 2.5
       }, {
-        id: "BA",
+        id: "1T",
         edID: 128785624,
         eddbID: 1630,
         grp: "bh",
@@ -2935,7 +3143,7 @@ module.exports = {
         thermres: .5,
         hullboost: 2.5
       }, {
-        id: "BB",
+        id: "1U",
         edID: 128785625,
         eddbID: 1631,
         grp: "bh",
@@ -3087,7 +3295,7 @@ module.exports = {
         hardness: 35,
         hullMass: 190,
         masslock: 7,
-        pipSpeed: .0875,
+        pipSpeed: .087962962962963,
         pitch: 30,
         roll: 90,
         yaw: 12,
@@ -3185,7 +3393,7 @@ module.exports = {
         hardness: 55,
         hullMass: 230,
         masslock: 10,
-        pipSpeed: .02375,
+        pipSpeed: .023809523809524,
         pitch: 42,
         roll: 110,
         yaw: 17,
@@ -3727,7 +3935,7 @@ module.exports = {
         symbol: "Int_Powerplant_Size2_Class5"
       }, {
         class: 2,
-        cost: 162e3,
+        cost: 187360,
         edID: 128833988,
         eddbID: 895,
         eff: .5,
@@ -3741,7 +3949,7 @@ module.exports = {
         symbol: "Int_GuardianPowerplant_Size2"
       }, {
         class: 3,
-        cost: 291600,
+        cost: 468401,
         edID: 128833989,
         eddbID: 895,
         eff: .5,
@@ -3755,7 +3963,7 @@ module.exports = {
         symbol: "Int_GuardianPowerplant_Size3"
       }, {
         class: 4,
-        cost: 524880,
+        cost: 1686243,
         edID: 128833990,
         eddbID: 895,
         eff: .5,
@@ -3769,7 +3977,7 @@ module.exports = {
         symbol: "Int_GuardianPowerplant_Size4"
       }, {
         class: 5,
-        cost: 944790,
+        cost: 5058729,
         edID: 128833991,
         eddbID: 895,
         eff: .5,
@@ -3783,7 +3991,7 @@ module.exports = {
         symbol: "Int_GuardianPowerplant_Size5"
       }, {
         class: 6,
-        cost: 1700610,
+        cost: 15176184,
         edID: 128833992,
         eddbID: 895,
         eff: .5,
@@ -3797,7 +4005,7 @@ module.exports = {
         symbol: "Int_GuardianPowerplant_Size6"
       }, {
         class: 7,
-        cost: 3061100,
+        cost: 45528551,
         edID: 128833993,
         eddbID: 895,
         eff: .5,
@@ -3811,7 +4019,7 @@ module.exports = {
         symbol: "Int_GuardianPowerplant_Size7"
       }, {
         class: 8,
-        cost: 5509980,
+        cost: 136585652,
         edID: 128833994,
         eddbID: 895,
         eff: .5,
@@ -6382,7 +6590,7 @@ module.exports = {
         grp: "pd",
         id: "0U",
         integrity: 56,
-        mass: 1.4,
+        mass: 2.6,
         power: .62,
         rating: "A",
         syscap: 10,
@@ -6401,7 +6609,7 @@ module.exports = {
         grp: "pd",
         id: "0X",
         integrity: 56,
-        mass: 2.6,
+        mass: 5.25,
         power: .62,
         rating: "A",
         syscap: 14,
@@ -6420,7 +6628,7 @@ module.exports = {
         grp: "pd",
         id: "1A",
         integrity: 56,
-        mass: 2.6,
+        mass: 10.5,
         power: .62,
         rating: "A",
         syscap: 14,
@@ -6439,7 +6647,7 @@ module.exports = {
         grp: "pd",
         id: "1A",
         integrity: 56,
-        mass: 2.6,
+        mass: 21,
         power: .62,
         rating: "A",
         syscap: 22,
@@ -6458,7 +6666,7 @@ module.exports = {
         grp: "pd",
         id: "1B",
         integrity: 56,
-        mass: 2.6,
+        mass: 42,
         power: .62,
         rating: "A",
         syscap: 26,
@@ -6477,7 +6685,7 @@ module.exports = {
         grp: "pd",
         id: "1C",
         integrity: 56,
-        mass: 2.6,
+        mass: 84,
         power: .62,
         rating: "A",
         syscap: 31,
@@ -6496,7 +6704,7 @@ module.exports = {
         grp: "pd",
         id: "1D",
         integrity: 56,
-        mass: 2.6,
+        mass: 168,
         power: .62,
         rating: "A",
         syscap: 36,
@@ -6504,7 +6712,7 @@ module.exports = {
         wepcap: 50,
         weprate: 10.1,
         name: "Guardian Power Distributor",
-        symbol: "Int_GuardianPowerDistributor_Size7"
+        symbol: "Int_GuardianPowerDistributor_Size8"
       } ],
       s: [ {
         angle: 30,
@@ -7343,7 +7551,8 @@ module.exports = {
         pp: "Felicia Winters",
         rating: "E",
         rof: 1.664,
-        thermload: 1
+        thermload: 1,
+        symbol: "Hpt_PulseLaser_Fixed_Medium_Disruptor"
       }, {
         breachdmg: 5.1,
         breachmax: .8,
@@ -8240,7 +8449,8 @@ module.exports = {
         reload: 4,
         rof: 4.3,
         shotspeed: 1800,
-        thermload: .2
+        thermload: .2,
+        symbol: "Hpt_MultiCannon_Fixed_Small_Strong"
       }, {
         ammo: 2100,
         breachdmg: 2,
@@ -10046,7 +10256,8 @@ module.exports = {
         pp: "Zemina Torval",
         range: 2e3,
         rating: "D",
-        thermload: 6
+        thermload: 6,
+        symbol: "Hpt_MiningLaser_Fixed_Small_Advanced"
       }, {
         breachdmg: .6,
         breachmax: .2,
@@ -16427,6 +16638,188 @@ module.exports = {
         integrity: 157,
         hacktime: 10,
         symbol: "Int_DroneControl_Recon_Size7_Class1"
+      } ],
+      gsrp: [ {
+        shieldaddition: 44,
+        class: 1,
+        cost: 1e4,
+        edID: 128668537,
+        power: .35,
+        eddbID: 1373,
+        grp: "gsrp",
+        id: "0Z",
+        mass: 2,
+        rating: "E",
+        symbol: "Int_GuardianShieldReinforcement_Size1_Class1"
+      }, {
+        shieldaddition: 61,
+        class: 1,
+        cost: 24e3,
+        edID: 128668537,
+        power: .46,
+        eddbID: 1373,
+        grp: "gsrp",
+        id: "0y",
+        mass: 1,
+        rating: "D",
+        symbol: "Int_GuardianShieldReinforcement_Size1_Class2"
+      }, {
+        shieldaddition: 83,
+        class: 2,
+        cost: 24e3,
+        edID: 128668537,
+        power: .56,
+        eddbID: 1373,
+        grp: "gsrp",
+        id: "0z",
+        mass: 4,
+        rating: "E",
+        symbol: "Int_GuardianShieldReinforcement_Size2_Class1"
+      }, {
+        shieldaddition: 105,
+        class: 2,
+        cost: 72621,
+        edID: 128668537,
+        power: .67,
+        eddbID: 1373,
+        grp: "gsrp",
+        id: "1E",
+        mass: 2,
+        rating: "D",
+        symbol: "Int_GuardianShieldReinforcement_Size2_Class2"
+      }, {
+        shieldaddition: 143,
+        class: 3,
+        cost: 174290,
+        edID: 128668537,
+        power: .84,
+        eddbID: 1373,
+        grp: "gsrp",
+        id: "1F",
+        mass: 4,
+        rating: "D",
+        symbol: "Int_GuardianShieldReinforcement_Size3_Class2"
+      }, {
+        shieldaddition: 127,
+        class: 3,
+        cost: 57600,
+        edID: 128668537,
+        power: .74,
+        eddbID: 1373,
+        grp: "gsrp",
+        id: "1G",
+        mass: 8,
+        rating: "E",
+        symbol: "Int_GuardianShieldReinforcement_Size3_Class1"
+      }, {
+        shieldaddition: 165,
+        class: 4,
+        cost: 138240,
+        edID: 128668537,
+        power: .95,
+        eddbID: 1373,
+        grp: "gsrp",
+        id: "1I",
+        mass: 16,
+        rating: "E",
+        symbol: "Int_GuardianShieldReinforcement_Size4_Class1"
+      }, {
+        shieldaddition: 182,
+        class: 4,
+        cost: 418295,
+        edID: 128668537,
+        power: .95,
+        eddbID: 1373,
+        grp: "gsrp",
+        id: "1J",
+        mass: 8,
+        rating: "D",
+        symbol: "Int_GuardianShieldReinforcement_Size4_Class2"
+      }, {
+        shieldaddition: 215,
+        class: 5,
+        cost: 1003910,
+        edID: 128668537,
+        power: 1.26,
+        eddbID: 1373,
+        grp: "gsrp",
+        id: "1K",
+        mass: 16,
+        rating: "D",
+        symbol: "Int_GuardianShieldReinforcement_Size5_Class2"
+      }, {
+        shieldaddition: 198,
+        class: 5,
+        cost: 331778,
+        edID: 128668537,
+        power: 1.16,
+        eddbID: 1373,
+        grp: "gsrp",
+        id: "1L",
+        mass: 32,
+        rating: "E",
+        symbol: "Int_GuardianShieldReinforcement_Size5_Class1"
+      } ],
+      gfsb: [ {
+        jumpboost: 4,
+        class: 1,
+        cost: 1e4,
+        edID: 128668537,
+        power: .75,
+        eddbID: 1373,
+        grp: "gfsb",
+        id: "1H",
+        mass: 1.3,
+        rating: "H",
+        symbol: "Int_GuardianFSDBooster_Size1"
+      }, {
+        jumpboost: 6,
+        class: 2,
+        cost: 1e4,
+        edID: 128668537,
+        power: .98,
+        eddbID: 1373,
+        grp: "gfsb",
+        id: "1M",
+        mass: 1.3,
+        rating: "H",
+        symbol: "Int_GuardianFSDBooster_Size2"
+      }, {
+        jumpboost: 7.75,
+        class: 3,
+        cost: 1e4,
+        edID: 128668537,
+        power: 1.27,
+        eddbID: 1373,
+        grp: "gfsb",
+        id: "1N",
+        mass: 1.3,
+        rating: "H",
+        symbol: "Int_GuardianFSDBooster_Size3"
+      }, {
+        jumpboost: 9.25,
+        class: 4,
+        cost: 1e4,
+        edID: 128668537,
+        power: 1.65,
+        eddbID: 1373,
+        grp: "gfsb",
+        id: "1P",
+        mass: 1.3,
+        rating: "H",
+        symbol: "Int_GuardianFSDBooster_Size4"
+      }, {
+        jumpboost: 10.5,
+        class: 5,
+        cost: 1e4,
+        edID: 128668537,
+        power: 2.14,
+        eddbID: 1373,
+        grp: "gfsb",
+        id: "1O",
+        mass: 1.3,
+        rating: "H",
+        symbol: "Int_GuardianFSDBooster_Size5"
       } ]
     }
   },
@@ -23895,6 +24288,20 @@ module.exports = {
         type: "percentage",
         method: "multiplicative",
         higherbetter: true
+      },
+      jumpboost: {
+        id: 47,
+        name: "jumpboost",
+        type: "numeric",
+        method: "additive",
+        higherbetter: true
+      },
+      shieldaddition: {
+        id: 50,
+        name: "shieldaddition",
+        type: "numeric",
+        method: "additive",
+        higherbetter: true
       }
     },
     modifierActions: {
@@ -26333,6 +26740,14 @@ module.exports = {
         blueprints: {},
         modifications: []
       },
+      gsrp: {
+        blueprints: {},
+        modifications: []
+      },
+      gfsb: {
+        blueprints: {},
+        modifications: []
+      },
       gpp: {
         blueprints: {},
         modifications: []
@@ -26496,7 +26911,7 @@ module.exports = {
             }
           }
         },
-        modifications: [ "ammo", "clip", "damage", "damagedist", "fallofffromrange", "distdraw", "integrity", "jitter", "mass", "piercing", "power", "range", "reload", "rof", "thermload" ],
+        modifications: [ "ammo", "clip", "damage", "damagedist", "fallofffromrange", "distdraw", "integrity", "jitter", "mass", "piercing", "power", "range", "reload", "shotspeed", "rof", "thermload" ],
         specials: [ "special_blinding_shell", "special_dispersal_field", "special_phasing_sequence", "special_plasma_slug", "special_plasma_slug_cooled", "special_lock_breaker", "special_thermal_conduit", "special_weapon_damage", "special_weapon_efficient", "special_weapon_rateoffire", "special_weapon_toughened", "special_weapon_lightweight" ]
       },
       pas: {
@@ -27939,457 +28354,548 @@ module.exports = {
       special_auto_loader: {
         id: 0,
         edname: "special_auto_loader",
-        name: "Auto loader"
+        name: "Auto loader",
+        uuid: "640d6dde-f497-42cd-8bc9-73ab3fa1b43a"
       },
       special_choke_canister: {
         id: 1,
         edname: "special_choke_canister",
-        name: "Choke canister"
+        name: "Choke canister",
+        uuid: "770007e7-398c-40ce-be02-22b227728aef"
       },
       special_concordant_sequence: {
         id: 2,
         edname: "special_concordant_sequence",
-        name: "Concordant sequence"
+        name: "Concordant sequence",
+        uuid: "b556c19a-e756-45b1-846f-9ddc61af18a9"
       },
       special_corrosive_shell: {
         id: 3,
         edname: "special_corrosive_shell",
-        name: "Corrosive shell"
+        name: "Corrosive shell",
+        uuid: "a6faa870-ff89-4e48-b607-424e065cbd43"
       },
       special_blinding_shell: {
         id: 4,
         edname: "special_blinding_shell",
-        name: "Dazzle shell"
+        name: "Dazzle shell",
+        uuid: "0a1e29ee-2fc7-4cbd-bbda-e8803c3e03ac"
       },
       special_dispersal_field: {
         id: 5,
         edname: "special_dispersal_field",
-        name: "Dispersal field"
+        name: "Dispersal field",
+        uuid: "0e2dbd63-335d-4dca-8050-c7ca8ddc56b0"
       },
       special_distortion_field: {
         id: 6,
         edname: "special_distortion_field",
-        name: "Distortion field"
+        name: "Distortion field",
+        uuid: "4da956d5-df5b-4d4f-8651-22fd5e343454"
       },
       special_drag_munitions: {
         id: 7,
         edname: "special_drag_munitions",
-        name: "Drag munitions"
+        name: "Drag munitions",
+        uuid: "ca4cd540-660a-4fba-b38d-179f72125819"
       },
       special_emissive_munitions: {
         id: 8,
         edname: "special_emissive_munitions",
-        name: "Emissive munitions"
+        name: "Emissive munitions",
+        uuid: "16c9ed0f-63c0-4ff2-b2e0-59bbb294632d"
       },
       special_feedback_cascade: {
         id: 9,
         edname: "special_feedback_cascade",
-        name: "Feedback cascade (Legacy)"
+        name: "Feedback cascade (Legacy)",
+        uuid: "fe22ebee-802a-4905-b390-f59a65c1394c"
       },
       special_force_shell: {
         id: 10,
         edname: "special_force_shell",
-        name: "Force shell"
+        name: "Force shell",
+        uuid: "62056851-d2f2-474d-ba77-66c030c900e9"
       },
       special_fsd_interrupt: {
         id: 33,
         edname: "special_fsd_interrupt",
-        name: "FSD interrupt"
+        name: "FSD interrupt",
+        uuid: "c1400054-1c2b-487c-8854-7a22d96d4cd2"
       },
       special_high_yield_shell: {
         id: 11,
         edname: "special_high_yield_shell",
-        name: "High yield shell"
+        name: "High yield shell",
+        uuid: "a950b42c-204f-4775-a0c5-21bfcec1fd14"
       },
       special_incendiary_rounds: {
         id: 12,
         edname: "special_incendiary_rounds",
-        name: "Incendiary rounds"
+        name: "Incendiary rounds",
+        uuid: "3526773e-a814-4bec-afbf-30db79a3e239"
       },
       special_inertial_impact: {
         id: 32,
         edname: "special_inertial_impact",
-        name: "Inertial impact"
+        name: "Inertial impact",
+        uuid: "6eda22d3-8049-4bab-a125-762b12fa576a"
       },
       special_ion_disruptor: {
         id: 13,
         edname: "special_ion_disruptor",
-        name: "Ion disruptor"
+        name: "Ion disruptor",
+        uuid: "d84e40ca-afc1-4b01-9940-034152d288e7"
       },
       special_mass_lock_munition: {
         id: 14,
         edname: "special_mass_lock_munition",
-        name: "Mass lock munition"
+        name: "Mass lock munition",
+        uuid: "8565714f-912d-488b-82fb-43911504a300"
       },
       special_overload_munitions: {
         id: 15,
         edname: "special_overload_munitions",
-        name: "Overload munitions"
+        name: "Overload munitions",
+        uuid: "c157bbd1-a14d-4aa2-9081-94cbfbdee558"
       },
       special_penetrator_payload: {
         id: 16,
         edname: "special_penetrator_payload",
-        name: "Penetrator payload"
+        name: "Penetrator payload",
+        uuid: "39e3bb85-e349-434b-b9fe-7fd02ee57f3d"
       },
       special_phasing_sequence: {
         id: 17,
         edname: "special_phasing_sequence",
-        name: "Phasing sequence"
+        name: "Phasing sequence",
+        uuid: "47254ea9-c88f-43e0-9166-d1796649917b"
       },
       special_plasma_slug: {
         id: 18,
         edname: "special_plasma_slug",
-        name: "Plasma slug (Legacy)"
+        name: "Plasma slug (Legacy)",
+        uuid: "8794e18a-ecd5-4ebc-afd7-0b7d0d0cdd91"
       },
       special_radiant_canister: {
         id: 19,
         edname: "special_radiant_canister",
-        name: "Radiant Canister"
+        name: "Radiant Canister",
+        uuid: "51f84837-e9a5-432c-a125-d4322099266c"
       },
       special_regeneration_sequence: {
         id: 20,
         edname: "special_regeneration_sequence",
-        name: "Regeneration sequence"
+        name: "Regeneration sequence",
+        uuid: "3bece1bb-7c31-4735-8c18-54dc4a0057bc"
       },
       special_reverberating_cascade: {
         id: 21,
         edname: "special_reverberating_cascade",
-        name: "Reverberating cascade"
+        name: "Reverberating cascade",
+        uuid: "c03e2f4f-9520-44bb-9a1f-7a917e8e3a48"
       },
       special_scramble_spectrum: {
         id: 22,
         edname: "special_scramble_spectrum",
-        name: "Scramble spectrum"
+        name: "Scramble spectrum",
+        uuid: "4f42cb92-4440-4295-ada9-fcca788a65b8"
       },
       special_screening_shell: {
         id: 23,
         edname: "special_screening_shell",
-        name: "Screening shell"
+        name: "Screening shell",
+        uuid: "9cf533fc-ccb1-4c92-8b6b-dd700af2988a"
       },
       special_shiftlock_canister: {
         id: 24,
         edname: "special_shiftlock_canister",
-        name: "Shift-lock canister"
+        name: "Shift-lock canister",
+        uuid: "1f7b0deb-e023-43e5-96f6-ebf60d683e8b"
       },
       special_smart_rounds: {
         id: 25,
         edname: "special_smart_rounds",
-        name: "Smart rounds"
+        name: "Smart rounds",
+        uuid: "2a3d8519-27af-44f2-a50b-33095964d1cc"
       },
       special_super_penetrator: {
         id: 26,
         edname: "special_super_penetrator",
-        name: "Super penetrator (Legacy)"
+        name: "Super penetrator (Legacy)",
+        uuid: "2423e8f7-2384-4d32-8b9d-0e06a42a301d"
       },
       special_lock_breaker: {
         id: 27,
         edname: "special_lock_breaker",
-        name: "Target lock breaker"
+        name: "Target lock breaker",
+        uuid: "4cf42ed8-574f-4bb8-a1f2-ee154475b463"
       },
       special_thermal_cascade: {
         id: 28,
         edname: "special_thermal_cascade",
-        name: "Thermal cascade"
+        name: "Thermal cascade",
+        uuid: "e5c8cab4-7a2f-450d-a937-2d0d8b9e3714"
       },
       special_thermal_conduit: {
         id: 29,
         edname: "special_thermal_conduit",
-        name: "Thermal conduit"
+        name: "Thermal conduit",
+        uuid: "4e4e1f59-6762-47ff-b1fa-40ca43304698"
       },
       special_thermal_vent: {
         id: 30,
         edname: "special_thermal_vent",
-        name: "Thermal vent"
+        name: "Thermal vent",
+        uuid: "70f11414-7904-405c-92db-806178ee9df4"
       },
       special_thermalshock: {
         id: 31,
         edname: "special_thermalshock",
-        name: "Thermal shock"
+        name: "Thermal shock",
+        uuid: "fe8b4daa-e65d-464c-811d-400d3632a3d6"
       },
       special_feedback_cascade_cooled: {
         name: "Feedback Cascade",
         id: 100,
-        edname: "special_feedback_cascade_cooled"
+        edname: "special_feedback_cascade_cooled",
+        uuid: "3c153755-3d2c-4832-bb73-d6b3d0e99a71"
       },
       special_super_penetrator_cooled: {
         name: "Super Penetrator",
         id: 101,
-        edname: "special_super_penetrator_cooled"
+        edname: "special_super_penetrator_cooled",
+        uuid: "4bb4ec50-40fb-473d-abaf-4fc386aa889c"
       },
       special_plasma_slug_cooled: {
         name: "Plasma Slug",
         id: 102,
-        edname: "special_plasma_slug_cooled"
+        edname: "special_plasma_slug_cooled",
+        uuid: "58a7b1b6-57b9-40f2-9a5a-712a5388a5eb"
       },
       special_penetrator_munitions: {
         name: "Penetrator Munitions",
         id: 103,
-        edname: "special_penetrator_munitions"
+        edname: "special_penetrator_munitions",
+        uuid: "35578402-1bc7-4d19-828b-af31ebd79866"
       },
       special_deep_cut_payload: {
         name: "Penetrator Payload",
         id: 104,
-        edname: "special_deep_cut_payload"
+        edname: "special_deep_cut_payload",
+        uuid: "5d25c5bc-4b45-4119-bd87-71bfd0f85957"
       },
       special_mass_lock: {
         name: "Mass Lock Munition",
         id: 105,
-        edname: "special_mass_lock"
+        edname: "special_mass_lock",
+        uuid: "9e8635af-4077-4d7a-98dd-5220c8722688"
       },
       special_shield_regenerative: {
         name: "Fast Charge",
         id: 106,
-        edname: "special_shield_regenerative"
+        edname: "special_shield_regenerative",
+        uuid: "42c5e92d-ccab-435a-b2c6-fd268d39d6f5"
       },
       special_shield_resistive: {
         name: "Multi-weave",
         id: 107,
-        edname: "special_shield_resistive"
+        edname: "special_shield_resistive",
+        uuid: "dd46c8be-730c-4671-87fe-f98b181b66cf"
       },
       special_shield_health: {
         name: "Hi-Cap",
         id: 108,
-        edname: "special_shield_health"
+        edname: "special_shield_health",
+        uuid: "603c1ba6-45e6-4401-af56-639c3e7c9b79"
       },
       special_shield_efficient: {
         name: "Lo-draw",
         id: 109,
-        edname: "special_shield_efficient"
+        edname: "special_shield_efficient",
+        uuid: "66a39288-59d7-4cfb-914d-354a200c0210"
       },
       special_shield_thermic: {
         name: "Thermo Block",
         id: 110,
-        edname: "special_shield_thermic"
+        edname: "special_shield_thermic",
+        uuid: "c7636c6b-5849-4cad-bd8e-d99968d4014e"
       },
       special_shield_kinetic: {
         name: "Force Block",
         id: 111,
-        edname: "special_shield_kinetic"
+        edname: "special_shield_kinetic",
+        uuid: "3f9e7ca8-7e07-46c4-ad06-cf3787352201"
       },
       special_shield_toughened: {
         name: "Double Braced",
         id: 112,
-        edname: "special_shield_toughened"
+        edname: "special_shield_toughened",
+        uuid: "d7d8433c-445c-4d8e-b4a4-3bd78cba9d15"
       },
       special_shield_lightweight: {
         name: "Stripped Down",
         id: 113,
-        edname: "special_shield_lightweight"
+        edname: "special_shield_lightweight",
+        uuid: "91ff72db-51cf-428d-80a8-be96d6418c4b"
       },
       special_engine_cooled: {
         name: "Thermal Spread",
         id: 114,
-        edname: "special_engine_cooled"
+        edname: "special_engine_cooled",
+        uuid: "42ff1374-3ecb-4872-abfa-b39b495fb203"
       },
       special_engine_haulage: {
         name: "Drive Distributors",
         id: 115,
-        edname: "special_engine_haulage"
+        edname: "special_engine_haulage",
+        uuid: "bd3c1991-370e-4b9d-b8cd-d5dec3260647"
       },
       special_engine_overloaded: {
         name: "Drag Drives",
         id: 116,
-        edname: "special_engine_overloaded"
+        edname: "special_engine_overloaded",
+        uuid: "68998b16-7b65-4f58-8bc0-6e0f2686c367"
       },
       special_engine_toughened: {
         name: "Double Braced",
         id: 117,
-        edname: "special_engine_toughened"
+        edname: "special_engine_toughened",
+        uuid: "41b04d96-0817-479b-92e5-2114de444170"
       },
       special_engine_lightweight: {
         name: "Stripped Down",
         id: 118,
-        edname: "special_engine_lightweight"
+        edname: "special_engine_lightweight",
+        uuid: "dd77b197-412e-4ca1-88ed-0939c5c31a01"
       },
       special_fsd_fuelcapacity: {
         name: "Deep Charge",
         id: 119,
-        edname: "special_fsd_fuelcapacity"
+        edname: "special_fsd_fuelcapacity",
+        uuid: "56f1e58d-2044-4a31-8b54-ad0f99dfd64e"
       },
       special_fsd_heavy: {
         name: "Mass Manager",
         id: 120,
-        edname: "special_fsd_heavy"
+        edname: "special_fsd_heavy",
+        uuid: "4d7d30c3-970b-4c6e-a507-89ac7e6441bd"
       },
       special_fsd_toughened: {
         name: "Double Braced",
         id: 121,
-        edname: "special_fsd_toughened"
+        edname: "special_fsd_toughened",
+        uuid: "14c7f016-5c32-4599-8a27-caa1733f92e3"
       },
       special_fsd_lightweight: {
         name: "Stripped Down",
         id: 122,
-        edname: "special_fsd_lightweight"
+        edname: "special_fsd_lightweight",
+        uuid: "6ab9d9d4-d488-4de8-9c1b-089a31f290a0"
       },
       special_fsd_cooled: {
         name: "Thermal Spread",
         id: 123,
-        edname: "special_fsd_cooled"
+        edname: "special_fsd_cooled",
+        uuid: "60ab0728-c8cd-47c9-a357-8c8bfeeb7023"
       },
       special_powerplant_highcharge: {
         name: "Monstered",
         id: 124,
-        edname: "special_powerplant_highcharge"
+        edname: "special_powerplant_highcharge",
+        uuid: "12a57a09-0e05-41a9-9824-14a3618e7a0f"
       },
       special_powerplant_cooled: {
         name: "Thermal Spread",
         id: 125,
-        edname: "special_powerplant_cooled"
+        edname: "special_powerplant_cooled",
+        uuid: "6cda2960-a05b-4dd1-978c-202d746e47bc"
       },
       special_powerplant_toughened: {
         name: "Double Braced",
         id: 126,
-        edname: "special_powerplant_toughened"
+        edname: "special_powerplant_toughened",
+        uuid: "1fddaba5-bc0b-492c-9caa-4a72a149532b"
       },
       special_powerplant_lightweight: {
         name: "Stripped Down",
         id: 127,
-        edname: "special_powerplant_lightweight"
+        edname: "special_powerplant_lightweight",
+        uuid: "11b258eb-36d1-4cbc-be04-7fc426ef3121"
       },
       special_powerdistributor_capacity: {
         name: "Cluster Capacitors",
         id: 128,
-        edname: "special_powerdistributor_capacity"
+        edname: "special_powerdistributor_capacity",
+        uuid: "c4231886-f988-4a31-a749-2a58550f9e44"
       },
       special_powerdistributor_fast: {
         name: "Super Conduits",
         id: 129,
-        edname: "special_powerdistributor_fast"
+        edname: "special_powerdistributor_fast",
+        uuid: "b5bb35a1-e851-4d37-8f26-8fe828f84c95"
       },
       special_powerdistributor_efficient: {
         name: "Flow Control",
         id: 130,
-        edname: "special_powerdistributor_efficient"
+        edname: "special_powerdistributor_efficient",
+        uuid: "c226afaf-ee7f-4809-a4e4-0797d4822a69"
       },
       special_powerdistributor_toughened: {
         name: "Double Braced",
         id: 131,
-        edname: "special_powerdistributor_toughened"
+        edname: "special_powerdistributor_toughened",
+        uuid: "14d36c9b-efd5-450b-8175-80287daecd78"
       },
       special_powerdistributor_lightweight: {
         name: "Stripped Down",
         id: 132,
-        edname: "special_powerdistributor_lightweight"
+        edname: "special_powerdistributor_lightweight",
+        uuid: "ec53deaf-ece6-443f-9503-dd3dc5329e14"
       },
       special_shieldcell_gradual: {
         name: "Recycling Cell",
         id: 133,
-        edname: "special_shieldcell_gradual"
+        edname: "special_shieldcell_gradual",
+        uuid: "c8aa2134-3153-47b8-a367-9c5dbb9c557d"
       },
       special_shieldcell_oversized: {
         name: "Boss Cells",
         id: 134,
-        edname: "special_shieldcell_oversized"
+        edname: "special_shieldcell_oversized",
+        uuid: "87ed0cec-9624-4ecb-8ffb-cc941464e8d2"
       },
       special_shieldcell_efficient: {
         name: "Flow Control",
         id: 135,
-        edname: "special_shieldcell_efficient"
+        edname: "special_shieldcell_efficient",
+        uuid: "1d2316b8-3ddb-4db4-b36f-2d3e0e8581b5"
       },
       special_shieldcell_toughened: {
         name: "Double Braced",
         id: 136,
-        edname: "special_shieldcell_toughened"
+        edname: "special_shieldcell_toughened",
+        uuid: "beecd33b-b171-4a08-9d5a-459266bcb275"
       },
       special_shieldcell_lightweight: {
         name: "Stripped Down",
         id: 137,
-        edname: "special_shieldcell_lightweight"
+        edname: "special_shieldcell_lightweight",
+        uuid: "b92c2e2e-baa5-4ce9-bf60-05771d7dcbc1"
       },
       special_weapon_damage: {
         name: "Oversized",
         id: 138,
-        edname: "special_weapon_damage"
+        edname: "special_weapon_damage",
+        uuid: "ceb5c729-4565-4869-ade8-5ee897e8b410"
       },
       special_weapon_rateoffire: {
         name: "Multi-servos",
         id: 139,
-        edname: "special_weapon_rateoffire"
+        edname: "special_weapon_rateoffire",
+        uuid: "fd62292f-f5ed-4728-bc8a-3ae215ced386"
       },
       special_weapon_efficient: {
         name: "Flow Control",
         id: 140,
-        edname: "special_weapon_efficient"
+        edname: "special_weapon_efficient",
+        uuid: "d7ae7537-52ce-402a-b997-1cc463d8c7d0"
       },
       special_weapon_toughened: {
         name: "Double Braced",
         id: 141,
-        edname: "special_weapon_toughened"
+        edname: "special_weapon_toughened",
+        uuid: "167892c7-c4bd-411e-af8a-5bb464beec29"
       },
       special_weapon_lightweight: {
         name: "Stripped Down",
         id: 142,
-        edname: "special_weapon_lightweight"
+        edname: "special_weapon_lightweight",
+        uuid: "dfc22aad-48b8-4f8d-af16-ec3b978fc8b6"
       },
       special_armour_thermic: {
         name: "Reflective Plating",
         id: 143,
-        edname: "special_armour_thermic"
+        edname: "special_armour_thermic",
+        uuid: "dfe731fd-b709-4bbb-989b-5190bba4aa0e"
       },
       special_armour_kinetic: {
         name: "Angled Plating",
         id: 144,
-        edname: "special_armour_kinetic"
+        edname: "special_armour_kinetic",
+        uuid: "4803f4b3-f8ac-44a6-a6da-8d4c94aee048"
       },
       special_armour_explosive: {
         name: "Layered Plating",
         id: 145,
-        edname: "special_armour_explosive"
+        edname: "special_armour_explosive",
+        uuid: "2af2d71c-b511-49a0-a605-22cfce862a63"
       },
       special_armour_chunky: {
         name: "Deep Plating",
         id: 146,
-        edname: "special_armour_chunky"
+        edname: "special_armour_chunky",
+        uuid: "c4318e14-d50c-49ff-984f-bacae4aaa334"
       },
       special_hullreinforcement_thermic: {
         name: "Reflective Plating",
         id: 147,
-        edname: "special_hullreinforcement_thermic"
+        edname: "special_hullreinforcement_thermic",
+        uuid: "6c88aa33-01db-4eda-928e-6ca8b9b1bc3d"
       },
       special_hullreinforcement_kinetic: {
         name: "Angled Plating",
         id: 148,
-        edname: "special_hullreinforcement_kinetic"
+        edname: "special_hullreinforcement_kinetic",
+        uuid: "e8631809-2915-4373-905c-8dcf3bda6921"
       },
       special_hullreinforcement_explosive: {
         name: "Layered Plating",
         id: 149,
-        edname: "special_hullreinforcement_explosive"
+        edname: "special_hullreinforcement_explosive",
+        uuid: "cdd19fcc-74b4-463a-a8f1-2e9909da664f"
       },
       special_hullreinforcement_chunky: {
         name: "Deep Plating",
         id: 150,
-        edname: "special_hullreinforcement_chunky"
+        edname: "special_hullreinforcement_chunky",
+        uuid: "b51706cc-d412-4559-8654-f812d2eb44b9"
       },
       special_shieldbooster_thermic: {
         name: "Thermo Block",
         id: 151,
-        edname: "special_shieldbooster_thermic"
+        edname: "special_shieldbooster_thermic",
+        uuid: "c3340df8-c6da-49c9-b236-8f1cc4209088"
       },
       special_shieldbooster_kinetic: {
         name: "Force Block",
         id: 152,
-        edname: "special_shieldbooster_kinetic"
+        edname: "special_shieldbooster_kinetic",
+        uuid: "cb95d9b4-a945-491d-95ad-e230c0454cd9"
       },
       special_shieldbooster_explosive: {
         name: "Blast Block",
         id: 153,
-        edname: "special_shieldbooster_explosive"
+        edname: "special_shieldbooster_explosive",
+        uuid: "eb1c4a92-03ef-4263-8051-9ac91b2d43b2"
       },
       special_shieldbooster_efficient: {
         name: "Flow Control",
         id: 154,
-        edname: "special_shieldbooster_efficient"
+        edname: "special_shieldbooster_efficient",
+        uuid: "441e1d85-5174-4172-85ea-caee8d3c632d"
       },
       special_shieldbooster_toughened: {
         name: "Double Braced",
         id: 155,
-        edname: "special_shieldbooster_toughened"
+        edname: "special_shieldbooster_toughened",
+        uuid: "32cb80c0-bb11-49ea-ae21-4c94eb5f9195"
       },
       special_shieldbooster_chunky: {
         name: "Super Capacitors",
         id: 156,
-        edname: "special_shieldbooster_chunky"
+        edname: "special_shieldbooster_chunky",
+        uuid: "4197c308-a3df-442a-91c2-db856b4f57cf"
       }
     }
   }
diff --git a/dist/index.json b/dist/index.json
index 039c897..78f74e1 100644
--- a/dist/index.json
+++ b/dist/index.json
@@ -16,7 +16,7 @@
 				"hardness": 35,
 				"hullMass": 35,
 				"masslock": 7,
-				"pipSpeed": 0.13625,
+				"pipSpeed": 0.13636363636364,
 				"pitch": 38,
 				"roll": 100,
 				"yaw": 14,
@@ -152,7 +152,7 @@
 				"hardness": 65,
 				"hullMass": 400,
 				"masslock": 13,
-				"pipSpeed": 0.085,
+				"pipSpeed": 0.08695652173913,
 				"pitch": 39,
 				"roll": 92,
 				"yaw": 16,
@@ -315,6 +315,188 @@
 				]
 			}
 		},
+		"alliance_challenger": {
+			"edID": 128816588,
+			"eddbID": 33,
+			"properties": {
+				"name": "Alliance Challenger",
+				"manufacturer": "Lakon",
+				"class": 2,
+				"hullCost": 28041035,
+				"speed": 130,
+				"boost": 310,
+				"boostEnergy": 19,
+				"baseShieldStrength": 220,
+				"baseArmour": 300,
+				"hardness": 65,
+				"hullMass": 450,
+				"masslock": 13,
+				"pipSpeed": 0.0875,
+				"pitch": 32,
+				"roll": 90,
+				"yaw": 16,
+				"crew": 2
+			},
+			"retailCost": 30472265,
+			"requirements": {
+				"horizons": true
+			},
+			"bulkheads": [
+				{
+					"id": "0K",
+					"edID": 128816590,
+					"eddbID": 1640,
+					"grp": "bh",
+					"cost": 0,
+					"mass": 0,
+					"explres": -0.4,
+					"kinres": -0.2,
+					"thermres": 0,
+					"hullboost": 0.8
+				},
+				{
+					"id": "0P",
+					"edID": 128816591,
+					"eddbID": 1641,
+					"grp": "bh",
+					"cost": 6803170,
+					"mass": 40,
+					"explres": -0.4,
+					"kinres": -0.2,
+					"thermres": 0,
+					"hullboost": 1.52
+				},
+				{
+					"id": "0Q",
+					"edID": 128816592,
+					"eddbID": 1642,
+					"grp": "bh",
+					"cost": 15307134,
+					"mass": 78,
+					"explres": -0.4,
+					"kinres": -0.2,
+					"thermres": 0,
+					"hullboost": 2.5
+				},
+				{
+					"id": "0R",
+					"edID": 128816593,
+					"eddbID": 1643,
+					"grp": "bh",
+					"cost": 36175859,
+					"mass": 78,
+					"explres": -0.5,
+					"kinres": -0.75,
+					"thermres": 0.5,
+					"hullboost": 2.5
+				},
+				{
+					"id": "0S",
+					"edID": 128816594,
+					"eddbID": 1644,
+					"grp": "bh",
+					"cost": 40087682,
+					"mass": 78,
+					"explres": 0.2,
+					"kinres": 0.25,
+					"thermres": -0.4,
+					"hullboost": 2.5
+				}
+			],
+			"slots": {
+				"standard": [
+					6,
+					6,
+					5,
+					5,
+					6,
+					4,
+					4
+				],
+				"hardpoints": [
+					3,
+					2,
+					2,
+					2,
+					1,
+					1,
+					1,
+					0,
+					0,
+					0,
+					0
+				],
+				"internal": [
+					6,
+					6,
+					3,
+					3,
+					2,
+					2,
+					{
+						"class": 4,
+						"name": "Military",
+						"eligible": {
+							"hr": 1,
+							"scb": 1,
+							"mrp": 1
+						}
+					},
+					{
+						"class": 4,
+						"name": "Military",
+						"eligible": {
+							"hr": 1,
+							"scb": 1,
+							"mrp": 1
+						}
+					},
+					{
+						"class": 4,
+						"name": "Military",
+						"eligible": {
+							"hr": 1,
+							"scb": 1,
+							"mrp": 1
+						}
+					}
+				]
+			},
+			"defaults": {
+				"standard": [
+					"6E",
+					"6E",
+					"5E",
+					"5E",
+					"6E",
+					"4E",
+					"4C"
+				],
+				"hardpoints": [
+					17,
+					0,
+					17,
+					0,
+					0,
+					0,
+					0,
+					0,
+					0,
+					0
+				],
+				"internal": [
+					"04",
+					"4h",
+					"01",
+					"01",
+					"2h",
+					"",
+					"",
+					"",
+					""
+				]
+			}
+		},
 		"anaconda": {
 			"edID": 128049363,
 			"eddbID": 2,
@@ -331,7 +513,7 @@
 				"hardness": 65,
 				"hullMass": 400,
 				"masslock": 23,
-				"pipSpeed": 0.13875,
+				"pipSpeed": 0.13888888888889,
 				"fighterHangars": true,
 				"pitch": 25,
 				"roll": 60,
@@ -1300,7 +1482,7 @@
 				"hardness": 42,
 				"hullMass": 260,
 				"masslock": 10,
-				"pipSpeed": 0.09625,
+				"pipSpeed": 0.098214285714286,
 				"pitch": 35,
 				"roll": 90,
 				"yaw": 13,
@@ -1442,7 +1624,7 @@
 				"hardness": 40,
 				"hullMass": 170,
 				"masslock": 8,
-				"pipSpeed": 0.09875,
+				"pipSpeed": 0.096153846153846,
 				"pitch": 42,
 				"roll": 100,
 				"yaw": 15,
@@ -1879,7 +2061,7 @@
 				"hardness": 60,
 				"hullMass": 480,
 				"masslock": 14,
-				"pipSpeed": 0.11125,
+				"pipSpeed": 0.071428571428571,
 				"pitch": 38,
 				"roll": 90,
 				"yaw": 19,
@@ -2236,7 +2418,7 @@
 				"hardness": 60,
 				"hullMass": 580,
 				"masslock": 14,
-				"pipSpeed": 0.0725,
+				"pipSpeed": 0.11111111111111,
 				"pitch": 30,
 				"roll": 80,
 				"yaw": 14,
@@ -2407,7 +2589,7 @@
 				"hardness": 60,
 				"hullMass": 580,
 				"masslock": 14,
-				"pipSpeed": 0.1025,
+				"pipSpeed": 0.10294117647059,
 				"fighterHangars": true,
 				"pitch": 25,
 				"roll": 80,
@@ -2589,7 +2771,7 @@
 				"hardness": 70,
 				"hullMass": 250,
 				"masslock": 12,
-				"pipSpeed": 0.03875,
+				"pipSpeed": 0.038461538461538,
 				"pitch": 38,
 				"roll": 90,
 				"yaw": 12,
@@ -3018,7 +3200,7 @@
 				"hardness": 30,
 				"hullMass": 35,
 				"masslock": 7,
-				"pipSpeed": 0.05375,
+				"pipSpeed": 0.053571428571429,
 				"pitch": 38,
 				"roll": 90,
 				"yaw": 16,
@@ -3620,6 +3802,157 @@
 				]
 			}
 		},
+		"krait_mkii": {
+			"edID": 128816567,
+			"eddbID": 17,
+			"properties": {
+				"name": "Krait MkII",
+				"manufacturer": "Faulcon DeLacy",
+				"class": 2,
+				"hullCost": 42409425,
+				"speed": 150,
+				"boost": 330,
+				"boostEnergy": 13,
+				"baseShieldStrength": 220,
+				"baseArmour": 220,
+				"hardness": 55,
+				"hullMass": 320,
+				"masslock": 17,
+				"pipSpeed": 0.09375,
+				"fighterHangars": true,
+				"pitch": 26,
+				"roll": 90,
+				"yaw": 10,
+				"crew": 3
+			},
+			"retailCost": 45814205,
+			"bulkheads": [
+				{
+					"id": "bO",
+					"edID": 128816569,
+					"eddbID": 808,
+					"grp": "bh",
+					"cost": 0,
+					"mass": 0,
+					"explres": -0.4,
+					"kinres": -0.2,
+					"thermres": 0,
+					"hullboost": 0.8
+				},
+				{
+					"id": "bP",
+					"edID": 128816570,
+					"eddbID": 809,
+					"grp": "bh",
+					"cost": 22791270,
+					"mass": 36,
+					"explres": -0.4,
+					"kinres": -0.2,
+					"thermres": 0,
+					"hullboost": 1.52
+				},
+				{
+					"id": "bQ",
+					"edID": 128816571,
+					"eddbID": 810,
+					"grp": "bh",
+					"cost": 51280360,
+					"mass": 67,
+					"explres": -0.4,
+					"kinres": -0.2,
+					"thermres": 0,
+					"hullboost": 2.5
+				},
+				{
+					"id": "bR",
+					"edID": 128816572,
+					"eddbID": 811,
+					"grp": "bh",
+					"cost": 121192590,
+					"mass": 67,
+					"explres": -0.5,
+					"kinres": -0.75,
+					"thermres": 0.5,
+					"hullboost": 2.5
+				},
+				{
+					"id": "bS",
+					"edID": 128816573,
+					"eddbID": 812,
+					"grp": "bh",
+					"cost": 134297570,
+					"mass": 67,
+					"explres": 0.2,
+					"kinres": 0.25,
+					"thermres": -0.4,
+					"hullboost": 2.5
+				}
+			],
+			"slots": {
+				"standard": [
+					7,
+					6,
+					5,
+					4,
+					7,
+					6,
+					5
+				],
+				"hardpoints": [
+					3,
+					3,
+					3,
+					2,
+					2,
+					0,
+					0,
+					0,
+					0
+				],
+				"internal": [
+					6,
+					6,
+					5,
+					5,
+					4,
+					3,
+					3,
+					2
+				]
+			},
+			"defaults": {
+				"standard": [
+					"7E",
+					"6E",
+					"5E",
+					"4E",
+					"7E",
+					"6E",
+					"5C"
+				],
+				"hardpoints": [
+					0,
+					0,
+					0,
+					17,
+					17,
+					0,
+					0,
+					0,
+					0
+				],
+				"internal": [
+					"4h",
+					"04",
+					"04",
+					"03",
+					0,
+					"2h",
+					0,
+					"00"
+				]
+			}
+		},
 		"orca": {
 			"edID": 128049327,
 			"eddbID": 16,
@@ -3636,7 +3969,7 @@
 				"hardness": 55,
 				"hullMass": 290,
 				"masslock": 16,
-				"pipSpeed": 0.08375,
+				"pipSpeed": 0.083333333333333,
 				"luxuryCabins": true,
 				"pitch": 25,
 				"roll": 55,
@@ -3805,7 +4138,7 @@
 				"hardness": 65,
 				"hullMass": 350,
 				"masslock": 17,
-				"pipSpeed": 0.0975,
+				"pipSpeed": 0.097826086956522,
 				"pitch": 29,
 				"roll": 90,
 				"yaw": 10,
@@ -3957,7 +4290,7 @@
 				"hardness": 20,
 				"hullMass": 25,
 				"masslock": 6,
-				"pipSpeed": 0.1375,
+				"pipSpeed": 0.13636363636364,
 				"pitch": 42,
 				"roll": 110,
 				"yaw": 16,
@@ -4089,7 +4422,7 @@
 				"hardness": 35,
 				"hullMass": 155,
 				"masslock": 8,
-				"pipSpeed": 0.1475,
+				"pipSpeed": 0.14772727272727,
 				"pitch": 30,
 				"roll": 100,
 				"yaw": 17,
@@ -4229,7 +4562,7 @@
 				"hardness": 54,
 				"hullMass": 350,
 				"masslock": 10,
-				"pipSpeed": 0.16625,
+				"pipSpeed": 0.16666666666667,
 				"pitch": 22,
 				"roll": 60,
 				"yaw": 22,
@@ -4379,7 +4712,7 @@
 				"hardness": 65,
 				"hullMass": 850,
 				"masslock": 16,
-				"pipSpeed": 0.17375,
+				"pipSpeed": 0.17307692307692,
 				"fighterHangars": true,
 				"pitch": 20,
 				"roll": 20,
@@ -4534,7 +4867,7 @@
 				"hardness": 75,
 				"hullMass": 1200,
 				"masslock": 26,
-				"pipSpeed": 0.17375,
+				"pipSpeed": 0.041666666666667,
 				"fighterHangars": true,
 				"pitch": 20,
 				"roll": 20,
@@ -4544,7 +4877,7 @@
 			"retailCost": 121454652,
 			"bulkheads": [
 				{
-					"id": "Bx",
+					"id": "1Q",
 					"edID": 128785621,
 					"eddbID": 1627,
 					"grp": "bh",
@@ -4556,7 +4889,7 @@
 					"hullboost": 0.8
 				},
 				{
-					"id": "By",
+					"id": "1R",
 					"edID": 128785622,
 					"eddbID": 1628,
 					"grp": "bh",
@@ -4568,7 +4901,7 @@
 					"hullboost": 1.52
 				},
 				{
-					"id": "Bz",
+					"id": "1S",
 					"edID": 128785623,
 					"eddbID": 1629,
 					"grp": "bh",
@@ -4580,7 +4913,7 @@
 					"hullboost": 2.5
 				},
 				{
-					"id": "BA",
+					"id": "1T",
 					"edID": 128785624,
 					"eddbID": 1630,
 					"grp": "bh",
@@ -4592,7 +4925,7 @@
 					"hullboost": 2.5
 				},
 				{
-					"id": "BB",
+					"id": "1U",
 					"edID": 128785625,
 					"eddbID": 1631,
 					"grp": "bh",
@@ -4869,7 +5202,7 @@
 				"hardness": 35,
 				"hullMass": 190,
 				"masslock": 7,
-				"pipSpeed": 0.0875,
+				"pipSpeed": 0.087962962962963,
 				"pitch": 30,
 				"roll": 90,
 				"yaw": 12,
@@ -5019,7 +5352,7 @@
 				"hardness": 55,
 				"hullMass": 230,
 				"masslock": 10,
-				"pipSpeed": 0.02375,
+				"pipSpeed": 0.023809523809524,
 				"pitch": 42,
 				"roll": 110,
 				"yaw": 17,
@@ -5647,7 +5980,7 @@
 				},
 				{
 					"class": 2,
-					"cost": 162000,
+					"cost": 187360,
 					"edID": 128833988,
 					"eddbID": 895,
 					"eff": 0.5,
@@ -5662,7 +5995,7 @@
 				},
 				{
 					"class": 3,
-					"cost": 291600,
+					"cost": 468401,
 					"edID": 128833989,
 					"eddbID": 895,
 					"eff": 0.5,
@@ -5677,7 +6010,7 @@
 				},
 				{
 					"class": 4,
-					"cost": 524880,
+					"cost": 1686243,
 					"edID": 128833990,
 					"eddbID": 895,
 					"eff": 0.5,
@@ -5692,7 +6025,7 @@
 				},
 				{
 					"class": 5,
-					"cost": 944790,
+					"cost": 5058729,
 					"edID": 128833991,
 					"eddbID": 895,
 					"eff": 0.5,
@@ -5707,7 +6040,7 @@
 				},
 				{
 					"class": 6,
-					"cost": 1700610,
+					"cost": 15176184,
 					"edID": 128833992,
 					"eddbID": 895,
 					"eff": 0.5,
@@ -5722,7 +6055,7 @@
 				},
 				{
 					"class": 7,
-					"cost": 3061100,
+					"cost": 45528551,
 					"edID": 128833993,
 					"eddbID": 895,
 					"eff": 0.5,
@@ -5737,7 +6070,7 @@
 				},
 				{
 					"class": 8,
-					"cost": 5509980,
+					"cost": 136585652,
 					"edID": 128833994,
 					"eddbID": 895,
 					"eff": 0.5,
@@ -8466,7 +8799,7 @@
 					"grp": "pd",
 					"id": "0U",
 					"integrity": 56,
-					"mass": 1.4,
+					"mass": 2.6,
 					"power": 0.62,
 					"rating": "A",
 					"syscap": 10,
@@ -8486,7 +8819,7 @@
 					"grp": "pd",
 					"id": "0X",
 					"integrity": 56,
-					"mass": 2.6,
+					"mass": 5.25,
 					"power": 0.62,
 					"rating": "A",
 					"syscap": 14,
@@ -8506,7 +8839,7 @@
 					"grp": "pd",
 					"id": "1A",
 					"integrity": 56,
-					"mass": 2.6,
+					"mass": 10.5,
 					"power": 0.62,
 					"rating": "A",
 					"syscap": 14,
@@ -8526,7 +8859,7 @@
 					"grp": "pd",
 					"id": "1A",
 					"integrity": 56,
-					"mass": 2.6,
+					"mass": 21,
 					"power": 0.62,
 					"rating": "A",
 					"syscap": 22,
@@ -8546,7 +8879,7 @@
 					"grp": "pd",
 					"id": "1B",
 					"integrity": 56,
-					"mass": 2.6,
+					"mass": 42,
 					"power": 0.62,
 					"rating": "A",
 					"syscap": 26,
@@ -8566,7 +8899,7 @@
 					"grp": "pd",
 					"id": "1C",
 					"integrity": 56,
-					"mass": 2.6,
+					"mass": 84,
 					"power": 0.62,
 					"rating": "A",
 					"syscap": 31,
@@ -8586,7 +8919,7 @@
 					"grp": "pd",
 					"id": "1D",
 					"integrity": 56,
-					"mass": 2.6,
+					"mass": 168,
 					"power": 0.62,
 					"rating": "A",
 					"syscap": 36,
@@ -8594,7 +8927,7 @@
 					"wepcap": 50,
 					"weprate": 10.1,
 					"name": "Guardian Power Distributor",
-					"symbol": "Int_GuardianPowerDistributor_Size7"
+					"symbol": "Int_GuardianPowerDistributor_Size8"
 				}
 			],
 			"s": [
@@ -9493,7 +9826,8 @@
 					"pp": "Felicia Winters",
 					"rating": "E",
 					"rof": 1.664,
-					"thermload": 1
+					"thermload": 1,
+					"symbol": "Hpt_PulseLaser_Fixed_Medium_Disruptor"
 				},
 				{
 					"breachdmg": 5.1,
@@ -10426,7 +10760,8 @@
 					"reload": 4,
 					"rof": 4.3,
 					"shotspeed": 1800,
-					"thermload": 0.2
+					"thermload": 0.2,
+					"symbol": "Hpt_MultiCannon_Fixed_Small_Strong"
 				},
 				{
 					"ammo": 2100,
@@ -12302,7 +12637,8 @@
 					"pp": "Zemina Torval",
 					"range": 2000,
 					"rating": "D",
-					"thermload": 6
+					"thermload": 6,
+					"symbol": "Hpt_MiningLaser_Fixed_Small_Advanced"
 				},
 				{
 					"breachdmg": 0.6,
@@ -19138,6 +19474,205 @@
 					"hacktime": 10,
 					"symbol": "Int_DroneControl_Recon_Size7_Class1"
 				}
+			],
+			"gsrp": [
+				{
+					"shieldaddition": 44,
+					"class": 1,
+					"cost": 10000,
+					"edID": 128668537,
+					"power": 0.35,
+					"eddbID": 1373,
+					"grp": "gsrp",
+					"id": "0Z",
+					"mass": 2,
+					"rating": "E",
+					"symbol": "Int_GuardianShieldReinforcement_Size1_Class1"
+				},
+				{
+					"shieldaddition": 61,
+					"class": 1,
+					"cost": 24000,
+					"edID": 128668537,
+					"power": 0.46,
+					"eddbID": 1373,
+					"grp": "gsrp",
+					"id": "0y",
+					"mass": 1,
+					"rating": "D",
+					"symbol": "Int_GuardianShieldReinforcement_Size1_Class2"
+				},
+				{
+					"shieldaddition": 83,
+					"class": 2,
+					"cost": 24000,
+					"edID": 128668537,
+					"power": 0.56,
+					"eddbID": 1373,
+					"grp": "gsrp",
+					"id": "0z",
+					"mass": 4,
+					"rating": "E",
+					"symbol": "Int_GuardianShieldReinforcement_Size2_Class1"
+				},
+				{
+					"shieldaddition": 105,
+					"class": 2,
+					"cost": 72621,
+					"edID": 128668537,
+					"power": 0.67,
+					"eddbID": 1373,
+					"grp": "gsrp",
+					"id": "1E",
+					"mass": 2,
+					"rating": "D",
+					"symbol": "Int_GuardianShieldReinforcement_Size2_Class2"
+				},
+				{
+					"shieldaddition": 143,
+					"class": 3,
+					"cost": 174290,
+					"edID": 128668537,
+					"power": 0.84,
+					"eddbID": 1373,
+					"grp": "gsrp",
+					"id": "1F",
+					"mass": 4,
+					"rating": "D",
+					"symbol": "Int_GuardianShieldReinforcement_Size3_Class2"
+				},
+				{
+					"shieldaddition": 127,
+					"class": 3,
+					"cost": 57600,
+					"edID": 128668537,
+					"power": 0.74,
+					"eddbID": 1373,
+					"grp": "gsrp",
+					"id": "1G",
+					"mass": 8,
+					"rating": "E",
+					"symbol": "Int_GuardianShieldReinforcement_Size3_Class1"
+				},
+				{
+					"shieldaddition": 165,
+					"class": 4,
+					"cost": 138240,
+					"edID": 128668537,
+					"power": 0.95,
+					"eddbID": 1373,
+					"grp": "gsrp",
+					"id": "1I",
+					"mass": 16,
+					"rating": "E",
+					"symbol": "Int_GuardianShieldReinforcement_Size4_Class1"
+				},
+				{
+					"shieldaddition": 182,
+					"class": 4,
+					"cost": 418295,
+					"edID": 128668537,
+					"power": 0.95,
+					"eddbID": 1373,
+					"grp": "gsrp",
+					"id": "1J",
+					"mass": 8,
+					"rating": "D",
+					"symbol": "Int_GuardianShieldReinforcement_Size4_Class2"
+				},
+				{
+					"shieldaddition": 215,
+					"class": 5,
+					"cost": 1003910,
+					"edID": 128668537,
+					"power": 1.26,
+					"eddbID": 1373,
+					"grp": "gsrp",
+					"id": "1K",
+					"mass": 16,
+					"rating": "D",
+					"symbol": "Int_GuardianShieldReinforcement_Size5_Class2"
+				},
+				{
+					"shieldaddition": 198,
+					"class": 5,
+					"cost": 331778,
+					"edID": 128668537,
+					"power": 1.16,
+					"eddbID": 1373,
+					"grp": "gsrp",
+					"id": "1L",
+					"mass": 32,
+					"rating": "E",
+					"symbol": "Int_GuardianShieldReinforcement_Size5_Class1"
+				}
+			],
+			"gfsb": [
+				{
+					"jumpboost": 4,
+					"class": 1,
+					"cost": 10000,
+					"edID": 128668537,
+					"power": 0.75,
+					"eddbID": 1373,
+					"grp": "gfsb",
+					"id": "1H",
+					"mass": 1.3,
+					"rating": "H",
+					"symbol": "Int_GuardianFSDBooster_Size1"
+				},
+				{
+					"jumpboost": 6,
+					"class": 2,
+					"cost": 10000,
+					"edID": 128668537,
+					"power": 0.98,
+					"eddbID": 1373,
+					"grp": "gfsb",
+					"id": "1M",
+					"mass": 1.3,
+					"rating": "H",
+					"symbol": "Int_GuardianFSDBooster_Size2"
+				},
+				{
+					"jumpboost": 7.75,
+					"class": 3,
+					"cost": 10000,
+					"edID": 128668537,
+					"power": 1.27,
+					"eddbID": 1373,
+					"grp": "gfsb",
+					"id": "1N",
+					"mass": 1.3,
+					"rating": "H",
+					"symbol": "Int_GuardianFSDBooster_Size3"
+				},
+				{
+					"jumpboost": 9.25,
+					"class": 4,
+					"cost": 10000,
+					"edID": 128668537,
+					"power": 1.65,
+					"eddbID": 1373,
+					"grp": "gfsb",
+					"id": "1P",
+					"mass": 1.3,
+					"rating": "H",
+					"symbol": "Int_GuardianFSDBooster_Size4"
+				},
+				{
+					"jumpboost": 10.5,
+					"class": 5,
+					"cost": 10000,
+					"edID": 128668537,
+					"power": 2.14,
+					"eddbID": 1373,
+					"grp": "gfsb",
+					"id": "1O",
+					"mass": 1.3,
+					"rating": "H",
+					"symbol": "Int_GuardianFSDBooster_Size5"
+				}
 			]
 		}
 	},
@@ -31574,6 +32109,20 @@
 				"type": "percentage",
 				"method": "multiplicative",
 				"higherbetter": true
+			},
+			"jumpboost": {
+				"id": 47,
+				"name": "jumpboost",
+				"type": "numeric",
+				"method": "additive",
+				"higherbetter": true
+			},
+			"shieldaddition": {
+				"id": 50,
+				"name": "shieldaddition",
+				"type": "numeric",
+				"method": "additive",
+				"higherbetter": true
 			}
 		},
 		"modifierActions": {
@@ -35561,6 +36110,14 @@
 				"blueprints": {},
 				"modifications": []
 			},
+			"gsrp": {
+				"blueprints": {},
+				"modifications": []
+			},
+			"gfsb": {
+				"blueprints": {},
+				"modifications": []
+			},
 			"gpp": {
 				"blueprints": {},
 				"modifications": []
@@ -35834,6 +36391,7 @@
 					"power",
 					"range",
 					"reload",
+					"shotspeed",
 					"rof",
 					"thermload"
 				],
@@ -38648,457 +39206,548 @@
 			"special_auto_loader": {
 				"id": 0,
 				"edname": "special_auto_loader",
-				"name": "Auto loader"
+				"name": "Auto loader",
+				"uuid": "640d6dde-f497-42cd-8bc9-73ab3fa1b43a"
 			},
 			"special_choke_canister": {
 				"id": 1,
 				"edname": "special_choke_canister",
-				"name": "Choke canister"
+				"name": "Choke canister",
+				"uuid": "770007e7-398c-40ce-be02-22b227728aef"
 			},
 			"special_concordant_sequence": {
 				"id": 2,
 				"edname": "special_concordant_sequence",
-				"name": "Concordant sequence"
+				"name": "Concordant sequence",
+				"uuid": "b556c19a-e756-45b1-846f-9ddc61af18a9"
 			},
 			"special_corrosive_shell": {
 				"id": 3,
 				"edname": "special_corrosive_shell",
-				"name": "Corrosive shell"
+				"name": "Corrosive shell",
+				"uuid": "a6faa870-ff89-4e48-b607-424e065cbd43"
 			},
 			"special_blinding_shell": {
 				"id": 4,
 				"edname": "special_blinding_shell",
-				"name": "Dazzle shell"
+				"name": "Dazzle shell",
+				"uuid": "0a1e29ee-2fc7-4cbd-bbda-e8803c3e03ac"
 			},
 			"special_dispersal_field": {
 				"id": 5,
 				"edname": "special_dispersal_field",
-				"name": "Dispersal field"
+				"name": "Dispersal field",
+				"uuid": "0e2dbd63-335d-4dca-8050-c7ca8ddc56b0"
 			},
 			"special_distortion_field": {
 				"id": 6,
 				"edname": "special_distortion_field",
-				"name": "Distortion field"
+				"name": "Distortion field",
+				"uuid": "4da956d5-df5b-4d4f-8651-22fd5e343454"
 			},
 			"special_drag_munitions": {
 				"id": 7,
 				"edname": "special_drag_munitions",
-				"name": "Drag munitions"
+				"name": "Drag munitions",
+				"uuid": "ca4cd540-660a-4fba-b38d-179f72125819"
 			},
 			"special_emissive_munitions": {
 				"id": 8,
 				"edname": "special_emissive_munitions",
-				"name": "Emissive munitions"
+				"name": "Emissive munitions",
+				"uuid": "16c9ed0f-63c0-4ff2-b2e0-59bbb294632d"
 			},
 			"special_feedback_cascade": {
 				"id": 9,
 				"edname": "special_feedback_cascade",
-				"name": "Feedback cascade (Legacy)"
+				"name": "Feedback cascade (Legacy)",
+				"uuid": "fe22ebee-802a-4905-b390-f59a65c1394c"
 			},
 			"special_force_shell": {
 				"id": 10,
 				"edname": "special_force_shell",
-				"name": "Force shell"
+				"name": "Force shell",
+				"uuid": "62056851-d2f2-474d-ba77-66c030c900e9"
 			},
 			"special_fsd_interrupt": {
 				"id": 33,
 				"edname": "special_fsd_interrupt",
-				"name": "FSD interrupt"
+				"name": "FSD interrupt",
+				"uuid": "c1400054-1c2b-487c-8854-7a22d96d4cd2"
 			},
 			"special_high_yield_shell": {
 				"id": 11,
 				"edname": "special_high_yield_shell",
-				"name": "High yield shell"
+				"name": "High yield shell",
+				"uuid": "a950b42c-204f-4775-a0c5-21bfcec1fd14"
 			},
 			"special_incendiary_rounds": {
 				"id": 12,
 				"edname": "special_incendiary_rounds",
-				"name": "Incendiary rounds"
+				"name": "Incendiary rounds",
+				"uuid": "3526773e-a814-4bec-afbf-30db79a3e239"
 			},
 			"special_inertial_impact": {
 				"id": 32,
 				"edname": "special_inertial_impact",
-				"name": "Inertial impact"
+				"name": "Inertial impact",
+				"uuid": "6eda22d3-8049-4bab-a125-762b12fa576a"
 			},
 			"special_ion_disruptor": {
 				"id": 13,
 				"edname": "special_ion_disruptor",
-				"name": "Ion disruptor"
+				"name": "Ion disruptor",
+				"uuid": "d84e40ca-afc1-4b01-9940-034152d288e7"
 			},
 			"special_mass_lock_munition": {
 				"id": 14,
 				"edname": "special_mass_lock_munition",
-				"name": "Mass lock munition"
+				"name": "Mass lock munition",
+				"uuid": "8565714f-912d-488b-82fb-43911504a300"
 			},
 			"special_overload_munitions": {
 				"id": 15,
 				"edname": "special_overload_munitions",
-				"name": "Overload munitions"
+				"name": "Overload munitions",
+				"uuid": "c157bbd1-a14d-4aa2-9081-94cbfbdee558"
 			},
 			"special_penetrator_payload": {
 				"id": 16,
 				"edname": "special_penetrator_payload",
-				"name": "Penetrator payload"
+				"name": "Penetrator payload",
+				"uuid": "39e3bb85-e349-434b-b9fe-7fd02ee57f3d"
 			},
 			"special_phasing_sequence": {
 				"id": 17,
 				"edname": "special_phasing_sequence",
-				"name": "Phasing sequence"
+				"name": "Phasing sequence",
+				"uuid": "47254ea9-c88f-43e0-9166-d1796649917b"
 			},
 			"special_plasma_slug": {
 				"id": 18,
 				"edname": "special_plasma_slug",
-				"name": "Plasma slug (Legacy)"
+				"name": "Plasma slug (Legacy)",
+				"uuid": "8794e18a-ecd5-4ebc-afd7-0b7d0d0cdd91"
 			},
 			"special_radiant_canister": {
 				"id": 19,
 				"edname": "special_radiant_canister",
-				"name": "Radiant Canister"
+				"name": "Radiant Canister",
+				"uuid": "51f84837-e9a5-432c-a125-d4322099266c"
 			},
 			"special_regeneration_sequence": {
 				"id": 20,
 				"edname": "special_regeneration_sequence",
-				"name": "Regeneration sequence"
+				"name": "Regeneration sequence",
+				"uuid": "3bece1bb-7c31-4735-8c18-54dc4a0057bc"
 			},
 			"special_reverberating_cascade": {
 				"id": 21,
 				"edname": "special_reverberating_cascade",
-				"name": "Reverberating cascade"
+				"name": "Reverberating cascade",
+				"uuid": "c03e2f4f-9520-44bb-9a1f-7a917e8e3a48"
 			},
 			"special_scramble_spectrum": {
 				"id": 22,
 				"edname": "special_scramble_spectrum",
-				"name": "Scramble spectrum"
+				"name": "Scramble spectrum",
+				"uuid": "4f42cb92-4440-4295-ada9-fcca788a65b8"
 			},
 			"special_screening_shell": {
 				"id": 23,
 				"edname": "special_screening_shell",
-				"name": "Screening shell"
+				"name": "Screening shell",
+				"uuid": "9cf533fc-ccb1-4c92-8b6b-dd700af2988a"
 			},
 			"special_shiftlock_canister": {
 				"id": 24,
 				"edname": "special_shiftlock_canister",
-				"name": "Shift-lock canister"
+				"name": "Shift-lock canister",
+				"uuid": "1f7b0deb-e023-43e5-96f6-ebf60d683e8b"
 			},
 			"special_smart_rounds": {
 				"id": 25,
 				"edname": "special_smart_rounds",
-				"name": "Smart rounds"
+				"name": "Smart rounds",
+				"uuid": "2a3d8519-27af-44f2-a50b-33095964d1cc"
 			},
 			"special_super_penetrator": {
 				"id": 26,
 				"edname": "special_super_penetrator",
-				"name": "Super penetrator (Legacy)"
+				"name": "Super penetrator (Legacy)",
+				"uuid": "2423e8f7-2384-4d32-8b9d-0e06a42a301d"
 			},
 			"special_lock_breaker": {
 				"id": 27,
 				"edname": "special_lock_breaker",
-				"name": "Target lock breaker"
+				"name": "Target lock breaker",
+				"uuid": "4cf42ed8-574f-4bb8-a1f2-ee154475b463"
 			},
 			"special_thermal_cascade": {
 				"id": 28,
 				"edname": "special_thermal_cascade",
-				"name": "Thermal cascade"
+				"name": "Thermal cascade",
+				"uuid": "e5c8cab4-7a2f-450d-a937-2d0d8b9e3714"
 			},
 			"special_thermal_conduit": {
 				"id": 29,
 				"edname": "special_thermal_conduit",
-				"name": "Thermal conduit"
+				"name": "Thermal conduit",
+				"uuid": "4e4e1f59-6762-47ff-b1fa-40ca43304698"
 			},
 			"special_thermal_vent": {
 				"id": 30,
 				"edname": "special_thermal_vent",
-				"name": "Thermal vent"
+				"name": "Thermal vent",
+				"uuid": "70f11414-7904-405c-92db-806178ee9df4"
 			},
 			"special_thermalshock": {
 				"id": 31,
 				"edname": "special_thermalshock",
-				"name": "Thermal shock"
+				"name": "Thermal shock",
+				"uuid": "fe8b4daa-e65d-464c-811d-400d3632a3d6"
 			},
 			"special_feedback_cascade_cooled": {
 				"name": "Feedback Cascade",
 				"id": 100,
-				"edname": "special_feedback_cascade_cooled"
+				"edname": "special_feedback_cascade_cooled",
+				"uuid": "3c153755-3d2c-4832-bb73-d6b3d0e99a71"
 			},
 			"special_super_penetrator_cooled": {
 				"name": "Super Penetrator",
 				"id": 101,
-				"edname": "special_super_penetrator_cooled"
+				"edname": "special_super_penetrator_cooled",
+				"uuid": "4bb4ec50-40fb-473d-abaf-4fc386aa889c"
 			},
 			"special_plasma_slug_cooled": {
 				"name": "Plasma Slug",
 				"id": 102,
-				"edname": "special_plasma_slug_cooled"
+				"edname": "special_plasma_slug_cooled",
+				"uuid": "58a7b1b6-57b9-40f2-9a5a-712a5388a5eb"
 			},
 			"special_penetrator_munitions": {
 				"name": "Penetrator Munitions",
 				"id": 103,
-				"edname": "special_penetrator_munitions"
+				"edname": "special_penetrator_munitions",
+				"uuid": "35578402-1bc7-4d19-828b-af31ebd79866"
 			},
 			"special_deep_cut_payload": {
 				"name": "Penetrator Payload",
 				"id": 104,
-				"edname": "special_deep_cut_payload"
+				"edname": "special_deep_cut_payload",
+				"uuid": "5d25c5bc-4b45-4119-bd87-71bfd0f85957"
 			},
 			"special_mass_lock": {
 				"name": "Mass Lock Munition",
 				"id": 105,
-				"edname": "special_mass_lock"
+				"edname": "special_mass_lock",
+				"uuid": "9e8635af-4077-4d7a-98dd-5220c8722688"
 			},
 			"special_shield_regenerative": {
 				"name": "Fast Charge",
 				"id": 106,
-				"edname": "special_shield_regenerative"
+				"edname": "special_shield_regenerative",
+				"uuid": "42c5e92d-ccab-435a-b2c6-fd268d39d6f5"
 			},
 			"special_shield_resistive": {
 				"name": "Multi-weave",
 				"id": 107,
-				"edname": "special_shield_resistive"
+				"edname": "special_shield_resistive",
+				"uuid": "dd46c8be-730c-4671-87fe-f98b181b66cf"
 			},
 			"special_shield_health": {
 				"name": "Hi-Cap",
 				"id": 108,
-				"edname": "special_shield_health"
+				"edname": "special_shield_health",
+				"uuid": "603c1ba6-45e6-4401-af56-639c3e7c9b79"
 			},
 			"special_shield_efficient": {
 				"name": "Lo-draw",
 				"id": 109,
-				"edname": "special_shield_efficient"
+				"edname": "special_shield_efficient",
+				"uuid": "66a39288-59d7-4cfb-914d-354a200c0210"
 			},
 			"special_shield_thermic": {
 				"name": "Thermo Block",
 				"id": 110,
-				"edname": "special_shield_thermic"
+				"edname": "special_shield_thermic",
+				"uuid": "c7636c6b-5849-4cad-bd8e-d99968d4014e"
 			},
 			"special_shield_kinetic": {
 				"name": "Force Block",
 				"id": 111,
-				"edname": "special_shield_kinetic"
+				"edname": "special_shield_kinetic",
+				"uuid": "3f9e7ca8-7e07-46c4-ad06-cf3787352201"
 			},
 			"special_shield_toughened": {
 				"name": "Double Braced",
 				"id": 112,
-				"edname": "special_shield_toughened"
+				"edname": "special_shield_toughened",
+				"uuid": "d7d8433c-445c-4d8e-b4a4-3bd78cba9d15"
 			},
 			"special_shield_lightweight": {
 				"name": "Stripped Down",
 				"id": 113,
-				"edname": "special_shield_lightweight"
+				"edname": "special_shield_lightweight",
+				"uuid": "91ff72db-51cf-428d-80a8-be96d6418c4b"
 			},
 			"special_engine_cooled": {
 				"name": "Thermal Spread",
 				"id": 114,
-				"edname": "special_engine_cooled"
+				"edname": "special_engine_cooled",
+				"uuid": "42ff1374-3ecb-4872-abfa-b39b495fb203"
 			},
 			"special_engine_haulage": {
 				"name": "Drive Distributors",
 				"id": 115,
-				"edname": "special_engine_haulage"
+				"edname": "special_engine_haulage",
+				"uuid": "bd3c1991-370e-4b9d-b8cd-d5dec3260647"
 			},
 			"special_engine_overloaded": {
 				"name": "Drag Drives",
 				"id": 116,
-				"edname": "special_engine_overloaded"
+				"edname": "special_engine_overloaded",
+				"uuid": "68998b16-7b65-4f58-8bc0-6e0f2686c367"
 			},
 			"special_engine_toughened": {
 				"name": "Double Braced",
 				"id": 117,
-				"edname": "special_engine_toughened"
+				"edname": "special_engine_toughened",
+				"uuid": "41b04d96-0817-479b-92e5-2114de444170"
 			},
 			"special_engine_lightweight": {
 				"name": "Stripped Down",
 				"id": 118,
-				"edname": "special_engine_lightweight"
+				"edname": "special_engine_lightweight",
+				"uuid": "dd77b197-412e-4ca1-88ed-0939c5c31a01"
 			},
 			"special_fsd_fuelcapacity": {
 				"name": "Deep Charge",
 				"id": 119,
-				"edname": "special_fsd_fuelcapacity"
+				"edname": "special_fsd_fuelcapacity",
+				"uuid": "56f1e58d-2044-4a31-8b54-ad0f99dfd64e"
 			},
 			"special_fsd_heavy": {
 				"name": "Mass Manager",
 				"id": 120,
-				"edname": "special_fsd_heavy"
+				"edname": "special_fsd_heavy",
+				"uuid": "4d7d30c3-970b-4c6e-a507-89ac7e6441bd"
 			},
 			"special_fsd_toughened": {
 				"name": "Double Braced",
 				"id": 121,
-				"edname": "special_fsd_toughened"
+				"edname": "special_fsd_toughened",
+				"uuid": "14c7f016-5c32-4599-8a27-caa1733f92e3"
 			},
 			"special_fsd_lightweight": {
 				"name": "Stripped Down",
 				"id": 122,
-				"edname": "special_fsd_lightweight"
+				"edname": "special_fsd_lightweight",
+				"uuid": "6ab9d9d4-d488-4de8-9c1b-089a31f290a0"
 			},
 			"special_fsd_cooled": {
 				"name": "Thermal Spread",
 				"id": 123,
-				"edname": "special_fsd_cooled"
+				"edname": "special_fsd_cooled",
+				"uuid": "60ab0728-c8cd-47c9-a357-8c8bfeeb7023"
 			},
 			"special_powerplant_highcharge": {
 				"name": "Monstered",
 				"id": 124,
-				"edname": "special_powerplant_highcharge"
+				"edname": "special_powerplant_highcharge",
+				"uuid": "12a57a09-0e05-41a9-9824-14a3618e7a0f"
 			},
 			"special_powerplant_cooled": {
 				"name": "Thermal Spread",
 				"id": 125,
-				"edname": "special_powerplant_cooled"
+				"edname": "special_powerplant_cooled",
+				"uuid": "6cda2960-a05b-4dd1-978c-202d746e47bc"
 			},
 			"special_powerplant_toughened": {
 				"name": "Double Braced",
 				"id": 126,
-				"edname": "special_powerplant_toughened"
+				"edname": "special_powerplant_toughened",
+				"uuid": "1fddaba5-bc0b-492c-9caa-4a72a149532b"
 			},
 			"special_powerplant_lightweight": {
 				"name": "Stripped Down",
 				"id": 127,
-				"edname": "special_powerplant_lightweight"
+				"edname": "special_powerplant_lightweight",
+				"uuid": "11b258eb-36d1-4cbc-be04-7fc426ef3121"
 			},
 			"special_powerdistributor_capacity": {
 				"name": "Cluster Capacitors",
 				"id": 128,
-				"edname": "special_powerdistributor_capacity"
+				"edname": "special_powerdistributor_capacity",
+				"uuid": "c4231886-f988-4a31-a749-2a58550f9e44"
 			},
 			"special_powerdistributor_fast": {
 				"name": "Super Conduits",
 				"id": 129,
-				"edname": "special_powerdistributor_fast"
+				"edname": "special_powerdistributor_fast",
+				"uuid": "b5bb35a1-e851-4d37-8f26-8fe828f84c95"
 			},
 			"special_powerdistributor_efficient": {
 				"name": "Flow Control",
 				"id": 130,
-				"edname": "special_powerdistributor_efficient"
+				"edname": "special_powerdistributor_efficient",
+				"uuid": "c226afaf-ee7f-4809-a4e4-0797d4822a69"
 			},
 			"special_powerdistributor_toughened": {
 				"name": "Double Braced",
 				"id": 131,
-				"edname": "special_powerdistributor_toughened"
+				"edname": "special_powerdistributor_toughened",
+				"uuid": "14d36c9b-efd5-450b-8175-80287daecd78"
 			},
 			"special_powerdistributor_lightweight": {
 				"name": "Stripped Down",
 				"id": 132,
-				"edname": "special_powerdistributor_lightweight"
+				"edname": "special_powerdistributor_lightweight",
+				"uuid": "ec53deaf-ece6-443f-9503-dd3dc5329e14"
 			},
 			"special_shieldcell_gradual": {
 				"name": "Recycling Cell",
 				"id": 133,
-				"edname": "special_shieldcell_gradual"
+				"edname": "special_shieldcell_gradual",
+				"uuid": "c8aa2134-3153-47b8-a367-9c5dbb9c557d"
 			},
 			"special_shieldcell_oversized": {
 				"name": "Boss Cells",
 				"id": 134,
-				"edname": "special_shieldcell_oversized"
+				"edname": "special_shieldcell_oversized",
+				"uuid": "87ed0cec-9624-4ecb-8ffb-cc941464e8d2"
 			},
 			"special_shieldcell_efficient": {
 				"name": "Flow Control",
 				"id": 135,
-				"edname": "special_shieldcell_efficient"
+				"edname": "special_shieldcell_efficient",
+				"uuid": "1d2316b8-3ddb-4db4-b36f-2d3e0e8581b5"
 			},
 			"special_shieldcell_toughened": {
 				"name": "Double Braced",
 				"id": 136,
-				"edname": "special_shieldcell_toughened"
+				"edname": "special_shieldcell_toughened",
+				"uuid": "beecd33b-b171-4a08-9d5a-459266bcb275"
 			},
 			"special_shieldcell_lightweight": {
 				"name": "Stripped Down",
 				"id": 137,
-				"edname": "special_shieldcell_lightweight"
+				"edname": "special_shieldcell_lightweight",
+				"uuid": "b92c2e2e-baa5-4ce9-bf60-05771d7dcbc1"
 			},
 			"special_weapon_damage": {
 				"name": "Oversized",
 				"id": 138,
-				"edname": "special_weapon_damage"
+				"edname": "special_weapon_damage",
+				"uuid": "ceb5c729-4565-4869-ade8-5ee897e8b410"
 			},
 			"special_weapon_rateoffire": {
 				"name": "Multi-servos",
 				"id": 139,
-				"edname": "special_weapon_rateoffire"
+				"edname": "special_weapon_rateoffire",
+				"uuid": "fd62292f-f5ed-4728-bc8a-3ae215ced386"
 			},
 			"special_weapon_efficient": {
 				"name": "Flow Control",
 				"id": 140,
-				"edname": "special_weapon_efficient"
+				"edname": "special_weapon_efficient",
+				"uuid": "d7ae7537-52ce-402a-b997-1cc463d8c7d0"
 			},
 			"special_weapon_toughened": {
 				"name": "Double Braced",
 				"id": 141,
-				"edname": "special_weapon_toughened"
+				"edname": "special_weapon_toughened",
+				"uuid": "167892c7-c4bd-411e-af8a-5bb464beec29"
 			},
 			"special_weapon_lightweight": {
 				"name": "Stripped Down",
 				"id": 142,
-				"edname": "special_weapon_lightweight"
+				"edname": "special_weapon_lightweight",
+				"uuid": "dfc22aad-48b8-4f8d-af16-ec3b978fc8b6"
 			},
 			"special_armour_thermic": {
 				"name": "Reflective Plating",
 				"id": 143,
-				"edname": "special_armour_thermic"
+				"edname": "special_armour_thermic",
+				"uuid": "dfe731fd-b709-4bbb-989b-5190bba4aa0e"
 			},
 			"special_armour_kinetic": {
 				"name": "Angled Plating",
 				"id": 144,
-				"edname": "special_armour_kinetic"
+				"edname": "special_armour_kinetic",
+				"uuid": "4803f4b3-f8ac-44a6-a6da-8d4c94aee048"
 			},
 			"special_armour_explosive": {
 				"name": "Layered Plating",
 				"id": 145,
-				"edname": "special_armour_explosive"
+				"edname": "special_armour_explosive",
+				"uuid": "2af2d71c-b511-49a0-a605-22cfce862a63"
 			},
 			"special_armour_chunky": {
 				"name": "Deep Plating",
 				"id": 146,
-				"edname": "special_armour_chunky"
+				"edname": "special_armour_chunky",
+				"uuid": "c4318e14-d50c-49ff-984f-bacae4aaa334"
 			},
 			"special_hullreinforcement_thermic": {
 				"name": "Reflective Plating",
 				"id": 147,
-				"edname": "special_hullreinforcement_thermic"
+				"edname": "special_hullreinforcement_thermic",
+				"uuid": "6c88aa33-01db-4eda-928e-6ca8b9b1bc3d"
 			},
 			"special_hullreinforcement_kinetic": {
 				"name": "Angled Plating",
 				"id": 148,
-				"edname": "special_hullreinforcement_kinetic"
+				"edname": "special_hullreinforcement_kinetic",
+				"uuid": "e8631809-2915-4373-905c-8dcf3bda6921"
 			},
 			"special_hullreinforcement_explosive": {
 				"name": "Layered Plating",
 				"id": 149,
-				"edname": "special_hullreinforcement_explosive"
+				"edname": "special_hullreinforcement_explosive",
+				"uuid": "cdd19fcc-74b4-463a-a8f1-2e9909da664f"
 			},
 			"special_hullreinforcement_chunky": {
 				"name": "Deep Plating",
 				"id": 150,
-				"edname": "special_hullreinforcement_chunky"
+				"edname": "special_hullreinforcement_chunky",
+				"uuid": "b51706cc-d412-4559-8654-f812d2eb44b9"
 			},
 			"special_shieldbooster_thermic": {
 				"name": "Thermo Block",
 				"id": 151,
-				"edname": "special_shieldbooster_thermic"
+				"edname": "special_shieldbooster_thermic",
+				"uuid": "c3340df8-c6da-49c9-b236-8f1cc4209088"
 			},
 			"special_shieldbooster_kinetic": {
 				"name": "Force Block",
 				"id": 152,
-				"edname": "special_shieldbooster_kinetic"
+				"edname": "special_shieldbooster_kinetic",
+				"uuid": "cb95d9b4-a945-491d-95ad-e230c0454cd9"
 			},
 			"special_shieldbooster_explosive": {
 				"name": "Blast Block",
 				"id": 153,
-				"edname": "special_shieldbooster_explosive"
+				"edname": "special_shieldbooster_explosive",
+				"uuid": "eb1c4a92-03ef-4263-8051-9ac91b2d43b2"
 			},
 			"special_shieldbooster_efficient": {
 				"name": "Flow Control",
 				"id": 154,
-				"edname": "special_shieldbooster_efficient"
+				"edname": "special_shieldbooster_efficient",
+				"uuid": "441e1d85-5174-4172-85ea-caee8d3c632d"
 			},
 			"special_shieldbooster_toughened": {
 				"name": "Double Braced",
 				"id": 155,
-				"edname": "special_shieldbooster_toughened"
+				"edname": "special_shieldbooster_toughened",
+				"uuid": "32cb80c0-bb11-49ea-ae21-4c94eb5f9195"
 			},
 			"special_shieldbooster_chunky": {
 				"name": "Super Capacitors",
 				"id": 156,
-				"edname": "special_shieldbooster_chunky"
+				"edname": "special_shieldbooster_chunky",
+				"uuid": "4197c308-a3df-442a-91c2-db856b4f57cf"
 			}
 		}
 	}
diff --git a/modifications/modifications.json b/modifications/modifications.json
index cc4dc70..5e38baa 100644
--- a/modifications/modifications.json
+++ b/modifications/modifications.json
@@ -47,5 +47,7 @@
     "thermres": {"id": 36, "name": "thermres", "type": "percentage", "method": "additive", "higherbetter": true},
     "wepcap": {"id": 37, "name": "wepcap", "type": "percentage", "method": "multiplicative", "higherbetter": true},
     "weprate": {"id": 38, "name": "weprate", "type": "percentage", "method": "multiplicative", "higherbetter": true},
-    "shieldreinforcement": {"id": 39, "name": "shieldreinforcement", "type": "percentage", "method": "multiplicative", "higherbetter": true}
+    "shieldreinforcement": {"id": 39, "name": "shieldreinforcement", "type": "percentage", "method": "multiplicative", "higherbetter": true},
+    "jumpboost": {"id": 47, "name": "jumpboost", "type": "numeric", "method": "additive", "higherbetter": true},
+    "shieldaddition": {"id": 50, "name": "shieldaddition", "type": "numeric", "method": "additive", "higherbetter": true}
 }
diff --git a/modifications/modules.json b/modifications/modules.json
index f35f964..8f14f47 100644
--- a/modifications/modules.json
+++ b/modifications/modules.json
@@ -3444,6 +3444,18 @@
     "modifications": [
     ]
   },
+  "gsrp": {
+    "blueprints": {
+    },
+    "modifications": [
+    ]
+  },
+  "gfsb": {
+    "blueprints": {
+    },
+    "modifications": [
+    ]
+  },
   "gpp": {
     "blueprints": {
     },
@@ -3721,6 +3733,7 @@
       "power",
       "range",
       "reload",
+      "shotspeed",
       "rof",
       "thermload"
     ],
diff --git a/modifications/specials.json b/modifications/specials.json
index 55380b9..bd824b1 100644
--- a/modifications/specials.json
+++ b/modifications/specials.json
@@ -2,456 +2,547 @@
     "special_auto_loader": {
         "id": 0,
         "edname": "special_auto_loader",
-        "name": "Auto loader"
+        "name": "Auto loader",
+        "uuid": "640d6dde-f497-42cd-8bc9-73ab3fa1b43a"
     },
     "special_choke_canister": {
         "id": 1,
         "edname": "special_choke_canister",
-        "name": "Choke canister"
+        "name": "Choke canister",
+        "uuid": "770007e7-398c-40ce-be02-22b227728aef"
     },
     "special_concordant_sequence": {
         "id": 2,
         "edname": "special_concordant_sequence",
-        "name": "Concordant sequence"
+        "name": "Concordant sequence",
+        "uuid": "b556c19a-e756-45b1-846f-9ddc61af18a9"
     },
     "special_corrosive_shell": {
         "id": 3,
         "edname": "special_corrosive_shell",
-        "name": "Corrosive shell"
+        "name": "Corrosive shell",
+        "uuid": "a6faa870-ff89-4e48-b607-424e065cbd43"
     },
     "special_blinding_shell": {
         "id": 4,
         "edname": "special_blinding_shell",
-        "name": "Dazzle shell"
+        "name": "Dazzle shell",
+        "uuid": "0a1e29ee-2fc7-4cbd-bbda-e8803c3e03ac"
     },
     "special_dispersal_field": {
         "id": 5,
         "edname": "special_dispersal_field",
-        "name": "Dispersal field"
+        "name": "Dispersal field",
+        "uuid": "0e2dbd63-335d-4dca-8050-c7ca8ddc56b0"
     },
     "special_distortion_field": {
         "id": 6,
         "edname": "special_distortion_field",
-        "name": "Distortion field"
+        "name": "Distortion field",
+        "uuid": "4da956d5-df5b-4d4f-8651-22fd5e343454"
     },
     "special_drag_munitions": {
         "id": 7,
         "edname": "special_drag_munitions",
-        "name": "Drag munitions"
+        "name": "Drag munitions",
+        "uuid": "ca4cd540-660a-4fba-b38d-179f72125819"
     },
     "special_emissive_munitions": {
         "id": 8,
         "edname": "special_emissive_munitions",
-        "name": "Emissive munitions"
+        "name": "Emissive munitions",
+        "uuid": "16c9ed0f-63c0-4ff2-b2e0-59bbb294632d"
     },
     "special_feedback_cascade": {
         "id": 9,
         "edname": "special_feedback_cascade",
-        "name": "Feedback cascade (Legacy)"
+        "name": "Feedback cascade (Legacy)",
+        "uuid": "fe22ebee-802a-4905-b390-f59a65c1394c"
     },
     "special_force_shell": {
         "id": 10,
         "edname": "special_force_shell",
-        "name": "Force shell"
+        "name": "Force shell",
+        "uuid": "62056851-d2f2-474d-ba77-66c030c900e9"
     },
     "special_fsd_interrupt": {
         "id": 33,
         "edname": "special_fsd_interrupt",
-        "name": "FSD interrupt"
+        "name": "FSD interrupt",
+        "uuid": "c1400054-1c2b-487c-8854-7a22d96d4cd2"
     },
     "special_high_yield_shell": {
         "id": 11,
         "edname": "special_high_yield_shell",
-        "name": "High yield shell"
+        "name": "High yield shell",
+        "uuid": "a950b42c-204f-4775-a0c5-21bfcec1fd14"
     },
     "special_incendiary_rounds": {
         "id": 12,
         "edname": "special_incendiary_rounds",
-        "name": "Incendiary rounds"
+        "name": "Incendiary rounds",
+        "uuid": "3526773e-a814-4bec-afbf-30db79a3e239"
     },
     "special_inertial_impact": {
         "id": 32,
         "edname": "special_inertial_impact",
-        "name": "Inertial impact"
+        "name": "Inertial impact",
+        "uuid": "6eda22d3-8049-4bab-a125-762b12fa576a"
     },
     "special_ion_disruptor": {
         "id": 13,
         "edname": "special_ion_disruptor",
-        "name": "Ion disruptor"
+        "name": "Ion disruptor",
+        "uuid": "d84e40ca-afc1-4b01-9940-034152d288e7"
     },
     "special_mass_lock_munition": {
         "id": 14,
         "edname": "special_mass_lock_munition",
-        "name": "Mass lock munition"
+        "name": "Mass lock munition",
+        "uuid": "8565714f-912d-488b-82fb-43911504a300"
     },
     "special_overload_munitions": {
         "id": 15,
         "edname": "special_overload_munitions",
-        "name": "Overload munitions"
+        "name": "Overload munitions",
+        "uuid": "c157bbd1-a14d-4aa2-9081-94cbfbdee558"
     },
     "special_penetrator_payload": {
         "id": 16,
         "edname": "special_penetrator_payload",
-        "name": "Penetrator payload"
+        "name": "Penetrator payload",
+        "uuid": "39e3bb85-e349-434b-b9fe-7fd02ee57f3d"
     },
     "special_phasing_sequence": {
         "id": 17,
         "edname": "special_phasing_sequence",
-        "name": "Phasing sequence"
+        "name": "Phasing sequence",
+        "uuid": "47254ea9-c88f-43e0-9166-d1796649917b"
     },
     "special_plasma_slug": {
         "id": 18,
         "edname": "special_plasma_slug",
-        "name": "Plasma slug (Legacy)"
+        "name": "Plasma slug (Legacy)",
+        "uuid": "8794e18a-ecd5-4ebc-afd7-0b7d0d0cdd91"
     },
     "special_radiant_canister": {
         "id": 19,
         "edname": "special_radiant_canister",
-        "name": "Radiant Canister"
+        "name": "Radiant Canister",
+        "uuid": "51f84837-e9a5-432c-a125-d4322099266c"
     },
     "special_regeneration_sequence": {
         "id": 20,
         "edname": "special_regeneration_sequence",
-        "name": "Regeneration sequence"
+        "name": "Regeneration sequence",
+        "uuid": "3bece1bb-7c31-4735-8c18-54dc4a0057bc"
     },
     "special_reverberating_cascade": {
         "id": 21,
         "edname": "special_reverberating_cascade",
-        "name": "Reverberating cascade"
+        "name": "Reverberating cascade",
+        "uuid": "c03e2f4f-9520-44bb-9a1f-7a917e8e3a48"
     },
     "special_scramble_spectrum": {
         "id": 22,
         "edname": "special_scramble_spectrum",
-        "name": "Scramble spectrum"
+        "name": "Scramble spectrum",
+        "uuid": "4f42cb92-4440-4295-ada9-fcca788a65b8"
     },
     "special_screening_shell": {
         "id": 23,
         "edname": "special_screening_shell",
-        "name": "Screening shell"
+        "name": "Screening shell",
+        "uuid": "9cf533fc-ccb1-4c92-8b6b-dd700af2988a"
     },
     "special_shiftlock_canister": {
         "id": 24,
         "edname": "special_shiftlock_canister",
-        "name": "Shift-lock canister"
+        "name": "Shift-lock canister",
+        "uuid": "1f7b0deb-e023-43e5-96f6-ebf60d683e8b"
     },
     "special_smart_rounds": {
         "id": 25,
         "edname": "special_smart_rounds",
-        "name": "Smart rounds"
+        "name": "Smart rounds",
+        "uuid": "2a3d8519-27af-44f2-a50b-33095964d1cc"
     },
     "special_super_penetrator": {
         "id": 26,
         "edname": "special_super_penetrator",
-        "name": "Super penetrator (Legacy)"
+        "name": "Super penetrator (Legacy)",
+        "uuid": "2423e8f7-2384-4d32-8b9d-0e06a42a301d"
     },
     "special_lock_breaker": {
         "id": 27,
         "edname": "special_lock_breaker",
-        "name": "Target lock breaker"
+        "name": "Target lock breaker",
+        "uuid": "4cf42ed8-574f-4bb8-a1f2-ee154475b463"
     },
     "special_thermal_cascade": {
         "id": 28,
         "edname": "special_thermal_cascade",
-        "name": "Thermal cascade"
+        "name": "Thermal cascade",
+        "uuid": "e5c8cab4-7a2f-450d-a937-2d0d8b9e3714"
     },
     "special_thermal_conduit": {
         "id": 29,
         "edname": "special_thermal_conduit",
-        "name": "Thermal conduit"
+        "name": "Thermal conduit",
+        "uuid": "4e4e1f59-6762-47ff-b1fa-40ca43304698"
     },
     "special_thermal_vent": {
         "id": 30,
         "edname": "special_thermal_vent",
-        "name": "Thermal vent"
+        "name": "Thermal vent",
+        "uuid": "70f11414-7904-405c-92db-806178ee9df4"
     },
     "special_thermalshock": {
         "id": 31,
         "edname": "special_thermalshock",
-        "name": "Thermal shock"
+        "name": "Thermal shock",
+        "uuid": "fe8b4daa-e65d-464c-811d-400d3632a3d6"
     },
     "special_feedback_cascade_cooled": {
         "name": "Feedback Cascade",
         "id": 100,
-        "edname": "special_feedback_cascade_cooled"
+        "edname": "special_feedback_cascade_cooled",
+        "uuid": "3c153755-3d2c-4832-bb73-d6b3d0e99a71"
     },
     "special_super_penetrator_cooled": {
         "name": "Super Penetrator",
         "id": 101,
-        "edname": "special_super_penetrator_cooled"
+        "edname": "special_super_penetrator_cooled",
+        "uuid": "4bb4ec50-40fb-473d-abaf-4fc386aa889c"
     },
     "special_plasma_slug_cooled": {
         "name": "Plasma Slug",
         "id": 102,
-        "edname": "special_plasma_slug_cooled"
+        "edname": "special_plasma_slug_cooled",
+        "uuid": "58a7b1b6-57b9-40f2-9a5a-712a5388a5eb"
     },
     "special_penetrator_munitions": {
         "name": "Penetrator Munitions",
         "id": 103,
-        "edname": "special_penetrator_munitions"
+        "edname": "special_penetrator_munitions",
+        "uuid": "35578402-1bc7-4d19-828b-af31ebd79866"
     },
     "special_deep_cut_payload": {
         "name": "Penetrator Payload",
         "id": 104,
-        "edname": "special_deep_cut_payload"
+        "edname": "special_deep_cut_payload",
+        "uuid": "5d25c5bc-4b45-4119-bd87-71bfd0f85957"
     },
     "special_mass_lock": {
         "name": "Mass Lock Munition",
         "id": 105,
-        "edname": "special_mass_lock"
+        "edname": "special_mass_lock",
+        "uuid": "9e8635af-4077-4d7a-98dd-5220c8722688"
     },
     "special_shield_regenerative": {
         "name": "Fast Charge",
         "id": 106,
-        "edname": "special_shield_regenerative"
+        "edname": "special_shield_regenerative",
+        "uuid": "42c5e92d-ccab-435a-b2c6-fd268d39d6f5"
     },
     "special_shield_resistive": {
         "name": "Multi-weave",
         "id": 107,
-        "edname": "special_shield_resistive"
+        "edname": "special_shield_resistive",
+        "uuid": "dd46c8be-730c-4671-87fe-f98b181b66cf"
     },
     "special_shield_health": {
         "name": "Hi-Cap",
         "id": 108,
-        "edname": "special_shield_health"
+        "edname": "special_shield_health",
+        "uuid": "603c1ba6-45e6-4401-af56-639c3e7c9b79"
     },
     "special_shield_efficient": {
         "name": "Lo-draw",
         "id": 109,
-        "edname": "special_shield_efficient"
+        "edname": "special_shield_efficient",
+        "uuid": "66a39288-59d7-4cfb-914d-354a200c0210"
     },
     "special_shield_thermic": {
         "name": "Thermo Block",
         "id": 110,
-        "edname": "special_shield_thermic"
+        "edname": "special_shield_thermic",
+        "uuid": "c7636c6b-5849-4cad-bd8e-d99968d4014e"
     },
     "special_shield_kinetic": {
         "name": "Force Block",
         "id": 111,
-        "edname": "special_shield_kinetic"
+        "edname": "special_shield_kinetic",
+        "uuid": "3f9e7ca8-7e07-46c4-ad06-cf3787352201"
     },
     "special_shield_toughened": {
         "name": "Double Braced",
         "id": 112,
-        "edname": "special_shield_toughened"
+        "edname": "special_shield_toughened",
+        "uuid": "d7d8433c-445c-4d8e-b4a4-3bd78cba9d15"
     },
     "special_shield_lightweight": {
         "name": "Stripped Down",
         "id": 113,
-        "edname": "special_shield_lightweight"
+        "edname": "special_shield_lightweight",
+        "uuid": "91ff72db-51cf-428d-80a8-be96d6418c4b"
     },
     "special_engine_cooled": {
         "name": "Thermal Spread",
         "id": 114,
-        "edname": "special_engine_cooled"
+        "edname": "special_engine_cooled",
+        "uuid": "42ff1374-3ecb-4872-abfa-b39b495fb203"
     },
     "special_engine_haulage": {
         "name": "Drive Distributors",
         "id": 115,
-        "edname": "special_engine_haulage"
+        "edname": "special_engine_haulage",
+        "uuid": "bd3c1991-370e-4b9d-b8cd-d5dec3260647"
     },
     "special_engine_overloaded": {
         "name": "Drag Drives",
         "id": 116,
-        "edname": "special_engine_overloaded"
+        "edname": "special_engine_overloaded",
+        "uuid": "68998b16-7b65-4f58-8bc0-6e0f2686c367"
     },
     "special_engine_toughened": {
         "name": "Double Braced",
         "id": 117,
-        "edname": "special_engine_toughened"
+        "edname": "special_engine_toughened",
+        "uuid": "41b04d96-0817-479b-92e5-2114de444170"
     },
     "special_engine_lightweight": {
         "name": "Stripped Down",
         "id": 118,
-        "edname": "special_engine_lightweight"
+        "edname": "special_engine_lightweight",
+        "uuid": "dd77b197-412e-4ca1-88ed-0939c5c31a01"
     },
     "special_fsd_fuelcapacity": {
         "name": "Deep Charge",
         "id": 119,
-        "edname": "special_fsd_fuelcapacity"
+        "edname": "special_fsd_fuelcapacity",
+        "uuid": "56f1e58d-2044-4a31-8b54-ad0f99dfd64e"
     },
     "special_fsd_heavy": {
         "name": "Mass Manager",
         "id": 120,
-        "edname": "special_fsd_heavy"
+        "edname": "special_fsd_heavy",
+        "uuid": "4d7d30c3-970b-4c6e-a507-89ac7e6441bd"
     },
     "special_fsd_toughened": {
         "name": "Double Braced",
         "id": 121,
-        "edname": "special_fsd_toughened"
+        "edname": "special_fsd_toughened",
+        "uuid": "14c7f016-5c32-4599-8a27-caa1733f92e3"
     },
     "special_fsd_lightweight": {
         "name": "Stripped Down",
         "id": 122,
-        "edname": "special_fsd_lightweight"
+        "edname": "special_fsd_lightweight",
+        "uuid": "6ab9d9d4-d488-4de8-9c1b-089a31f290a0"
     },
     "special_fsd_cooled": {
         "name": "Thermal Spread",
         "id": 123,
-        "edname": "special_fsd_cooled"
+        "edname": "special_fsd_cooled",
+        "uuid": "60ab0728-c8cd-47c9-a357-8c8bfeeb7023"
     },
     "special_powerplant_highcharge": {
         "name": "Monstered",
         "id": 124,
-        "edname": "special_powerplant_highcharge"
+        "edname": "special_powerplant_highcharge",
+        "uuid": "12a57a09-0e05-41a9-9824-14a3618e7a0f"
     },
     "special_powerplant_cooled": {
         "name": "Thermal Spread",
         "id": 125,
-        "edname": "special_powerplant_cooled"
+        "edname": "special_powerplant_cooled",
+        "uuid": "6cda2960-a05b-4dd1-978c-202d746e47bc"
     },
     "special_powerplant_toughened": {
         "name": "Double Braced",
         "id": 126,
-        "edname": "special_powerplant_toughened"
+        "edname": "special_powerplant_toughened",
+        "uuid": "1fddaba5-bc0b-492c-9caa-4a72a149532b"
     },
     "special_powerplant_lightweight": {
         "name": "Stripped Down",
         "id": 127,
-        "edname": "special_powerplant_lightweight"
+        "edname": "special_powerplant_lightweight",
+        "uuid": "11b258eb-36d1-4cbc-be04-7fc426ef3121"
     },
     "special_powerdistributor_capacity": {
         "name": "Cluster Capacitors",
         "id": 128,
-        "edname": "special_powerdistributor_capacity"
+        "edname": "special_powerdistributor_capacity",
+        "uuid": "c4231886-f988-4a31-a749-2a58550f9e44"
     },
     "special_powerdistributor_fast": {
         "name": "Super Conduits",
         "id": 129,
-        "edname": "special_powerdistributor_fast"
+        "edname": "special_powerdistributor_fast",
+        "uuid": "b5bb35a1-e851-4d37-8f26-8fe828f84c95"
     },
     "special_powerdistributor_efficient": {
         "name": "Flow Control",
         "id": 130,
-        "edname": "special_powerdistributor_efficient"
+        "edname": "special_powerdistributor_efficient",
+        "uuid": "c226afaf-ee7f-4809-a4e4-0797d4822a69"
     },
     "special_powerdistributor_toughened": {
         "name": "Double Braced",
         "id": 131,
-        "edname": "special_powerdistributor_toughened"
+        "edname": "special_powerdistributor_toughened",
+        "uuid": "14d36c9b-efd5-450b-8175-80287daecd78"
     },
     "special_powerdistributor_lightweight": {
         "name": "Stripped Down",
         "id": 132,
-        "edname": "special_powerdistributor_lightweight"
+        "edname": "special_powerdistributor_lightweight",
+        "uuid": "ec53deaf-ece6-443f-9503-dd3dc5329e14"
     },
     "special_shieldcell_gradual": {
         "name": "Recycling Cell",
         "id": 133,
-        "edname": "special_shieldcell_gradual"
+        "edname": "special_shieldcell_gradual",
+        "uuid": "c8aa2134-3153-47b8-a367-9c5dbb9c557d"
     },
     "special_shieldcell_oversized": {
         "name": "Boss Cells",
         "id": 134,
-        "edname": "special_shieldcell_oversized"
+        "edname": "special_shieldcell_oversized",
+        "uuid": "87ed0cec-9624-4ecb-8ffb-cc941464e8d2"
     },
     "special_shieldcell_efficient": {
         "name": "Flow Control",
         "id": 135,
-        "edname": "special_shieldcell_efficient"
+        "edname": "special_shieldcell_efficient",
+        "uuid": "1d2316b8-3ddb-4db4-b36f-2d3e0e8581b5"
     },
     "special_shieldcell_toughened": {
         "name": "Double Braced",
         "id": 136,
-        "edname": "special_shieldcell_toughened"
+        "edname": "special_shieldcell_toughened",
+        "uuid": "beecd33b-b171-4a08-9d5a-459266bcb275"
     },
     "special_shieldcell_lightweight": {
         "name": "Stripped Down",
         "id": 137,
-        "edname": "special_shieldcell_lightweight"
+        "edname": "special_shieldcell_lightweight",
+        "uuid": "b92c2e2e-baa5-4ce9-bf60-05771d7dcbc1"
     },
     "special_weapon_damage": {
         "name": "Oversized",
         "id": 138,
-        "edname": "special_weapon_damage"
+        "edname": "special_weapon_damage",
+        "uuid": "ceb5c729-4565-4869-ade8-5ee897e8b410"
     },
     "special_weapon_rateoffire": {
         "name": "Multi-servos",
         "id": 139,
-        "edname": "special_weapon_rateoffire"
+        "edname": "special_weapon_rateoffire",
+        "uuid": "fd62292f-f5ed-4728-bc8a-3ae215ced386"
     },
     "special_weapon_efficient": {
         "name": "Flow Control",
         "id": 140,
-        "edname": "special_weapon_efficient"
+        "edname": "special_weapon_efficient",
+        "uuid": "d7ae7537-52ce-402a-b997-1cc463d8c7d0"
     },
     "special_weapon_toughened": {
         "name": "Double Braced",
         "id": 141,
-        "edname": "special_weapon_toughened"
+        "edname": "special_weapon_toughened",
+        "uuid": "167892c7-c4bd-411e-af8a-5bb464beec29"
     },
     "special_weapon_lightweight": {
         "name": "Stripped Down",
         "id": 142,
-        "edname": "special_weapon_lightweight"
+        "edname": "special_weapon_lightweight",
+        "uuid": "dfc22aad-48b8-4f8d-af16-ec3b978fc8b6"
     },
     "special_armour_thermic": {
         "name": "Reflective Plating",
         "id": 143,
-        "edname": "special_armour_thermic"
+        "edname": "special_armour_thermic",
+        "uuid": "dfe731fd-b709-4bbb-989b-5190bba4aa0e"
     },
     "special_armour_kinetic": {
         "name": "Angled Plating",
         "id": 144,
-        "edname": "special_armour_kinetic"
+        "edname": "special_armour_kinetic",
+        "uuid": "4803f4b3-f8ac-44a6-a6da-8d4c94aee048"
     },
     "special_armour_explosive": {
         "name": "Layered Plating",
         "id": 145,
-        "edname": "special_armour_explosive"
+        "edname": "special_armour_explosive",
+        "uuid": "2af2d71c-b511-49a0-a605-22cfce862a63"
     },
     "special_armour_chunky": {
         "name": "Deep Plating",
         "id": 146,
-        "edname": "special_armour_chunky"
+        "edname": "special_armour_chunky",
+        "uuid": "c4318e14-d50c-49ff-984f-bacae4aaa334"
     },
     "special_hullreinforcement_thermic": {
         "name": "Reflective Plating",
         "id": 147,
-        "edname": "special_hullreinforcement_thermic"
+        "edname": "special_hullreinforcement_thermic",
+        "uuid": "6c88aa33-01db-4eda-928e-6ca8b9b1bc3d"
     },
     "special_hullreinforcement_kinetic": {
         "name": "Angled Plating",
         "id": 148,
-        "edname": "special_hullreinforcement_kinetic"
+        "edname": "special_hullreinforcement_kinetic",
+        "uuid": "e8631809-2915-4373-905c-8dcf3bda6921"
     },
     "special_hullreinforcement_explosive": {
         "name": "Layered Plating",
         "id": 149,
-        "edname": "special_hullreinforcement_explosive"
+        "edname": "special_hullreinforcement_explosive",
+        "uuid": "cdd19fcc-74b4-463a-a8f1-2e9909da664f"
     },
     "special_hullreinforcement_chunky": {
         "name": "Deep Plating",
         "id": 150,
-        "edname": "special_hullreinforcement_chunky"
+        "edname": "special_hullreinforcement_chunky",
+        "uuid": "b51706cc-d412-4559-8654-f812d2eb44b9"
     },
     "special_shieldbooster_thermic": {
         "name": "Thermo Block",
         "id": 151,
-        "edname": "special_shieldbooster_thermic"
+        "edname": "special_shieldbooster_thermic",
+        "uuid": "c3340df8-c6da-49c9-b236-8f1cc4209088"
     },
     "special_shieldbooster_kinetic": {
         "name": "Force Block",
         "id": 152,
-        "edname": "special_shieldbooster_kinetic"
+        "edname": "special_shieldbooster_kinetic",
+        "uuid": "cb95d9b4-a945-491d-95ad-e230c0454cd9"
     },
     "special_shieldbooster_explosive": {
         "name": "Blast Block",
         "id": 153,
-        "edname": "special_shieldbooster_explosive"
+        "edname": "special_shieldbooster_explosive",
+        "uuid": "eb1c4a92-03ef-4263-8051-9ac91b2d43b2"
     },
     "special_shieldbooster_efficient": {
         "name": "Flow Control",
         "id": 154,
-        "edname": "special_shieldbooster_efficient"
+        "edname": "special_shieldbooster_efficient",
+        "uuid": "441e1d85-5174-4172-85ea-caee8d3c632d"
     },
     "special_shieldbooster_toughened": {
         "name": "Double Braced",
         "id": 155,
-        "edname": "special_shieldbooster_toughened"
+        "edname": "special_shieldbooster_toughened",
+        "uuid": "32cb80c0-bb11-49ea-ae21-4c94eb5f9195"
     },
     "special_shieldbooster_chunky": {
         "name": "Super Capacitors",
         "id": 156,
-        "edname": "special_shieldbooster_chunky"
+        "edname": "special_shieldbooster_chunky",
+        "uuid": "4197c308-a3df-442a-91c2-db856b4f57cf"
     }
 }
\ No newline at end of file
diff --git a/modules/hardpoints/mining_laser.json b/modules/hardpoints/mining_laser.json
index 14c6a30..40c8b69 100644
--- a/modules/hardpoints/mining_laser.json
+++ b/modules/hardpoints/mining_laser.json
@@ -77,7 +77,8 @@
       "pp": "Zemina Torval",
       "range": 2000,
       "rating": "D",
-      "thermload": 6
+      "thermload": 6,
+      "symbol": "Hpt_MiningLaser_Fixed_Small_Advanced"
     },
     {
       "breachdmg": 0.6,
@@ -132,4 +133,4 @@
       "symbol": "Hpt_MiningLaser_Turret_Medium"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/modules/hardpoints/multi_cannon.json b/modules/hardpoints/multi_cannon.json
index 823f370..5e3b967 100644
--- a/modules/hardpoints/multi_cannon.json
+++ b/modules/hardpoints/multi_cannon.json
@@ -123,7 +123,8 @@
       "reload": 4,
       "rof": 4.3,
       "shotspeed": 1800,
-      "thermload": 0.2
+      "thermload": 0.2,
+      "symbol": "Hpt_MultiCannon_Fixed_Small_Strong"
     },
     {
       "ammo": 2100,
@@ -345,4 +346,4 @@
       "symbol": "Hpt_MultiCannon_Gimbal_Huge"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/modules/hardpoints/pulse_laser.json b/modules/hardpoints/pulse_laser.json
index 26820c8..1a11c39 100644
--- a/modules/hardpoints/pulse_laser.json
+++ b/modules/hardpoints/pulse_laser.json
@@ -187,7 +187,8 @@
       "pp": "Felicia Winters",
       "rating": "E",
       "rof": 1.664,
-      "thermload": 1
+      "thermload": 1,
+      "symbol": "Hpt_PulseLaser_Fixed_Medium_Disruptor"
     },
     {
       "breachdmg": 5.1,
@@ -325,4 +326,4 @@
       "symbol": "Hpt_PulseLaser_Gimbal_Huge"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/modules/index.js b/modules/index.js
index 1f83702..4ed58e6 100644
--- a/modules/index.js
+++ b/modules/index.js
@@ -65,6 +65,8 @@ module.exports = {
     sg: require('./internal/shield_generator').sg,
     ss: require('./internal/surface_scanner').ss,
     rpl: require('./internal/repair_limpet_controller').rpl,
-    rcpl: require('./internal/recon_limpet_controllers').rcpl
+    rcpl: require('./internal/recon_limpet_controllers').rcpl,
+    gsrp: require('./internal/guardian_shield_reinforcement_package').gsrp,
+    gfsb: require('./internal/guardian_fsd_booster').gfsb
   }
 }
diff --git a/modules/internal/guardian_fsd_booster.json b/modules/internal/guardian_fsd_booster.json
new file mode 100644
index 0000000..8bf4614
--- /dev/null
+++ b/modules/internal/guardian_fsd_booster.json
@@ -0,0 +1,69 @@
+{
+  "gfsb": [
+    {
+      "jumpboost": 4,
+      "class": 1,
+      "cost": 10000,
+      "edID": 128668537,
+      "power": 0.75,
+      "eddbID": 1373,
+      "grp": "gfsb",
+      "id": "1H",
+      "mass": 1.3,
+      "rating": "H",
+      "symbol": "Int_GuardianFSDBooster_Size1"
+    },
+    {
+      "jumpboost": 6,
+      "class": 2,
+      "cost": 10000,
+      "edID": 128668537,
+      "power": 0.98,
+      "eddbID": 1373,
+      "grp": "gfsb",
+      "id": "1M",
+      "mass": 1.3,
+      "rating": "H",
+      "symbol": "Int_GuardianFSDBooster_Size2"
+    },
+    {
+      "jumpboost": 7.75,
+      "class": 3,
+      "cost": 10000,
+      "edID": 128668537,
+      "power": 1.27,
+      "eddbID": 1373,
+      "grp": "gfsb",
+      "id": "1N",
+      "mass": 1.3,
+      "rating": "H",
+      "symbol": "Int_GuardianFSDBooster_Size3"
+    },
+    {
+      "jumpboost": 9.25,
+      "class": 4,
+      "cost": 10000,
+      "edID": 128668537,
+      "power": 1.65,
+      "eddbID": 1373,
+      "grp": "gfsb",
+      "id": "1P",
+      "mass": 1.3,
+      "rating": "H",
+      "symbol": "Int_GuardianFSDBooster_Size4"
+    },
+    {
+      "jumpboost": 10.5,
+      "class": 5,
+      "cost": 10000,
+      "edID": 128668537,
+      "power": 2.14,
+      "eddbID": 1373,
+      "grp": "gfsb",
+      "id": "1O",
+      "mass": 1.3,
+      "rating": "H",
+      "symbol": "Int_GuardianFSDBooster_Size5"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/modules/internal/guardian_shield_reinforcement_package.json b/modules/internal/guardian_shield_reinforcement_package.json
new file mode 100644
index 0000000..20cec9a
--- /dev/null
+++ b/modules/internal/guardian_shield_reinforcement_package.json
@@ -0,0 +1,134 @@
+{
+  "gsrp": [
+    {
+      "shieldaddition": 44,
+      "class": 1,
+      "cost": 10000,
+      "edID": 128668537,
+      "power": 0.35,
+      "eddbID": 1373,
+      "grp": "gsrp",
+      "id": "0Z",
+      "mass": 2,
+      "rating": "E",
+      "symbol": "Int_GuardianShieldReinforcement_Size1_Class1"
+    },
+    {
+      "shieldaddition": 61,
+      "class": 1,
+      "cost": 24000,
+      "edID": 128668537,
+      "power": 0.46,
+      "eddbID": 1373,
+      "grp": "gsrp",
+      "id": "0y",
+      "mass": 1,
+      "rating": "D",
+      "symbol": "Int_GuardianShieldReinforcement_Size1_Class2"
+    },
+    {
+      "shieldaddition": 83,
+      "class": 2,
+      "cost": 24000,
+      "edID": 128668537,
+      "power": 0.56,
+      "eddbID": 1373,
+      "grp": "gsrp",
+      "id": "0z",
+      "mass": 4,
+      "rating": "E",
+      "symbol": "Int_GuardianShieldReinforcement_Size2_Class1"
+    },
+    {
+      "shieldaddition": 105,
+      "class": 2,
+      "cost": 72621,
+      "edID": 128668537,
+      "power": 0.67,
+      "eddbID": 1373,
+      "grp": "gsrp",
+      "id": "1E",
+      "mass": 2,
+      "rating": "D",
+      "symbol": "Int_GuardianShieldReinforcement_Size2_Class2"
+    },
+    {
+      "shieldaddition": 143,
+      "class": 3,
+      "cost": 174290,
+      "edID": 128668537,
+      "power": 0.84,
+      "eddbID": 1373,
+      "grp": "gsrp",
+      "id": "1F",
+      "mass": 4,
+      "rating": "D",
+      "symbol": "Int_GuardianShieldReinforcement_Size3_Class2"
+    },
+    {
+      "shieldaddition": 127,
+      "class": 3,
+      "cost": 57600,
+      "edID": 128668537,
+      "power": 0.74,
+      "eddbID": 1373,
+      "grp": "gsrp",
+      "id": "1G",
+      "mass": 8,
+      "rating": "E",
+      "symbol": "Int_GuardianShieldReinforcement_Size3_Class1"
+    },
+    {
+      "shieldaddition": 165,
+      "class": 4,
+      "cost": 138240,
+      "edID": 128668537,
+      "power": 0.95,
+      "eddbID": 1373,
+      "grp": "gsrp",
+      "id": "1I",
+      "mass": 16,
+      "rating": "E",
+      "symbol": "Int_GuardianShieldReinforcement_Size4_Class1"
+    },
+    {
+      "shieldaddition": 182,
+      "class": 4,
+      "cost": 418295,
+      "edID": 128668537,
+      "power": 0.95,
+      "eddbID": 1373,
+      "grp": "gsrp",
+      "id": "1J",
+      "mass": 8,
+      "rating": "D",
+      "symbol": "Int_GuardianShieldReinforcement_Size4_Class2"
+    },
+    {
+      "shieldaddition": 215,
+      "class": 5,
+      "cost": 1003910,
+      "edID": 128668537,
+      "power": 1.26,
+      "eddbID": 1373,
+      "grp": "gsrp",
+      "id": "1K",
+      "mass": 16,
+      "rating": "D",
+      "symbol": "Int_GuardianShieldReinforcement_Size5_Class2"
+    },
+    {
+      "shieldaddition": 198,
+      "class": 5,
+      "cost": 331778,
+      "edID": 128668537,
+      "power": 1.16,
+      "eddbID": 1373,
+      "grp": "gsrp",
+      "id": "1L",
+      "mass": 32,
+      "rating": "E",
+      "symbol": "Int_GuardianShieldReinforcement_Size5_Class1"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/modules/standard/power_distributor.json b/modules/standard/power_distributor.json
index 9d2ee7f..50d20f6 100644
--- a/modules/standard/power_distributor.json
+++ b/modules/standard/power_distributor.json
@@ -790,7 +790,7 @@
       "grp": "pd",
       "id": "0U",
       "integrity": 56,
-      "mass": 1.4,
+      "mass": 2.6,
       "power": 0.62,
       "rating": "A",
       "syscap": 10,
@@ -810,7 +810,7 @@
       "grp": "pd",
       "id": "0X",
       "integrity": 56,
-      "mass": 2.6,
+      "mass": 5.25,
       "power": 0.62,
       "rating": "A",
       "syscap": 14,
@@ -830,7 +830,7 @@
       "grp": "pd",
       "id": "1A",
       "integrity": 56,
-      "mass": 2.6,
+      "mass": 10.5,
       "power": 0.62,
       "rating": "A",
       "syscap": 14,
@@ -850,7 +850,7 @@
       "grp": "pd",
       "id": "1A",
       "integrity": 56,
-      "mass": 2.6,
+      "mass": 21,
       "power": 0.62,
       "rating": "A",
       "syscap": 22,
@@ -870,7 +870,7 @@
       "grp": "pd",
       "id": "1B",
       "integrity": 56,
-      "mass": 2.6,
+      "mass": 42,
       "power": 0.62,
       "rating": "A",
       "syscap": 26,
@@ -890,7 +890,7 @@
       "grp": "pd",
       "id": "1C",
       "integrity": 56,
-      "mass": 2.6,
+      "mass": 84,
       "power": 0.62,
       "rating": "A",
       "syscap": 31,
@@ -910,7 +910,7 @@
       "grp": "pd",
       "id": "1D",
       "integrity": 56,
-      "mass": 2.6,
+      "mass": 168,
       "power": 0.62,
       "rating": "A",
       "syscap": 36,
@@ -918,7 +918,7 @@
       "wepcap": 50,
       "weprate": 10.1,
       "name": "Guardian Power Distributor",
-      "symbol": "Int_GuardianPowerDistributor_Size7"
+      "symbol": "Int_GuardianPowerDistributor_Size8"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/modules/standard/power_plant.json b/modules/standard/power_plant.json
index 9e01c67..0fa2fdc 100644
--- a/modules/standard/power_plant.json
+++ b/modules/standard/power_plant.json
@@ -492,7 +492,7 @@
     },
     {
       "class": 2,
-      "cost": 162000,
+      "cost": 187360,
       "edID": 128833988,
       "eddbID": 895,
       "eff": 0.5,
@@ -507,7 +507,7 @@
     },
     {
       "class": 3,
-      "cost": 291600,
+      "cost": 468401,
       "edID": 128833989,
       "eddbID": 895,
       "eff": 0.5,
@@ -522,7 +522,7 @@
     },
     {
       "class": 4,
-      "cost": 524880,
+      "cost": 1686243,
       "edID": 128833990,
       "eddbID": 895,
       "eff": 0.5,
@@ -537,7 +537,7 @@
     },
     {
       "class": 5,
-      "cost": 944790,
+      "cost": 5058729,
       "edID": 128833991,
       "eddbID": 895,
       "eff": 0.5,
@@ -552,7 +552,7 @@
     },
     {
       "class": 6,
-      "cost": 1700610,
+      "cost": 15176184,
       "edID": 128833992,
       "eddbID": 895,
       "eff": 0.5,
@@ -567,7 +567,7 @@
     },
     {
       "class": 7,
-      "cost": 3061100,
+      "cost": 45528551,
       "edID": 128833993,
       "eddbID": 895,
       "eff": 0.5,
@@ -582,7 +582,7 @@
     },
     {
       "class": 8,
-      "cost": 5509980,
+      "cost": 136585652,
       "edID": 128833994,
       "eddbID": 895,
       "eff": 0.5,
diff --git a/ships/adder.json b/ships/adder.json
index 8293278..11e1732 100755
--- a/ships/adder.json
+++ b/ships/adder.json
@@ -15,7 +15,7 @@
       "hardness": 35,
       "hullMass": 35,
       "masslock": 7,
-      "pipSpeed": 0.13625,
+      "pipSpeed": 0.13636363636364,
       "pitch": 38,
       "roll": 100,
       "yaw": 14,
diff --git a/ships/alliance_challenger.json b/ships/alliance_challenger.json
new file mode 100644
index 0000000..8a07c1f
--- /dev/null
+++ b/ships/alliance_challenger.json
@@ -0,0 +1,50 @@
+{
+  "alliance_challenger": {
+    "edID": 128816588,
+    "eddbID": 33,
+    "properties": {
+      "name": "Alliance Challenger",
+      "manufacturer": "Lakon",
+      "class": 2,
+      "hullCost": 28041035,
+      "speed": 130,
+      "boost": 310,
+      "boostEnergy": 19,
+      "baseShieldStrength": 220,
+      "baseArmour": 300,
+      "hardness": 65,
+      "hullMass": 450,
+      "masslock": 13,
+      "pipSpeed": 0.0875,
+      "pitch": 32,
+      "roll": 90,
+      "yaw": 16,
+      "crew": 2
+    },
+    "retailCost": 30472265,
+    "requirements": {
+      "horizons": true
+    },
+    "bulkheads": [
+      { "id": "0K", "edID": 128816590, "eddbID": 1640, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "0P", "edID": 128816591, "eddbID": 1641, "grp": "bh", "cost": 6803170, "mass": 40, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "0Q", "edID": 128816592, "eddbID": 1642, "grp": "bh", "cost": 15307134, "mass": 78, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "0R", "edID": 128816593, "eddbID": 1643, "grp": "bh", "cost": 36175859, "mass": 78, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
+      { "id": "0S", "edID": 128816594, "eddbID": 1644, "grp": "bh", "cost": 40087682, "mass": 78, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
+    ],
+    "slots": {
+      "standard": [6, 6, 5, 5, 6, 4, 4],
+      "hardpoints": [3, 2, 2, 2, 1, 1, 1, 0, 0, 0, 0],
+      "internal": [6, 6, 3, 3, 2, 2,
+        { "class": 4, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } },
+        { "class": 4, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } },
+        { "class": 4, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1 } }
+      ]
+    },
+    "defaults": {
+      "standard": ["6E", "6E", "5E", "5E", "6E", "4E", "4C"],
+      "hardpoints": [17, 0, 17, 0, 0, 0, 0, 0, 0, 0],
+      "internal": ["04", "4h", "01", "01", "2h", "", "", "", ""]
+    }
+  }
+}
diff --git a/ships/alliance_chieftain.json b/ships/alliance_chieftain.json
index 884717a..39c3533 100644
--- a/ships/alliance_chieftain.json
+++ b/ships/alliance_chieftain.json
@@ -15,7 +15,7 @@
       "hardness": 65,
       "hullMass": 400,
       "masslock": 13,
-      "pipSpeed": 0.085,
+      "pipSpeed": 0.08695652173913,
       "pitch": 39,
       "roll": 92,
       "yaw": 16,
diff --git a/ships/anaconda.json b/ships/anaconda.json
index ab0cb35..8bd0e4e 100755
--- a/ships/anaconda.json
+++ b/ships/anaconda.json
@@ -15,7 +15,7 @@
       "hardness": 65,
       "hullMass": 400,
       "masslock": 23,
-      "pipSpeed": 0.13875,
+      "pipSpeed": 0.13888888888889,
       "fighterHangars": true,
       "pitch": 25,
       "roll": 60,
diff --git a/ships/diamondback_explorer.json b/ships/diamondback_explorer.json
index 66eea75..95fb190 100644
--- a/ships/diamondback_explorer.json
+++ b/ships/diamondback_explorer.json
@@ -15,7 +15,7 @@
       "hardness": 42,
       "hullMass": 260,
       "masslock": 10,
-      "pipSpeed": 0.09625,
+      "pipSpeed": 0.098214285714286,
       "pitch": 35,
       "roll": 90,
       "yaw": 13,
diff --git a/ships/diamondback_scout.json b/ships/diamondback_scout.json
index 326aee6..5637cc5 100644
--- a/ships/diamondback_scout.json
+++ b/ships/diamondback_scout.json
@@ -15,7 +15,7 @@
       "hardness": 40,
       "hullMass": 170,
       "masslock": 8,
-      "pipSpeed": 0.09875,
+      "pipSpeed": 0.096153846153846,
       "pitch": 42,
       "roll": 100,
       "yaw": 15,
diff --git a/ships/federal_assault_ship.json b/ships/federal_assault_ship.json
index 000bbce..e766b45 100644
--- a/ships/federal_assault_ship.json
+++ b/ships/federal_assault_ship.json
@@ -15,7 +15,7 @@
       "hardness": 60,
       "hullMass": 480,
       "masslock": 14,
-      "pipSpeed": 0.11125,
+      "pipSpeed": 0.071428571428571,
       "pitch": 38,
       "roll": 90,
       "yaw": 19,
diff --git a/ships/federal_dropship.json b/ships/federal_dropship.json
index fa8fb15..4896f05 100755
--- a/ships/federal_dropship.json
+++ b/ships/federal_dropship.json
@@ -15,7 +15,7 @@
       "hardness": 60,
       "hullMass": 580,
       "masslock": 14,
-      "pipSpeed": 0.0725,
+      "pipSpeed": 0.11111111111111,
       "pitch": 30,
       "roll": 80,
       "yaw": 14,
diff --git a/ships/federal_gunship.json b/ships/federal_gunship.json
index 9ce8205..91f4907 100644
--- a/ships/federal_gunship.json
+++ b/ships/federal_gunship.json
@@ -15,7 +15,7 @@
       "hardness": 60,
       "hullMass": 580,
       "masslock": 14,
-      "pipSpeed": 0.1025,
+      "pipSpeed": 0.10294117647059,
       "fighterHangars": true,
       "pitch": 25,
       "roll": 80,
diff --git a/ships/fer_de_lance.json b/ships/fer_de_lance.json
index f59c9cb..9741b6e 100755
--- a/ships/fer_de_lance.json
+++ b/ships/fer_de_lance.json
@@ -15,7 +15,7 @@
       "hardness": 70,
       "hullMass": 250,
       "masslock": 12,
-      "pipSpeed": 0.03875,
+      "pipSpeed": 0.038461538461538,
       "pitch": 38,
       "roll": 90,
       "yaw": 12,
diff --git a/ships/imperial_courier.json b/ships/imperial_courier.json
index a7bd606..c6487ab 100644
--- a/ships/imperial_courier.json
+++ b/ships/imperial_courier.json
@@ -15,7 +15,7 @@
       "hardness": 30,
       "hullMass": 35,
       "masslock": 7,
-      "pipSpeed": 0.05375,
+      "pipSpeed": 0.053571428571429,
       "pitch": 38,
       "roll": 90,
       "yaw": 16,
diff --git a/ships/index.js b/ships/index.js
index 11ad1f1..b4b6fca 100644
--- a/ships/index.js
+++ b/ships/index.js
@@ -1,6 +1,7 @@
 module.exports = {
   adder: require('./adder').adder,
   alliance_chieftain: require('./alliance_chieftain').alliance_chieftain,
+  alliance_challenger: require('./alliance_challenger').alliance_challenger,
   anaconda: require('./anaconda').anaconda,
   asp: require('./asp').asp,
   asp_scout: require('./asp_scout').asp_scout,
@@ -22,6 +23,7 @@ module.exports = {
   imperial_cutter: require('./imperial_cutter').imperial_cutter,
   imperial_eagle: require('./imperial_eagle').imperial_eagle,
   keelback: require('./keelback').keelback,
+  krait_mkii: require('./krait_mkii').krait_mkii,
   orca: require('./orca').orca,
   python: require('./python').python,
   sidewinder: require('./sidewinder').sidewinder,
diff --git a/ships/krait_mkii.json b/ships/krait_mkii.json
new file mode 100644
index 0000000..aeda658
--- /dev/null
+++ b/ships/krait_mkii.json
@@ -0,0 +1,44 @@
+{
+  "krait_mkii": {
+    "edID": 128816567,
+    "eddbID": 17,
+    "properties": {
+      "name": "Krait MkII",
+      "manufacturer": "Faulcon DeLacy",
+      "class": 2,
+      "hullCost": 42409425,
+      "speed": 150,
+      "boost": 330,
+      "boostEnergy": 13,
+      "baseShieldStrength": 220,
+      "baseArmour": 220,
+      "hardness": 55,
+      "hullMass": 320,
+      "masslock": 17,
+      "pipSpeed": 0.09375,
+      "fighterHangars": true,
+      "pitch": 26,
+      "roll": 90,
+      "yaw": 10,
+      "crew": 3
+    },
+    "retailCost": 45814205,
+    "bulkheads": [
+      { "id": "bO", "edID": 128816569, "eddbID": 808, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "bP", "edID": 128816570, "eddbID": 809, "grp": "bh", "cost": 22791270, "mass": 36, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "bQ", "edID": 128816571, "eddbID": 810, "grp": "bh", "cost": 51280360, "mass": 67, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "bR", "edID": 128816572, "eddbID": 811, "grp": "bh", "cost": 121192590, "mass": 67, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
+      { "id": "bS", "edID": 128816573, "eddbID": 812, "grp": "bh", "cost": 134297570, "mass": 67, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
+    ],
+    "slots": {
+      "standard": [7, 6, 5, 4, 7, 6, 5],
+      "hardpoints": [3, 3, 3, 2, 2, 0, 0, 0, 0],
+      "internal": [6, 6, 5, 5, 4, 3, 3, 2]
+    },
+    "defaults": {
+      "standard": ["7E", "6E", "5E", "4E", "7E", "6E", "5C"],
+      "hardpoints": [0, 0, 0, 17, 17, 0, 0, 0, 0],
+      "internal": ["4h", "04", "04", "03", 0, "2h", 0, "00"]
+    }
+  }
+}
diff --git a/ships/orca.json b/ships/orca.json
index 7e96063..8c83932 100755
--- a/ships/orca.json
+++ b/ships/orca.json
@@ -15,7 +15,7 @@
       "hardness": 55,
       "hullMass": 290,
       "masslock": 16,
-      "pipSpeed": 0.08375,
+      "pipSpeed": 0.083333333333333,
       "luxuryCabins": true,
       "pitch": 25,
       "roll": 55,
diff --git a/ships/python.json b/ships/python.json
index b5236f0..ec61d0e 100755
--- a/ships/python.json
+++ b/ships/python.json
@@ -15,7 +15,7 @@
       "hardness": 65,
       "hullMass": 350,
       "masslock": 17,
-      "pipSpeed": 0.0975,
+      "pipSpeed": 0.097826086956522,
       "pitch": 29,
       "roll": 90,
       "yaw": 10,
diff --git a/ships/sidewinder.json b/ships/sidewinder.json
index 25dce4f..dd9e8fc 100755
--- a/ships/sidewinder.json
+++ b/ships/sidewinder.json
@@ -15,7 +15,7 @@
       "hardness": 20,
       "hullMass": 25,
       "masslock": 6,
-      "pipSpeed": 0.1375,
+      "pipSpeed": 0.13636363636364,
       "pitch": 42,
       "roll": 110,
       "yaw": 16,
diff --git a/ships/type_10_defender.json b/ships/type_10_defender.json
index 92b50e5..142b233 100644
--- a/ships/type_10_defender.json
+++ b/ships/type_10_defender.json
@@ -15,7 +15,7 @@
         "hardness": 75,
         "hullMass": 1200,
         "masslock": 26,
-        "pipSpeed": 0.17375,
+        "pipSpeed": 0.041666666666667,
         "fighterHangars": true,
         "pitch": 20,
         "roll": 20,
@@ -24,11 +24,11 @@
       },
       "retailCost": 121454652,
       "bulkheads": [
-        { "id": "Bx", "edID": 128785621, "eddbID": 1627, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
-        { "id": "By", "edID": 128785622, "eddbID": 1628, "grp": "bh", "cost": 30622340, "mass": 75, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
-        { "id": "Bz", "edID": 128785623, "eddbID": 1629, "grp": "bh", "cost": 68900260, "mass": 150, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
-        { "id": "BA", "edID": 128785624, "eddbID": 1630, "grp": "bh", "cost": 162834280, "mass": 150, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
-        { "id": "BB", "edID": 128785625, "eddbID": 1631, "grp": "bh", "cost": 180442120, "mass": 150, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
+        { "id": "1Q", "edID": 128785621, "eddbID": 1627, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+        { "id": "1R", "edID": 128785622, "eddbID": 1628, "grp": "bh", "cost": 30622340, "mass": 75, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+        { "id": "1S", "edID": 128785623, "eddbID": 1629, "grp": "bh", "cost": 68900260, "mass": 150, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
+        { "id": "1T", "edID": 128785624, "eddbID": 1630, "grp": "bh", "cost": 162834280, "mass": 150, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
+        { "id": "1U", "edID": 128785625, "eddbID": 1631, "grp": "bh", "cost": 180442120, "mass": 150, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
       ],
       "slots": {
         "standard": [8, 7, 7, 5, 7, 4, 6],
@@ -42,4 +42,3 @@
       }
     }
   }
-  
diff --git a/ships/type_6_transporter.json b/ships/type_6_transporter.json
index c016af2..505c3c0 100755
--- a/ships/type_6_transporter.json
+++ b/ships/type_6_transporter.json
@@ -15,7 +15,7 @@
       "hardness": 35,
       "hullMass": 155,
       "masslock": 8,
-      "pipSpeed": 0.1475,
+      "pipSpeed": 0.14772727272727,
       "pitch": 30,
       "roll": 100,
       "yaw": 17,
diff --git a/ships/type_7_transport.json b/ships/type_7_transport.json
index 905ac4b..898ac3c 100755
--- a/ships/type_7_transport.json
+++ b/ships/type_7_transport.json
@@ -15,7 +15,7 @@
       "hardness": 54,
       "hullMass": 350,
       "masslock": 10,
-      "pipSpeed": 0.16625,
+      "pipSpeed": 0.16666666666667,
       "pitch": 22,
       "roll": 60,
       "yaw": 22,
diff --git a/ships/type_9_heavy.json b/ships/type_9_heavy.json
index c56bfd9..07a60ed 100755
--- a/ships/type_9_heavy.json
+++ b/ships/type_9_heavy.json
@@ -15,7 +15,7 @@
       "hardness": 65,
       "hullMass": 850,
       "masslock": 16,
-      "pipSpeed": 0.17375,
+      "pipSpeed": 0.17307692307692,
       "fighterHangars": true,
       "pitch": 20,
       "roll": 20,
diff --git a/ships/viper_mk_iv.json b/ships/viper_mk_iv.json
index 1ab7d09..545d08c 100644
--- a/ships/viper_mk_iv.json
+++ b/ships/viper_mk_iv.json
@@ -15,7 +15,7 @@
       "hardness": 35,
       "hullMass": 190,
       "masslock": 7,
-      "pipSpeed": 0.0875,
+      "pipSpeed": 0.087962962962963,
       "pitch": 30,
       "roll": 90,
       "yaw": 12,
diff --git a/ships/vulture.json b/ships/vulture.json
index 010f0e0..a01fdac 100755
--- a/ships/vulture.json
+++ b/ships/vulture.json
@@ -15,7 +15,7 @@
       "hardness": 55,
       "hullMass": 230,
       "masslock": 10,
-      "pipSpeed": 0.02375,
+      "pipSpeed": 0.023809523809524,
       "pitch": 42,
       "roll": 110,
       "yaw": 17,