diff --git a/dist/index.js b/dist/index.js
index 19d4fb6..d84f955 100644
--- a/dist/index.js
+++ b/dist/index.js
@@ -12,7 +12,7 @@ module.exports = {
         boost: 320,
         boostEnergy: 9,
         agility: 8,
-        baseShieldStrength: 60,
+        baseShieldStrength: 78,
         baseArmour: 162,
         hullMass: 35,
         masslock: 7,
@@ -69,15 +69,16 @@ module.exports = {
         manufacturer: "Faulcon DeLacy",
         class: 3,
         hullCost: 141889930,
-        speed: 180,
-        boost: 240,
+        speed: 183,
+        boost: 244,
         boostEnergy: 29,
         agility: 2,
-        baseShieldStrength: 350,
+        baseShieldStrength: 362,
         baseArmour: 945,
         hullMass: 400,
         masslock: 23,
-        pipSpeed: .13875
+        pipSpeed: .13875,
+        fighterHangars: true
       },
       retailCost: 146969450,
       bulkheads: [ {
@@ -130,11 +131,11 @@ module.exports = {
         manufacturer: "Lakon",
         class: 2,
         hullCost: 6135660,
-        speed: 250,
-        boost: 340,
+        speed: 254,
+        boost: 345,
         boostEnergy: 14,
         agility: 6,
-        baseShieldStrength: 140,
+        baseShieldStrength: 152,
         baseArmour: 378,
         hullMass: 280,
         masslock: 11,
@@ -191,11 +192,11 @@ module.exports = {
         manufacturer: "Lakon",
         class: 2,
         hullCost: 3818240,
-        speed: 220,
-        boost: 300,
+        speed: 223,
+        boost: 304,
         boostEnergy: 13,
         agility: 8,
-        baseShieldStrength: 120,
+        baseShieldStrength: 105,
         baseArmour: 324,
         hullMass: 150,
         masslock: 8,
@@ -244,6 +245,109 @@ module.exports = {
         internal: [ "02", "02", "44", 0, 0 ]
       }
     },
+    beluga: {
+      edID: -1,
+      eddbID: -1,
+      properties: {
+        name: "Beluga Liner",
+        manufacturer: "Saud Kruger",
+        class: 3,
+        hullCost: -1,
+        speed: 195,
+        boost: 273,
+        boostEnergy: 20,
+        agility: 2,
+        baseShieldStrength: 92,
+        baseArmour: 504,
+        hullMass: 1100,
+        masslock: 18,
+        pipSpeed: -1,
+        luxuryCabins: true,
+        fighterHangars: true
+      },
+      retailCost: -1,
+      bulkheads: [ {
+        id: "cl",
+        edID: -1,
+        eddbID: -1,
+        cost: 0,
+        mass: 0
+      }, {
+        id: "cm",
+        edID: -1,
+        eddbID: -1,
+        cost: -1,
+        mass: 83
+      }, {
+        id: "cn",
+        edID: -1,
+        eddbID: -1,
+        cost: -1,
+        mass: 165
+      }, {
+        id: "co",
+        edID: -1,
+        eddbID: -1,
+        cost: -1,
+        mass: 165
+      }, {
+        id: "cp",
+        edID: -1,
+        eddbID: -1,
+        cost: -1,
+        mass: 165
+      } ],
+      slots: {
+        standard: [ 6, 7, 7, 8, 6, 5, 7 ],
+        hardpoints: [ 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0 ],
+        internal: [ 6, 6, {
+          class: 6,
+          eligible: {
+            cr: 1,
+            hr: 1,
+            pce: 1,
+            pci: 1,
+            pcm: 1,
+            pcq: 1
+          }
+        }, {
+          class: 6,
+          eligible: {
+            cr: 1,
+            hr: 1,
+            pce: 1,
+            pci: 1,
+            pcm: 1,
+            pcq: 1
+          }
+        }, {
+          class: 5,
+          eligible: {
+            cr: 1,
+            hr: 1,
+            pce: 1,
+            pci: 1,
+            pcm: 1,
+            pcq: 1
+          }
+        }, {
+          class: 5,
+          eligible: {
+            cr: 1,
+            hr: 1,
+            pce: 1,
+            pci: 1,
+            pcm: 1,
+            pcq: 1
+          }
+        }, 4, 3, 3, 3, 3 ]
+      },
+      defaults: {
+        standard: [ "6E", "7E", "7E", "8E", "6E", "5E", "7C" ],
+        hardpoints: [ 17, 17, 0, 0, 0, 0, 0, 0, 0, 0, 0 ],
+        internal: [ "4j", "04", "6dbusiness", "6dbusiness", "4dbusiness", "4dbusiness", "02", "01", 0, 0, "2h" ]
+      }
+    },
     cobra_mk_iii: {
       edID: 128049279,
       eddbID: 4,
@@ -252,11 +356,11 @@ module.exports = {
         manufacturer: "Faulcon DeLacy",
         class: 1,
         hullCost: 205800,
-        speed: 280,
-        boost: 400,
+        speed: 282,
+        boost: 402,
         boostEnergy: 11,
         agility: 6,
-        baseShieldStrength: 80,
+        baseShieldStrength: 92,
         baseArmour: 216,
         hullMass: 180,
         masslock: 8,
@@ -314,10 +418,10 @@ module.exports = {
         class: 1,
         hullCost: 603740,
         speed: 200,
-        boost: 300,
+        boost: 299,
         boostEnergy: 11,
         agility: 4,
-        baseShieldStrength: 120,
+        baseShieldStrength: 125,
         baseArmour: 216,
         hullMass: 210,
         masslock: 8,
@@ -374,11 +478,11 @@ module.exports = {
         manufacturer: "Lakon",
         class: 1,
         hullCost: 1635700,
-        speed: 260,
-        boost: 340,
+        speed: 242,
+        boost: 316,
         boostEnergy: 14,
         agility: 5,
-        baseShieldStrength: 146,
+        baseShieldStrength: 115,
         baseArmour: 270,
         hullMass: 298,
         masslock: 10,
@@ -436,10 +540,10 @@ module.exports = {
         class: 1,
         hullCost: 461340,
         speed: 283,
-        boost: 380,
+        boost: 384,
         boostEnergy: 11,
         agility: 8,
-        baseShieldStrength: 118,
+        baseShieldStrength: 93,
         baseArmour: 216,
         hullMass: 170,
         masslock: 8,
@@ -496,11 +600,11 @@ module.exports = {
         manufacturer: "Core Dynamics",
         class: 1,
         hullCost: 10440,
-        speed: 240,
-        boost: 350,
+        speed: 239,
+        boost: 349,
         boostEnergy: 9,
         agility: 10,
-        baseShieldStrength: 60,
+        baseShieldStrength: 89,
         baseArmour: 72,
         hullMass: 50,
         masslock: 6,
@@ -557,11 +661,11 @@ module.exports = {
         manufacturer: "Core Dynamics",
         class: 2,
         hullCost: 19072e3,
-        speed: 210,
-        boost: 350,
+        speed: 214,
+        boost: 357,
         boostEnergy: 21,
         agility: 6,
-        baseShieldStrength: 200,
+        baseShieldStrength: 133,
         baseArmour: 540,
         hullMass: 480,
         masslock: 14,
@@ -618,15 +722,16 @@ module.exports = {
         manufacturer: "Core Dynamics",
         class: 3,
         hullCost: 182589570,
-        speed: 200,
-        boost: 260,
+        speed: 198,
+        boost: 257,
         boostEnergy: 27,
         agility: 2,
-        baseShieldStrength: 555,
+        baseShieldStrength: 516,
         baseArmour: 666,
         hullMass: 900,
         masslock: 24,
-        pipSpeed: .125
+        pipSpeed: .125,
+        fighterHangars: true
       },
       retailCost: 187969450,
       bulkheads: [ {
@@ -679,11 +784,11 @@ module.exports = {
         manufacturer: "Core Dynamics",
         class: 2,
         hullCost: 13469990,
-        speed: 180,
-        boost: 300,
+        speed: 182,
+        boost: 304,
         boostEnergy: 21,
         agility: 2,
-        baseShieldStrength: 200,
+        baseShieldStrength: 104,
         baseArmour: 540,
         hullMass: 580,
         masslock: 14,
@@ -740,15 +845,16 @@ module.exports = {
         manufacturer: "Core Dynamics",
         class: 2,
         hullCost: 34774790,
-        speed: 170,
-        boost: 280,
+        speed: 171,
+        boost: 282,
         boostEnergy: 21,
         agility: 2,
-        baseShieldStrength: 250,
+        baseShieldStrength: 186,
         baseArmour: 630,
         hullMass: 580,
         masslock: 14,
-        pipSpeed: .1025
+        pipSpeed: .1025,
+        fighterHangars: true
       },
       retailCost: 35814210,
       bulkheads: [ {
@@ -801,11 +907,11 @@ module.exports = {
         manufacturer: "Zorgon Peterson",
         class: 2,
         hullCost: 51232230,
-        speed: 260,
-        boost: 350,
+        speed: 265,
+        boost: 357,
         boostEnergy: 21,
         agility: 6,
-        baseShieldStrength: 300,
+        baseShieldStrength: 271,
         baseArmour: 405,
         hullMass: 250,
         masslock: 12,
@@ -862,11 +968,11 @@ module.exports = {
         manufacturer: "Zorgon Peterson",
         class: 1,
         hullCost: 29790,
-        speed: 200,
-        boost: 300,
+        speed: 203,
+        boost: 305,
         agility: 6,
         boostEnergy: 7,
-        baseShieldStrength: 50,
+        baseShieldStrength: 65,
         baseArmour: 90,
         hullMass: 14,
         masslock: 6,
@@ -923,11 +1029,11 @@ module.exports = {
         manufacturer: "Gutamaya",
         class: 3,
         hullCost: 21077780,
-        speed: 300,
-        boost: 380,
+        speed: 306,
+        boost: 388,
         boostEnergy: 21,
         agility: 2,
-        baseShieldStrength: 180,
+        baseShieldStrength: 186,
         baseArmour: 486,
         hullMass: 400,
         masslock: 12,
@@ -988,7 +1094,7 @@ module.exports = {
         boost: 380,
         boostEnergy: 11,
         agility: 6,
-        baseShieldStrength: 197,
+        baseShieldStrength: 230,
         baseArmour: 144,
         hullMass: 35,
         masslock: 7,
@@ -1045,15 +1151,16 @@ module.exports = {
         manufacturer: "Gutamaya",
         class: 3,
         hullCost: 199926890,
-        speed: 200,
-        boost: 320,
+        speed: 202,
+        boost: 323,
         boostEnergy: 24,
         agility: 2,
-        baseShieldStrength: 605,
+        baseShieldStrength: 703,
         baseArmour: 720,
         hullMass: 1100,
         masslock: 27,
-        pipSpeed: .05
+        pipSpeed: .05,
+        fighterHangars: true
       },
       retailCost: 208969450,
       bulkheads: [ {
@@ -1106,11 +1213,11 @@ module.exports = {
         manufacturer: "Core Dynamics",
         class: 1,
         hullCost: 72180,
-        speed: 300,
-        boost: 400,
+        speed: 298,
+        boost: 397,
         boostEnergy: 9,
         agility: 6,
-        baseShieldStrength: 80,
+        baseShieldStrength: 104,
         baseArmour: 108,
         hullMass: 50,
         masslock: 6,
@@ -1167,15 +1274,16 @@ module.exports = {
         manufacturer: "Lakon",
         class: 2,
         hullCost: 2951180,
-        speed: 200,
-        boost: 300,
+        speed: 202,
+        boost: 303,
         boostEnergy: 10,
         agility: 2,
-        baseShieldStrength: 110,
-        baseArmour: 198,
+        baseShieldStrength: 99,
+        baseArmour: 243,
         hullMass: 180,
         masslock: 8,
-        pipSpeed: .1375
+        pipSpeed: .1375,
+        fighterHangars: true
       },
       retailCost: 3126150,
       bulkheads: [ {
@@ -1212,12 +1320,12 @@ module.exports = {
       slots: {
         standard: [ 4, 4, 4, 1, 3, 2, 4 ],
         hardpoints: [ 2, 2, 1, 1, 0, 0, 0 ],
-        internal: [ 5, 5, 3, 3, 2, 2 ]
+        internal: [ 5, 5, 4, 3, 2, 2 ]
       },
       defaults: {
         standard: [ "4E", "4E", "4E", "1E", "3E", "2E", "4C" ],
         hardpoints: [ 0, 0, 17, 17, 0, 0, 0 ],
-        internal: [ "03", "03", "01", "44", "00", "2h" ]
+        internal: [ "03", "03", "02", "44", "00", "2h" ]
       }
     },
     orca: {
@@ -1228,15 +1336,16 @@ module.exports = {
         manufacturer: "Saud Kruger",
         class: 3,
         hullCost: 47798080,
-        speed: 300,
-        boost: 380,
+        speed: 303,
+        boost: 384,
         boostEnergy: 17,
         agility: 2,
-        baseShieldStrength: 220,
+        baseShieldStrength: 114,
         baseArmour: 396,
         hullMass: 580,
         masslock: 13,
-        pipSpeed: .08375
+        pipSpeed: .08375,
+        luxuryCabins: true
       },
       retailCost: 48539890,
       bulkheads: [ {
@@ -1271,26 +1380,34 @@ module.exports = {
         mass: 87
       } ],
       slots: {
-        standard: [ 5, 6, 5, 6, 5, 4, 4 ],
+        standard: [ 5, 6, 5, 6, 5, 4, 5 ],
         hardpoints: [ 3, 2, 2, 0, 0, 0, 0 ],
         internal: [ {
           class: 6,
           eligible: {
             cr: 1,
-            hr: 1
+            hr: 1,
+            pce: 1,
+            pci: 1,
+            pcm: 1,
+            pcq: 1
           }
         }, {
           class: 5,
           eligible: {
             cr: 1,
-            hr: 1
+            hr: 1,
+            pce: 1,
+            pci: 1,
+            pcm: 1,
+            pcq: 1
           }
         }, 5, 5, 4, 3, 2, 2 ]
       },
       defaults: {
-        standard: [ "5E", "6E", "5E", "6E", "5E", "4E", "4C" ],
+        standard: [ "5E", "6E", "5E", "6E", "5E", "4E", "5C" ],
         hardpoints: [ 0, 17, 17, 0, 0, 0, 0 ],
-        internal: [ "04", "03", "03", "4e", "02", 0, 0, "2h" ]
+        internal: [ "6e economy", "4e economy", "03", "4e", "02", 0, 0, "2h" ]
       }
     },
     python: {
@@ -1301,11 +1418,11 @@ module.exports = {
         manufacturer: "Faulcon DeLacy",
         class: 2,
         hullCost: 55171380,
-        speed: 230,
-        boost: 300,
+        speed: 234,
+        boost: 305,
         boostEnergy: 24,
         agility: 6,
-        baseShieldStrength: 260,
+        baseShieldStrength: 294,
         baseArmour: 468,
         hullMass: 350,
         masslock: 17,
@@ -1363,10 +1480,10 @@ module.exports = {
         class: 1,
         hullCost: 12870,
         speed: 220,
-        boost: 320,
+        boost: 321,
         boostEnergy: 7,
         agility: 8,
-        baseShieldStrength: 40,
+        baseShieldStrength: 52,
         baseArmour: 108,
         hullMass: 25,
         masslock: 6,
@@ -1423,11 +1540,11 @@ module.exports = {
         manufacturer: "Lakon",
         class: 2,
         hullCost: 865790,
-        speed: 220,
-        boost: 350,
+        speed: 223,
+        boost: 355,
         boostEnergy: 11,
         agility: 3,
-        baseShieldStrength: 90,
+        baseShieldStrength: 77,
         baseArmour: 162,
         hullMass: 155,
         masslock: 8,
@@ -1484,12 +1601,12 @@ module.exports = {
         manufacturer: "Lakon",
         class: 3,
         hullCost: 16881510,
-        speed: 180,
-        boost: 300,
+        speed: 181,
+        boost: 301,
         boostEnergy: 11,
         agility: 2,
-        baseShieldStrength: 120,
-        baseArmour: 216,
+        baseShieldStrength: 78,
+        baseArmour: 306,
         hullMass: 420,
         masslock: 10,
         pipSpeed: .16625
@@ -1529,12 +1646,12 @@ module.exports = {
       slots: {
         standard: [ 4, 5, 5, 4, 3, 3, 5 ],
         hardpoints: [ 1, 1, 1, 1, 0, 0, 0, 0 ],
-        internal: [ 6, 6, 5, 5, 4, 4, 2, 2 ]
+        internal: [ 6, 6, 6, 5, 5, 5, 3, 3 ]
       },
       defaults: {
         standard: [ "4E", "5E", "5E", "4E", "3E", "3E", "5C" ],
         hardpoints: [ 17, 17, 0, 0, 0, 0, 0, 0 ],
-        internal: [ "04", "04", "03", "03", "02", "49", 0, "2h" ]
+        internal: [ "04", "04", "04", "03", "03", "49", 0, "2h" ]
       }
     },
     type_9_heavy: {
@@ -1545,15 +1662,16 @@ module.exports = {
         manufacturer: "Lakon",
         class: 3,
         hullCost: 73255150,
-        speed: 130,
-        boost: 200,
+        speed: 131,
+        boost: 201,
         boostEnergy: 21,
         agility: 0,
-        baseShieldStrength: 240,
+        baseShieldStrength: 88,
         baseArmour: 432,
         hullMass: 1e3,
         masslock: 16,
-        pipSpeed: .17375
+        pipSpeed: .17375,
+        fighterHangars: true
       },
       retailCost: 76555840,
       bulkheads: [ {
@@ -1606,11 +1724,11 @@ module.exports = {
         manufacturer: "Faulcon DeLacy",
         class: 1,
         hullCost: 95900,
-        speed: 320,
-        boost: 400,
+        speed: 310,
+        boost: 388,
         boostEnergy: 11,
         agility: 6,
-        baseShieldStrength: 105,
+        baseShieldStrength: 137,
         baseArmour: 126,
         hullMass: 60,
         masslock: 7,
@@ -1667,11 +1785,11 @@ module.exports = {
         manufacturer: "Faulcon DeLacy",
         class: 1,
         hullCost: 310220,
-        speed: 270,
-        boost: 340,
+        speed: 271,
+        boost: 342,
         boostEnergy: 10,
         agility: 4,
-        baseShieldStrength: 150,
+        baseShieldStrength: 103,
         baseArmour: 270,
         hullMass: 190,
         masslock: 7,
@@ -1728,11 +1846,11 @@ module.exports = {
         manufacturer: "Core Dynamics",
         class: 1,
         hullCost: 4689640,
-        speed: 210,
-        boost: 340,
+        speed: 215,
+        boost: 348,
         boostEnergy: 17,
         agility: 9,
-        baseShieldStrength: 240,
+        baseShieldStrength: 293,
         baseArmour: 288,
         hullMass: 230,
         masslock: 10,
@@ -2663,7 +2781,7 @@ module.exports = {
       }, {
         id: "tz",
         edID: 128682013,
-        eddbID: 1548,
+        eddbID: 0,
         grp: "t",
         class: 3,
         rating: "A",
@@ -2678,7 +2796,7 @@ module.exports = {
       }, {
         id: "u0",
         edID: 128682014,
-        eddbID: 1547,
+        eddbID: 0,
         grp: "t",
         class: 2,
         rating: "A",
@@ -4800,16 +4918,19 @@ module.exports = {
         rating: "A",
         cost: 177600,
         mass: 16,
+        integrity: 80,
         power: 1.33,
         mount: "F",
         type: "T",
-        damage: 5,
-        armourpen: "A",
-        rof: 2.6,
+        armourpen: 65,
+        breachdps: 22.62,
+        breachmin: .4,
+        breachmax: .8,
         dps: 26.9,
-        mjeps: 4.264,
-        ssdam: 10.2,
-        thermload: 1.6
+        eps: 4.264,
+        hps: 4.16,
+        range: 3e3,
+        rof: 2.6
       }, {
         id: "7r",
         edID: 128681995,
@@ -4819,16 +4940,19 @@ module.exports = {
         rating: "A",
         cost: 877600,
         mass: 16,
+        integrity: 80,
         power: 1.37,
         mount: "G",
         type: "T",
-        damage: 5,
-        armourpen: "A",
-        rof: 2.8,
+        armourpen: 65,
+        breachdps: 18.48,
+        breachmin: .4,
+        breachmax: .8,
         dps: 21.7,
-        mjeps: 4.368,
-        ssdam: 7.8,
-        thermload: 1.6
+        eps: 4.368,
+        hps: 4.48,
+        range: 3e3,
+        rof: 2.8
       }, {
         id: "1d",
         edID: 128049383,
@@ -4838,17 +4962,19 @@ module.exports = {
         rating: "D",
         cost: 70400,
         mass: 8,
+        integrity: 64,
         power: .9,
         mount: "F",
         type: "T",
-        damage: 4,
-        armourpen: "A",
-        rof: 3,
-        dps: 4,
-        mjdps: 21.62,
-        mjeps: 2.86,
-        ssdam: 7.07,
-        thermload: 1
+        armourpen: 52,
+        breachdps: 15.3,
+        breachmin: .4,
+        breachmax: .8,
+        dps: 18.1,
+        eps: 2.88,
+        hps: 3,
+        range: 3e3,
+        rof: 3
       }, {
         id: "1e",
         edID: 128049387,
@@ -4858,17 +4984,19 @@ module.exports = {
         rating: "E",
         cost: 140600,
         mass: 8,
+        integrity: 64,
         power: .92,
         mount: "G",
         type: "T",
-        damage: 3,
-        armourpen: "A",
-        rof: 3.2,
-        dps: 4,
-        mjdps: 18.28,
-        mjeps: 2.98,
-        ssdam: 5.59,
-        thermload: 1
+        armourpen: 52,
+        breachdps: 12.48,
+        breachmin: .4,
+        breachmax: .8,
+        dps: 14.8,
+        eps: 2.944,
+        hps: 2.88,
+        range: 3e3,
+        rof: 3.2
       }, {
         id: "1f",
         edID: 128049390,
@@ -4878,37 +5006,41 @@ module.exports = {
         rating: "F",
         cost: 400400,
         mass: 8,
+        integrity: 64,
         power: .89,
         mount: "T",
         type: "T",
-        damage: 3,
-        armourpen: "A",
-        rof: 2.3,
-        dps: 3,
-        mjdps: 7.05,
-        mjeps: 1.24,
-        ssdam: 3.15,
-        thermload: 1
+        armourpen: 52,
+        breachdps: 8.1,
+        breachmin: .4,
+        breachmax: .8,
+        dps: 9.5,
+        eps: 1.512,
+        hps: 1.62,
+        range: 3e3,
+        rof: 2.7
       }, {
         id: "1a",
         edID: 128049382,
         eddbID: 824,
         grp: "pl",
         class: 2,
-        rating: "E",
+        rating: "F",
         cost: 17600,
         mass: 4,
+        integrity: 51,
         power: .6,
         mount: "F",
         type: "T",
-        damage: 3,
-        armourpen: "A",
-        rof: 3.4,
-        dps: 3,
-        mjdps: 14.29,
-        mjeps: 1.89,
-        ssdam: 4.2,
-        thermload: 1
+        armourpen: 35,
+        breachdps: 10.2,
+        breachmin: .4,
+        breachmax: .8,
+        dps: 12.1,
+        eps: 1.904,
+        hps: 2.04,
+        range: 3e3,
+        rof: 3.4
       }, {
         id: "1b",
         edID: 128049386,
@@ -4918,17 +5050,19 @@ module.exports = {
         rating: "F",
         cost: 35400,
         mass: 4,
+        integrity: 51,
         power: .6,
         mount: "G",
         type: "T",
-        damage: 3,
-        armourpen: "A",
-        rof: 3.6,
-        dps: 3,
-        mjdps: 11.62,
-        mjeps: 1.89,
-        ssdam: 3.24,
-        thermload: 1
+        armourpen: 35,
+        breachdps: 8.28,
+        breachmin: .4,
+        breachmax: .8,
+        dps: 9.6,
+        eps: 1.944,
+        hps: 1.8,
+        range: 3e3,
+        rof: 3.6
       }, {
         id: "1c",
         edID: 128049389,
@@ -4938,17 +5072,19 @@ module.exports = {
         rating: "F",
         cost: 132800,
         mass: 4,
+        integrity: 51,
         power: .58,
         mount: "T",
         type: "T",
-        damage: 2,
-        armourpen: "A",
-        rof: 2.5,
-        dps: 3,
-        mjdps: 4.72,
-        mjeps: .83,
-        ssdam: 1.86,
-        thermload: 1
+        armourpen: 35,
+        breachdps: 5.1,
+        breachmin: .4,
+        breachmax: .8,
+        dps: 6.2,
+        eps: 1,
+        hps: .9,
+        range: 3e3,
+        rof: 3
       }, {
         id: "17",
         edID: 128049381,
@@ -4958,17 +5094,19 @@ module.exports = {
         rating: "F",
         cost: 2200,
         mass: 2,
+        integrity: 40,
         power: .39,
         mount: "F",
         type: "T",
-        damage: 2,
-        armourpen: "A",
-        rof: 3.8,
-        dps: 3,
-        mjdps: 9.35,
-        mjeps: 1.24,
-        ssdam: 2.48,
-        thermload: 1
+        armourpen: 20,
+        breachdps: 6.46,
+        breachmin: .4,
+        breachmax: .8,
+        dps: 7.9,
+        eps: 1.254,
+        hps: 1.14,
+        range: 3e3,
+        rof: 3.8
       }, {
         id: "18",
         edID: 128049385,
@@ -4978,17 +5116,19 @@ module.exports = {
         rating: "G",
         cost: 6600,
         mass: 2,
+        integrity: 40,
         power: .39,
         mount: "G",
         type: "T",
-        damage: 2,
-        armourpen: "A",
-        rof: 4,
-        dps: 3,
-        mjdps: 7.3,
-        mjeps: 1.19,
-        ssdam: 1.88,
-        thermload: 1
+        armourpen: 20,
+        breachdps: 5.2,
+        breachmin: .4,
+        breachmax: .8,
+        dps: 6.2,
+        eps: 1.24,
+        hps: 1.2,
+        range: 3e3,
+        rof: 4
       }, {
         id: "19",
         edID: 128049388,
@@ -4998,17 +5138,19 @@ module.exports = {
         rating: "G",
         cost: 26e3,
         mass: 2,
+        integrity: 40,
         power: .38,
         mount: "T",
         type: "T",
-        damage: 2,
-        armourpen: "A",
-        rof: 2.8,
-        dps: 2,
-        mjdps: 2.9,
-        mjeps: .51,
-        ssdam: 1.07,
-        thermload: 1
+        armourpen: 20,
+        breachdps: 3.3,
+        breachmin: .4,
+        breachmax: .8,
+        dps: 4,
+        eps: .627,
+        hps: 6.6,
+        range: 3e3,
+        rof: 3.3
       }, {
         id: "PL",
         eddbID: 1483,
@@ -5025,8 +5167,7 @@ module.exports = {
         armourpen: "A",
         rof: 1.6,
         dps: 2,
-        thermload: 1,
-        pp: "Felicia Winters"
+        thermload: 1
       } ],
       ul: [ {
         id: "7s",
@@ -5037,16 +5178,21 @@ module.exports = {
         rating: "E",
         cost: 281600,
         mass: 16,
+        integrity: 80,
         power: 2.58,
         mount: "F",
         type: "T",
-        damage: 5,
-        armourpen: "A",
-        rof: 1.6,
+        armourpen: 65,
+        breachdps: 28,
+        breachmin: .4,
+        breachmax: .8,
         dps: 32.3,
-        mjeps: 3.71,
-        ssdam: 20.6,
-        thermload: 4.5
+        eps: 5.936,
+        hps: 7.2,
+        range: 3e3,
+        rof: 1.6,
+        burst: 3,
+        burstrof: 3
       }, {
         id: "7t",
         edID: 128727920,
@@ -5056,16 +5202,21 @@ module.exports = {
         rating: "E",
         cost: 1245600,
         mass: 16,
+        integrity: 80,
         power: 2.59,
         mount: "G",
         type: "T",
-        damage: 4,
-        armourpen: "A",
-        rof: 2.1,
+        armourpen: 65,
+        breachdps: 21.63,
+        breachmin: .4,
+        breachmax: .8,
         dps: 25.9,
-        mjeps: 2.59,
-        ssdam: 12.1,
-        thermload: 3.3
+        eps: 5.712,
+        hps: 6.93,
+        range: 3e3,
+        rof: 2.1,
+        burst: 3,
+        burstrof: 5
       }, {
         id: "14",
         edID: 128049402,
@@ -5075,17 +5226,21 @@ module.exports = {
         rating: "D",
         cost: 140400,
         mass: 8,
+        integrity: 64,
         power: 1.66,
         mount: "F",
         type: "T",
-        damage: 4,
-        armourpen: "B",
-        rof: 1,
-        dps: 4,
-        mjdps: 24.97,
-        mjeps: 3.52,
-        ssdam: 27.85,
-        thermload: 1
+        armourpen: 52,
+        breachdps: 10.53,
+        breachmin: .4,
+        breachmax: .8,
+        dps: 20.8,
+        eps: 3.753,
+        hps: 4.59,
+        range: 3e3,
+        rof: 2.7,
+        burst: 3,
+        burstrof: 7
       }, {
         id: "15",
         edID: 128049406,
@@ -5095,17 +5250,21 @@ module.exports = {
         rating: "E",
         cost: 281600,
         mass: 8,
+        integrity: 64,
         power: 1.65,
         mount: "G",
         type: "T",
-        damage: 3,
-        armourpen: "A",
-        rof: 1.2,
-        dps: 4,
-        mjdps: 18.56,
-        mjeps: 3.27,
-        ssdam: 18.56,
-        thermload: 1
+        armourpen: 52,
+        breachdps: 14.08,
+        breachmin: .4,
+        breachmax: .8,
+        dps: 16.6,
+        eps: 3.712,
+        hps: 4.48,
+        range: 3e3,
+        rof: 3.2,
+        burst: 3,
+        burstrof: 9
       }, {
         id: "16",
         edID: 128049409,
@@ -5115,17 +5274,21 @@ module.exports = {
         rating: "E",
         cost: 800400,
         mass: 8,
+        integrity: 64,
         power: 1.57,
         mount: "T",
         type: "T",
-        damage: 3,
-        armourpen: "A",
-        rof: .9,
-        dps: 4,
-        mjdps: 8.78,
-        mjeps: 1.69,
-        ssdam: 9.45,
-        thermload: 1
+        armourpen: 52,
+        breachdps: 5.58,
+        breachmin: .4,
+        breachmax: .8,
+        dps: 11,
+        eps: 1.913,
+        hps: 2.48,
+        range: 3e3,
+        rof: 3.1,
+        burst: 3,
+        burstrof: 11
       }, {
         id: "7h",
         edID: 128049401,
@@ -5135,14 +5298,21 @@ module.exports = {
         rating: "E",
         cost: 23e3,
         mass: 4,
+        integrity: 40,
         power: 1.05,
         mount: "F",
         type: "T",
-        damage: 3,
-        armourpen: "A",
-        rof: 1.3,
-        dps: 4,
-        thermload: 1
+        armourpen: 35,
+        breachdps: 11.1,
+        breachmin: .4,
+        breachmax: .8,
+        dps: 13,
+        eps: 2.331,
+        hps: 2.96,
+        range: 3e3,
+        rof: 3.7,
+        burst: 3,
+        burstrof: 11
       }, {
         id: "7i",
         edID: 128049405,
@@ -5152,14 +5322,21 @@ module.exports = {
         rating: "F",
         cost: 48500,
         mass: 4,
+        integrity: 40,
         power: 1.04,
         mount: "G",
         type: "T",
-        damage: 3,
-        armourpen: "A",
-        rof: 1.5,
-        dps: 4,
-        thermload: 1
+        armourpen: 35,
+        breachdps: 8.82,
+        breachmin: .4,
+        breachmax: .8,
+        dps: 10.3,
+        eps: 2.31,
+        hps: 2.94,
+        range: 3e3,
+        rof: 4.2,
+        burst: 3,
+        burstrof: 13
       }, {
         id: "7j",
         edID: 128049408,
@@ -5169,14 +5346,21 @@ module.exports = {
         rating: "F",
         cost: 162800,
         mass: 4,
+        integrity: 40,
         power: .98,
         mount: "T",
         type: "T",
-        damage: 2,
-        armourpen: "A",
-        rof: 1.1,
-        dps: 3,
-        thermload: 1
+        armourpen: 35,
+        breachdps: 3.51,
+        breachmin: .4,
+        breachmax: .8,
+        dps: 6.8,
+        eps: 1.209,
+        hps: 1.56,
+        range: 3e3,
+        rof: 3.9,
+        burst: 3,
+        burstrof: 15
       }, {
         id: "11",
         edID: 128049400,
@@ -5186,17 +5370,21 @@ module.exports = {
         rating: "F",
         cost: 4400,
         mass: 2,
+        integrity: 40,
         power: .65,
         mount: "F",
         type: "T",
-        damage: 2,
-        armourpen: "A",
-        rof: 1.6,
-        dps: 3,
-        mjdps: 9.94,
-        mjeps: 1.4,
-        ssdam: 6.45,
-        thermload: 1
+        armourpen: 20,
+        breachdps: 7.05,
+        breachmin: .4,
+        breachmax: .8,
+        dps: 8.1,
+        eps: 1.457,
+        hps: 1.88,
+        range: 3e3,
+        rof: 4.7,
+        burst: 3,
+        burstrof: 15
       }, {
         id: "12",
         edID: 128049404,
@@ -5206,17 +5394,21 @@ module.exports = {
         rating: "G",
         cost: 8600,
         mass: 2,
+        integrity: 40,
         power: .64,
         mount: "G",
         type: "T",
-        damage: 2,
-        armourpen: "A",
-        rof: 1.7,
-        dps: 3,
-        mjdps: 7.95,
-        mjeps: 1.4,
-        ssdam: 4.53,
-        thermload: 1
+        armourpen: 20,
+        breachdps: 5.3,
+        breachmin: .4,
+        breachmax: .8,
+        dps: 6.4,
+        eps: 1.4,
+        hps: 1.6,
+        range: 3e3,
+        rof: 5.3,
+        burst: 3,
+        burstrof: 17
       }, {
         id: "13",
         edID: 128049407,
@@ -5226,17 +5418,21 @@ module.exports = {
         rating: "G",
         cost: 52800,
         mass: 2,
+        integrity: 40,
         power: .6,
         mount: "T",
         type: "T",
-        damage: 1,
-        armourpen: "B",
-        rof: 1.3,
-        dps: 2,
-        mjdps: 2.98,
-        mjeps: .63,
-        ssdam: 2.24,
-        thermload: 1
+        armourpen: 20,
+        breachdps: 1.92,
+        breachmin: .4,
+        breachmax: .8,
+        dps: 4.2,
+        eps: .768,
+        hps: .96,
+        range: 3e3,
+        rof: 4.8,
+        burst: 3,
+        burstrof: 19
       }, {
         id: "cy",
         edID: 128671449,
@@ -5254,45 +5450,48 @@ module.exports = {
         armourpen: "A",
         rof: 1.6,
         dps: 3,
-        thermload: 1,
-        pp: "Archon Delaine"
+        thermload: 1
       } ],
       bl: [ {
         id: "0w",
         edID: 128049431,
-        eddbID: 1540,
+        eddbID: 0,
         grp: "bl",
         class: 4,
         rating: "A",
         cost: 2396160,
         mass: 16,
+        integrity: 80,
         power: 2.9,
         mount: "F",
         type: "T",
-        damage: 7,
-        armourpen: "A",
-        rof: null,
+        armourpen: 60,
+        breachdps: 33.1,
+        breachmin: .4,
+        breachmax: .8,
         dps: 41.4,
-        mjeps: 9.1,
-        thermload: 9.9
+        eps: 9.1,
+        hps: 9.9
       }, {
         id: "0x",
         edID: 128681994,
-        eddbID: 1544,
+        eddbID: 0,
         grp: "bl",
         class: 4,
         rating: "A",
         cost: 8746160,
         mass: 16,
+        integrity: 80,
         power: 2.86,
         mount: "G",
         type: "T",
-        damage: 7,
-        armourpen: "A",
-        rof: null,
+        armourpen: 60,
+        breachdps: 26.1,
+        breachmin: .4,
+        breachmax: .8,
         dps: 32.7,
-        mjeps: 8.99,
-        thermload: 10.6
+        eps: 8.99,
+        hps: 10.6
       }, {
         id: "0u",
         edID: 128049430,
@@ -5302,16 +5501,17 @@ module.exports = {
         rating: "C",
         cost: 1177600,
         mass: 8,
+        integrity: 64,
         power: 1.8,
         mount: "F",
         type: "T",
-        damage: 6,
-        armourpen: "A",
-        rof: null,
-        dps: 5,
-        mjdps: 30.33,
-        mjeps: 5.65,
-        thermload: 5
+        armourpen: 50,
+        breachdps: 20.6,
+        breachmin: .4,
+        breachmax: .8,
+        dps: 25.8,
+        eps: 5.67,
+        hps: 7.2
       }, {
         id: "0v",
         edID: 128049434,
@@ -5321,16 +5521,17 @@ module.exports = {
         rating: "C",
         cost: 2396160,
         mass: 8,
+        integrity: 64,
         power: 1.78,
         mount: "G",
         type: "T",
-        damage: 6,
-        armourpen: "A",
-        rof: null,
-        dps: 4,
-        mjdps: 24,
-        mjeps: 5.59,
-        thermload: 6
+        armourpen: 50,
+        breachdps: 16.2,
+        breachmin: .4,
+        breachmax: .8,
+        dps: 20.3,
+        eps: 5.58,
+        hps: 7.6
       }, {
         id: "0o",
         edID: 128049437,
@@ -5340,16 +5541,17 @@ module.exports = {
         rating: "D",
         cost: 19399600,
         mass: 8,
+        integrity: 64,
         power: 1.68,
         mount: "T",
         type: "T",
-        damage: 5,
-        armourpen: "A",
-        rof: null,
-        dps: 4,
-        mjdps: 14.44,
-        mjeps: 3.54,
-        thermload: 4
+        armourpen: 50,
+        breachdps: 11.5,
+        breachmin: .4,
+        breachmax: .8,
+        dps: 14.4,
+        eps: 3.51,
+        hps: 5.1
       }, {
         id: "0r",
         edID: 128049429,
@@ -5359,16 +5561,17 @@ module.exports = {
         rating: "D",
         cost: 299520,
         mass: 4,
+        integrity: 51,
         power: 1.12,
         mount: "F",
         type: "T",
-        damage: 5,
-        armourpen: "A",
-        rof: null,
-        dps: 4,
-        mjdps: 19.38,
-        mjeps: 3.42,
-        thermload: 4
+        armourpen: 35,
+        breachdps: 12.8,
+        breachmin: .4,
+        breachmax: .8,
+        dps: 16,
+        eps: 3.51,
+        hps: 5.1
       }, {
         id: "0s",
         edID: 128049433,
@@ -5378,16 +5581,17 @@ module.exports = {
         rating: "D",
         cost: 500600,
         mass: 4,
+        integrity: 51,
         power: 1.1,
         mount: "G",
         type: "T",
-        damage: 5,
-        armourpen: "A",
-        rof: null,
-        dps: 4,
-        mjdps: 13.85,
-        mjeps: 3.26,
-        thermload: 4
+        armourpen: 35,
+        breachdps: 10,
+        breachmin: .4,
+        breachmax: .8,
+        dps: 12.5,
+        edps: 3.44,
+        hps: 5.3
       }, {
         id: "0t",
         edID: 128049436,
@@ -5397,16 +5601,17 @@ module.exports = {
         rating: "E",
         cost: 2099900,
         mass: 4,
+        integrity: 51,
         power: 1.03,
         mount: "T",
         type: "T",
-        damage: 4,
-        armourpen: "A",
-        rof: null,
-        dps: 3,
-        mjdps: 8.95,
-        mjeps: 2.1,
-        thermload: 3
+        armourpen: 35,
+        breachdps: 7.1,
+        breachmin: .4,
+        breachmax: .8,
+        dps: 8.8,
+        eps: 2.16,
+        hps: 3.5
       }, {
         id: "10",
         edID: 128049428,
@@ -5416,16 +5621,17 @@ module.exports = {
         rating: "E",
         cost: 37430,
         mass: 2,
+        integrity: 40,
         power: .69,
         mount: "F",
         type: "T",
-        damage: 4,
-        armourpen: "A",
-        rof: null,
-        dps: 3,
-        mjdps: 11.61,
-        mjeps: 2.16,
-        thermload: 3
+        armourpen: 18,
+        breachdps: 7.9,
+        breachmin: .4,
+        breachmax: .8,
+        dps: 9.8,
+        eps: 2.16,
+        hps: 3.5
       }, {
         id: "0p",
         edID: 128049432,
@@ -5435,16 +5641,18 @@ module.exports = {
         rating: "E",
         cost: 74650,
         mass: 2,
+        integrity: 40,
         power: .67,
         mount: "G",
         type: "T",
-        damage: 4,
-        armourpen: "A",
-        rof: null,
-        dps: 3,
-        mjdps: 8.7,
-        mjeps: 2.05,
-        thermload: 3
+        armourpen: 18,
+        breachdps: 6.1,
+        breachmin: .4,
+        breachmax: .8,
+        dps: 7.7,
+        eps: 2.11,
+        hps: 3.7,
+        range: 3e3
       }, {
         id: "0q",
         edID: 128049435,
@@ -5454,16 +5662,17 @@ module.exports = {
         rating: "F",
         cost: 5e5,
         mass: 2,
+        integrity: 40,
         power: .63,
         mount: "T",
         type: "T",
-        damage: 3,
-        armourpen: "A",
-        rof: null,
-        dps: 3,
-        mjdps: 5.49,
-        mjeps: 1.29,
-        thermload: 2
+        armourpen: 18,
+        breachdps: 4.3,
+        breachmin: .4,
+        breachmax: .8,
+        dps: 5.4,
+        eps: 1.32,
+        hps: 2.4
       }, {
         id: "b0",
         eddbID: 1476,
@@ -5478,99 +5687,117 @@ module.exports = {
         type: "T",
         damage: 0,
         armourpen: "A",
-        rof: null,
         dps: 3,
-        thermload: 1,
-        pp: "Edmund Mahon"
+        thermload: 1
       } ],
       mc: [ {
         id: "7n",
         edID: 128049458,
-        eddbID: 1542,
+        eddbID: 0,
         grp: "mc",
         class: 4,
         rating: "A",
         cost: 1177600,
         mass: 16,
+        integrity: 80,
         power: .73,
         mount: "F",
         type: "K",
-        damage: 4,
-        armourpen: "A",
+        armourpen: 68,
+        breachdps: 25.2,
+        breachmin: .4,
+        breachmax: .8,
+        dps: 28,
+        eps: 1.44,
+        hps: 2.4,
+        range: 4e3,
         rof: 3,
-        dps: 24.5,
-        mjeps: .72,
-        thermload: .4,
         clip: 90,
-        ssdam: 4,
         ammo: 2100,
-        ammocost: 1
+        speed: 1600,
+        reload: 4,
+        roundspershot: 2
       }, {
         id: "7o",
         edID: 128681996,
-        eddbID: 1546,
+        eddbID: 0,
         grp: "mc",
         class: 4,
         rating: "A",
         cost: 6377600,
         mass: 16,
+        integrity: 80,
         power: 1.22,
         mount: "G",
         type: "K",
-        damage: 4,
-        armourpen: "A",
-        rof: 3.4,
+        armourpen: 68,
+        breachdps: 21.08,
+        breachmin: .4,
+        breachmax: .8,
         dps: 23.3,
-        mjeps: 1.258,
-        thermload: .5,
+        eps: 2.516,
+        hps: 3.4,
+        range: 4e3,
+        rof: 3.4,
         clip: 90,
-        ssdam: 3.5,
         ammo: 2100,
-        ammocost: 1
+        speed: 1600,
+        reload: 4,
+        roundspershot: 2
       }, {
         id: "7k",
         edID: 128049457,
-        eddbID: 1541,
+        eddbID: 0,
         grp: "mc",
         class: 3,
         rating: "C",
         cost: 140400,
         mass: 8,
+        integrity: 64,
         power: .64,
         mount: "F",
         type: "K",
-        damage: 3,
-        armourpen: "A",
+        armourpen: 54,
+        breachdps: 20.65,
+        breachmin: .4,
+        breachmax: .8,
+        dps: 23.1,
+        eps: 1.062,
+        hps: 1.77,
+        range: 4e3,
         rof: 5.9,
-        dps: 20.8,
-        mjeps: 1.062,
-        thermload: .3,
         clip: 90,
-        ssdam: 3.5,
         ammo: 2100,
-        ammocost: 1
+        speed: 1600,
+        reload: 4,
+        roundspershot: 1
       }, {
         id: "7l",
         edID: 128049461,
-        eddbID: 1543,
+        eddbID: 0,
         grp: "mc",
         class: 3,
         rating: "C",
         cost: 578436,
         mass: 8,
+        integrity: 64,
         power: .97,
         mount: "G",
         type: "K",
-        damage: 3,
-        armourpen: "A",
-        rof: 6.7,
+        armourpen: 54,
+        breachdps: 17.42,
+        breachmin: .4,
+        breachmax: .8,
         dps: 18.9,
-        mjeps: 1.675,
-        thermload: .3,
+        eps: 1.675,
+        hps: 2.01,
+        range: 4e3,
+        rof: 6.7,
         clip: 90,
-        ssdam: 2.8,
         ammo: 2100,
-        ammocost: 1
+        speed: 1600,
+        reload: 4,
+        roundspershot: 1
       }, {
         id: "26",
         edID: 128049456,
@@ -5580,19 +5807,24 @@ module.exports = {
         rating: "E",
         cost: 38e3,
         mass: 4,
+        integrity: 51,
         power: .46,
         mount: "F",
         type: "K",
-        damage: 2,
-        armourpen: "A",
-        rof: 7,
-        dps: 4,
-        thermload: 1,
+        armourpen: 37,
+        breachdps: 14.2,
+        breachmin: .4,
+        breachmax: .8,
+        dps: 15.6,
+        eps: .781,
+        hps: 1.42,
+        range: 4e3,
+        rof: 7.1,
         clip: 90,
-        mjdps: 6.02,
-        ssdam: 1.2,
         ammo: 2100,
-        ammocost: 1
+        speed: 1600,
+        reload: 4,
+        roundspershot: 1
       }, {
         id: "27",
         edID: 128049460,
@@ -5602,19 +5834,24 @@ module.exports = {
         rating: "F",
         cost: 57e3,
         mass: 4,
+        integrity: 51,
         power: .64,
         mount: "G",
         type: "K",
-        damage: 2,
-        armourpen: "A",
-        rof: 7.5,
-        dps: 4,
-        thermload: 1,
+        armourpen: 37,
+        breachdps: 11.55,
+        breachmin: .4,
+        breachmax: .8,
+        dps: 12.6,
+        eps: 1.078,
+        hps: 1.54,
+        range: 4e3,
+        rof: 7.7,
         clip: 90,
-        mjdps: 5.59,
-        ssdam: 1.03,
         ammo: 2100,
-        ammocost: 1
+        speed: 1600,
+        reload: 4,
+        roundspershot: 1
       }, {
         id: "28",
         edID: 128049463,
@@ -5624,19 +5861,24 @@ module.exports = {
         rating: "F",
         cost: 1292800,
         mass: 4,
+        integrity: 51,
         power: .5,
         mount: "T",
         type: "K",
-        damage: 2,
-        armourpen: "A",
-        rof: 5.3,
-        dps: 3,
-        thermload: 1,
+        armourpen: 37,
+        breachdps: 6.82,
+        breachmin: .4,
+        breachmax: .8,
+        dps: 7.3,
+        eps: .372,
+        hps: .62,
+        range: 4e3,
+        rof: 6.2,
         clip: 90,
-        mjdps: 2.15,
-        ssdam: .52,
         ammo: 2100,
-        ammocost: 1
+        speed: 1600,
+        reload: 4,
+        roundspershot: 1
       }, {
         id: "23",
         edID: 128049455,
@@ -5646,19 +5888,24 @@ module.exports = {
         rating: "F",
         cost: 9500,
         mass: 2,
+        integrity: 40,
         power: .28,
         mount: "F",
         type: "K",
-        damage: 2,
-        armourpen: "A",
-        rof: 8,
-        dps: 3,
-        thermload: 1,
+        armourpen: 22,
+        breachdps: 7.7,
+        breachmin: .4,
+        breachmax: .8,
+        dps: 8.6,
+        eps: .462,
+        hps: .77,
+        range: 4e3,
+        rof: 7.7,
         clip: 90,
-        mjdps: 3.75,
-        ssdam: .69,
         ammo: 2100,
-        ammocost: 1
+        speed: 1600,
+        reload: 4,
+        roundspershot: 1
       }, {
         id: "24",
         edID: 128049459,
@@ -5668,19 +5915,24 @@ module.exports = {
         rating: "G",
         cost: 14250,
         mass: 2,
+        integrity: 40,
         power: .37,
         mount: "G",
         type: "K",
-        damage: 2,
-        armourpen: "A",
-        rof: 8.5,
-        dps: 3,
-        thermload: 1,
+        armourpen: 22,
+        breachdps: 5.8,
+        breachmin: .4,
+        breachmax: .8,
+        dps: 6.8,
+        eps: .58,
+        hps: .83,
+        range: 4e3,
+        rof: 8.3,
         clip: 90,
-        mjdps: 2.03,
-        ssdam: .34,
         ammo: 2100,
-        ammocost: 1
+        speed: 1600,
+        reload: 4,
+        roundspershot: 1
       }, {
         id: "25",
         edID: 128049462,
@@ -5690,19 +5942,24 @@ module.exports = {
         rating: "G",
         cost: 81600,
         mass: 2,
+        integrity: 40,
         power: .26,
         mount: "T",
         type: "K",
-        damage: 0,
-        armourpen: "A",
-        rof: 6,
-        dps: 2,
-        thermload: 1,
+        armourpen: 22,
+        breachdps: 3.55,
+        breachmin: .4,
+        breachmax: .8,
+        dps: 4,
+        eps: .213,
+        hps: 0,
+        range: 4e3,
+        rof: 7.1,
         clip: 90,
-        mjdps: 1.54,
-        ssdam: .34,
         ammo: 2100,
-        ammocost: 1
+        speed: 1600,
+        reload: 4,
+        roundspershot: 1
       }, {
         id: "e0",
         eddbID: 1481,
@@ -5721,8 +5978,7 @@ module.exports = {
         dps: 4,
         thermload: 1,
         clip: 60,
-        ammo: 1e3,
-        pp: "Pranav Antal"
+        ammo: 1e3
       } ],
       c: [ {
         id: "1q",
@@ -5733,19 +5989,23 @@ module.exports = {
         rating: "B",
         cost: 2700800,
         mass: 16,
+        integrity: 80,
         power: .92,
         mount: "F",
         type: "K",
-        damage: 9,
-        armourpen: "A",
+        armourpen: 90,
+        breachdps: 25.28,
+        breachmin: .6,
+        breachmax: .8,
+        dps: 25.3,
+        eps: .644,
+        hps: 1.92,
+        range: 4500,
         rof: .4,
-        dps: 5,
-        thermload: 2,
         clip: 5,
-        mjdps: 8.13,
-        ssdam: 37.13,
         ammo: 100,
-        ammocost: 20
+        speed: 900,
+        reload: 5
       }, {
         id: "1r",
         edID: 128049444,
@@ -5755,19 +6015,23 @@ module.exports = {
         rating: "B",
         cost: 5401600,
         mass: 16,
+        integrity: 80,
         power: 1.03,
         mount: "G",
         type: "K",
-        damage: 8,
-        armourpen: "A",
+        armourpen: 90,
+        breachdps: 16.92,
+        breachmin: .6,
+        breachmax: .8,
+        dps: 19.7,
+        eps: .688,
+        hps: 1.76,
+        range: 4500,
         rof: .4,
-        dps: 4,
-        thermload: 2,
         clip: 5,
-        mjdps: 10.97,
-        ssdam: 30.94,
         ammo: 100,
-        ammocost: 20
+        speed: 750,
+        reload: 4
       }, {
         id: "1n",
         edID: 128049440,
@@ -5777,19 +6041,23 @@ module.exports = {
         rating: "C",
         cost: 675200,
         mass: 8,
+        integrity: 64,
         power: .67,
         mount: "F",
         type: "K",
-        damage: 7,
-        armourpen: "A",
+        armourpen: 90,
+        breachdps: 16.92,
+        breachmin: .6,
+        breachmax: .8,
+        dps: 18.7,
+        eps: .428,
+        hps: 1.28,
+        range: 4e3,
         rof: .4,
-        dps: 4,
-        thermload: 2,
         clip: 5,
-        mjdps: 8.13,
-        ssdam: 22.28,
         ammo: 100,
-        ammocost: 20
+        speed: 959,
+        reload: 4
       }, {
         id: "1o",
         edID: 128671120,
@@ -5799,19 +6067,23 @@ module.exports = {
         rating: "C",
         cost: 1350400,
         mass: 8,
+        integrity: 64,
         power: .75,
         mount: "G",
         type: "K",
-        damage: 7,
-        armourpen: "A",
+        armourpen: 90,
+        breachdps: 30.9,
+        breachmin: .6,
+        breachmax: .8,
+        dps: 14.3,
+        eps: .456,
+        hps: 1.16,
+        range: 4e3,
         rof: .4,
-        dps: 4,
-        thermload: 1,
         clip: 5,
-        mjdps: 7.95,
-        ssdam: 21.04,
         ammo: 100,
-        ammocost: 20
+        speed: 800,
+        reload: 4
       }, {
         id: "1p",
         edID: 128049447,
@@ -5821,19 +6093,23 @@ module.exports = {
         rating: "D",
         cost: 16204800,
         mass: 8,
+        integrity: 64,
         power: .64,
         mount: "T",
         type: "K",
-        damage: 6,
-        armourpen: "A",
-        rof: .3,
-        dps: 4,
-        thermload: 1,
+        armourpen: 90,
+        breachdps: 10.04,
+        breachmin: .6,
+        breachmax: .8,
+        dps: 9.7,
+        eps: .212,
+        hps: .64,
+        range: 4e3,
+        rof: .4,
         clip: 5,
-        mjdps: 3.58,
-        ssdam: 12.38,
         ammo: 100,
-        ammocost: 20
+        speed: 800,
+        reload: 4
       }, {
         id: "1k",
         edID: 128049439,
@@ -5843,19 +6119,23 @@ module.exports = {
         rating: "D",
         cost: 168430,
         mass: 4,
+        integrity: 51,
         power: .49,
         mount: "F",
         type: "K",
-        damage: 6,
-        armourpen: "A",
+        armourpen: 90,
+        breachdps: 14,
+        breachmin: .6,
+        breachmax: .8,
+        dps: 13.6,
+        eps: .35,
+        hps: 1.05,
+        range: 3500,
         rof: .5,
-        dps: 4,
-        thermload: 1,
         clip: 5,
-        mjdps: 6,
-        ssdam: 15.47,
         ammo: 100,
-        ammocost: 20
+        speed: 1051,
+        reload: 4
       }, {
         id: "1l",
         edID: 128049443,
@@ -5865,19 +6145,23 @@ module.exports = {
         rating: "D",
         cost: 337600,
         mass: 4,
+        integrity: 51,
         power: .54,
         mount: "G",
         type: "K",
-        damage: 6,
-        armourpen: "A",
+        armourpen: 90,
+        breachdps: 101.5,
+        breachmin: .6,
+        breachmax: .8,
+        dps: 10.3,
+        eps: .375,
+        hps: .95,
+        range: 3500,
         rof: .5,
-        dps: 3,
-        thermload: 1,
         clip: 5,
-        mjdps: 6.24,
-        ssdam: 15.47,
         ammo: 100,
-        ammocost: 20
+        speed: 875,
+        reload: 4
       }, {
         id: "1m",
         edID: 128049446,
@@ -5887,19 +6171,23 @@ module.exports = {
         rating: "E",
         cost: 4051200,
         mass: 4,
+        integrity: 51,
         power: .45,
         mount: "T",
         type: "K",
-        damage: 5,
-        armourpen: "A",
-        rof: .3,
-        dps: 3,
-        thermload: 1,
+        armourpen: 90,
+        breachdps: 6.52,
+        breachmin: .6,
+        breachmax: .8,
+        dps: 6.9,
+        eps: .136,
+        hps: .4,
+        range: 3500,
+        rof: .4,
         clip: 5,
-        mjdps: 2.41,
-        ssdam: 7.74,
         ammo: 100,
-        ammocost: 20
+        speed: 875,
+        reload: 4
       }, {
         id: "1h",
         edID: 128049438,
@@ -5909,19 +6197,23 @@ module.exports = {
         rating: "D",
         cost: 21100,
         mass: 2,
+        integrity: 40,
         power: .34,
         mount: "F",
         type: "K",
-        damage: 5,
-        armourpen: "A",
+        armourpen: 90,
+        breachdps: 8.55,
+        breachmin: .6,
+        breachmax: .8,
+        dps: 9,
+        eps: .23,
+        hps: .7,
+        range: 3e3,
         rof: .5,
-        dps: 3,
-        thermload: 1,
         clip: 5,
-        mjdps: 4,
-        ssdam: 9.59,
         ammo: 100,
-        ammocost: 20
+        speed: 1200,
+        reload: 4
       }, {
         id: "1i",
         edID: 128049442,
@@ -5931,19 +6223,23 @@ module.exports = {
         rating: "E",
         cost: 42200,
         mass: 2,
+        integrity: 40,
         power: .38,
         mount: "G",
         type: "K",
-        damage: 5,
-        armourpen: "A",
+        armourpen: 35,
+        breachdps: 6.6,
+        breachmin: .6,
+        breachmax: .9,
+        dps: 7.2,
+        eps: .24,
+        hps: .65,
+        range: 3e3,
         rof: .5,
-        dps: 3,
-        thermload: 1,
         clip: 5,
-        mjdps: 3.8,
-        ssdam: 8.97,
         ammo: 100,
-        ammocost: 20
+        speed: 1e3,
+        reload: 4
       }, {
         id: "1j",
         edID: 128049445,
@@ -5953,19 +6249,23 @@ module.exports = {
         rating: "F",
         cost: 506400,
         mass: 2,
+        integrity: 40,
         power: .32,
         mount: "T",
         type: "K",
-        damage: 4,
-        armourpen: "A",
+        armourpen: 90,
+        breachdps: 4.24,
+        breachmin: .6,
+        breachmax: .8,
+        dps: 4.8,
+        eps: .088,
+        hps: .28,
+        range: 3e3,
         rof: .4,
-        dps: 3,
-        thermload: 1,
         clip: 5,
-        mjdps: 1.35,
-        ssdam: 4.13,
         ammo: 100,
-        ammocost: 20
+        speed: 1e3,
+        reload: 4
       } ],
       fc: [ {
         id: "1t",
@@ -5976,19 +6276,25 @@ module.exports = {
         rating: "C",
         cost: 1167360,
         mass: 8,
+        integrity: 80,
         power: 1.02,
         mount: "F",
         type: "K",
-        damage: 3,
-        armourpen: "A",
+        armourpen: 52,
         rof: 4.5,
-        dps: 10,
-        thermload: 1,
+        breachdps: 189,
+        breachmin: .4,
+        breachmax: .8,
+        dps: 113.8,
+        eps: 30.78,
+        hps: 59.4,
+        range: 2e3,
         clip: 3,
-        mjdps: 15.19,
-        ssdam: 28.36,
         ammo: 90,
-        ammocost: 50
+        speed: 667,
+        reload: 5,
+        roundspershot: 12,
+        jitter: .5
       }, {
         id: "1u",
         edID: 128671321,
@@ -5998,19 +6304,25 @@ module.exports = {
         rating: "C",
         cost: 1751040,
         mass: 8,
+        integrity: 80,
         power: 1.55,
         mount: "G",
         type: "K",
-        damage: 3,
-        armourpen: "A",
+        armourpen: 52,
         rof: 4.8,
-        dps: 10,
-        thermload: 1,
+        breachdps: 167.04,
+        breachmin: .4,
+        breachmax: .8,
+        dps: 184.6,
+        eps: 46.66,
+        hps: 80.64,
+        range: 2e3,
         clip: 3,
-        mjdps: 12.77,
-        ssdam: 23.21,
         ammo: 90,
-        ammocost: 50
+        speed: 667,
+        reload: 5,
+        roundspershot: 12,
+        jitter: .5
       }, {
         id: "1v",
         edID: 128671322,
@@ -6020,19 +6332,25 @@ module.exports = {
         rating: "C",
         cost: 5836800,
         mass: 8,
+        integrity: 80,
         power: 1.29,
         mount: "T",
         type: "K",
-        damage: 2,
-        armourpen: "A",
-        rof: 3.3,
-        dps: 9,
-        thermload: 1,
+        armourpen: 52,
+        rof: 4,
+        breachdps: 110.4,
+        breachmin: .4,
+        breachmax: .8,
+        dps: 122.9,
+        eps: 17.76,
+        hps: 33.6,
+        range: 2e3,
         clip: 3,
-        mjdps: 6.85,
-        ssdam: 12.89,
         ammo: 90,
-        ammocost: 50
+        speed: 667,
+        reload: 5,
+        roundspershot: 12,
+        jitter: .5
       }, {
         id: "1s",
         edID: 128049449,
@@ -6042,19 +6360,25 @@ module.exports = {
         rating: "A",
         cost: 291840,
         mass: 4,
+        integrity: 80,
         power: .74,
         mount: "F",
         type: "K",
-        damage: 3,
-        armourpen: "A",
+        armourpen: 35,
         rof: 5,
-        dps: 9,
-        thermload: 1,
+        breachdps: 138,
+        breachmin: .4,
+        breachmax: .8,
+        dps: 122.9,
+        eps: 22.2,
+        hps: 42,
+        range: 2e3,
         clip: 3,
-        mjdps: 9.5,
-        ssdam: 18.05,
         ammo: 90,
-        ammocost: 50
+        speed: 667,
+        reload: 5,
+        roundspershot: 12,
+        jitter: .5
       }, {
         id: "7e",
         edID: 128049452,
@@ -6064,17 +6388,25 @@ module.exports = {
         rating: "D",
         cost: 437800,
         mass: 4,
+        integrity: 80,
         power: 1.03,
         mount: "G",
         type: "K",
-        damage: 2,
-        armourpen: "A",
+        armourpen: 35,
         rof: 5.3,
-        dps: 9,
-        thermload: 1,
+        breachdps: 114.48,
+        breachmin: .4,
+        breachmax: .8,
+        dps: 153.6,
+        eps: 31.6,
+        hps: 50.88,
+        range: 2e3,
         clip: 3,
         ammo: 90,
-        ammocost: 50
+        speed: 667,
+        reload: 5,
+        roundspershot: 12,
+        jitter: .5
       }, {
         id: "7f",
         edID: 128049454,
@@ -6084,17 +6416,25 @@ module.exports = {
         rating: "D",
         cost: 1459200,
         mass: 4,
+        integrity: 80,
         power: .79,
         mount: "T",
         type: "K",
-        damage: 2,
-        armourpen: "A",
+        armourpen: 35,
         rof: 3.7,
-        dps: 9,
-        thermload: 1,
+        breachdps: 67.08,
+        breachmin: .4,
+        breachmax: .8,
+        dps: 123.2,
+        eps: 10.84,
+        hps: 20.64,
+        range: 2e3,
         clip: 3,
         ammo: 90,
-        ammocost: 50
+        speed: 667,
+        reload: 5,
+        roundspershot: 12,
+        jitter: .5
       }, {
         id: "20",
         edID: 128049448,
@@ -6104,19 +6444,25 @@ module.exports = {
         rating: "E",
         cost: 36e3,
         mass: 2,
+        integrity: 40,
         power: .45,
         mount: "F",
         type: "K",
-        damage: 2,
-        armourpen: "A",
-        rof: 5.5,
-        dps: 8,
-        thermload: 1,
+        armourpen: 20,
+        breachdps: 87.36,
+        breachmin: .4,
+        breachmax: .8,
+        dps: 95.3,
+        eps: 14.112,
+        hps: 26.88,
+        range: 2e3,
+        rof: 5.6,
         clip: 3,
-        mjdps: 5.53,
-        ssdam: 10.31,
         ammo: 90,
-        ammocost: 50
+        speed: 667,
+        reload: 5,
+        roundspershot: 12,
+        jitter: .5
       }, {
         id: "21",
         edID: 128049451,
@@ -6126,19 +6472,25 @@ module.exports = {
         rating: "E",
         cost: 54720,
         mass: 2,
+        integrity: 40,
         power: .59,
         mount: "G",
         type: "K",
-        damage: 2,
-        armourpen: "A",
-        rof: 5.8,
-        dps: 7,
-        thermload: 1,
+        armourpen: 20,
+        breachdps: 63.4,
+        breachmin: .4,
+        breachmax: .8,
+        dps: 71.3,
+        eps: 18.408,
+        hps: 28.32,
+        range: 2e3,
+        rof: 5.9,
         clip: 3,
-        mjdps: 3.58,
-        ssdam: 6.45,
         ammo: 90,
-        ammocost: 50
+        speed: 667,
+        reload: 5,
+        roundspershot: 12,
+        jitter: .5
       }, {
         id: "22",
         edID: 128049453,
@@ -6148,19 +6500,25 @@ module.exports = {
         rating: "E",
         cost: 182400,
         mass: 2,
+        integrity: 40,
         power: .42,
         mount: "T",
         type: "K",
-        damage: 1,
-        armourpen: "A",
-        rof: 4,
-        dps: 6,
-        thermload: 1,
+        armourpen: 20,
+        breachdps: 34.56,
+        breachmin: .4,
+        breachmax: .8,
+        dps: 39.4,
+        eps: 6.72,
+        hps: 13.44,
+        range: 2e3,
+        rof: 4.8,
         clip: 3,
-        mjdps: 2.11,
-        ssdam: 3.87,
         ammo: 90,
-        ammocost: 50
+        speed: 667,
+        reload: 5,
+        roundspershot: 12,
+        jitter: .5
       }, {
         id: "pa",
         edID: 128671343,
@@ -6180,8 +6538,7 @@ module.exports = {
         dps: 9,
         thermload: 1,
         clip: 3,
-        ammo: 90,
-        pp: "Zachary Hudson"
+        ammo: 90
       } ],
       rg: [ {
         id: "29",
@@ -6192,19 +6549,22 @@ module.exports = {
         rating: "D",
         cost: 51600,
         mass: 2,
+        integrity: 40,
         power: 1.15,
         mount: "F",
-        type: "TK",
-        damage: 6,
-        armourpen: "A",
-        rof: .6,
-        dps: 4,
-        thermload: 7,
+        type: "KT",
+        armourpen: 30,
+        breachdps: 35.2,
+        breachmin: .4,
+        breachmax: .8,
+        dps: 37,
+        eps: 4.3,
+        hps: 28.48,
+        range: 3e3,
+        rof: 1.6,
         clip: 1,
-        mjdps: 13.75,
-        ssdam: 24.75,
         ammo: 30,
-        ammocost: 200
+        reload: 1
       }, {
         id: "2a",
         edID: 128049489,
@@ -6214,19 +6574,22 @@ module.exports = {
         rating: "B",
         cost: 412800,
         mass: 4,
+        integrity: 51,
         power: 1.63,
         mount: "F",
-        type: "TK",
-        damage: 7,
-        armourpen: "A",
-        rof: .5,
-        dps: 4,
-        thermload: 10,
+        type: "KT",
+        armourpen: 48,
+        breachdps: 47.4,
+        breachmin: .4,
+        breachmax: .8,
+        dps: 50,
+        eps: 6.132,
+        hps: 36,
+        range: 3e3,
+        rof: 1.2,
         clip: 1,
-        mjdps: 21.66,
-        ssdam: 43.32,
         ammo: 30,
-        ammocost: 200
+        reload: 1
       }, {
         id: "ih",
         edID: 128671341,
@@ -6239,38 +6602,42 @@ module.exports = {
         mass: 4,
         power: 1.63,
         mount: "F",
-        type: "TK",
+        type: "KT",
         damage: 5,
         armourpen: "A",
         rof: .6,
         dps: 5,
         thermload: 3,
         clip: 3,
-        ammo: 90,
-        pp: "Arissa Lavigny-Duval"
+        ammo: 90
       } ],
       pa: [ {
-        id: "1g",
-        edID: 128049465,
-        eddbID: 873,
+        id: "2c",
+        edID: 128049467,
+        eddbID: 875,
         grp: "pa",
-        class: 2,
-        rating: "C",
-        cost: 834200,
-        mass: 4,
-        power: 1.43,
+        class: 4,
+        rating: "A",
+        cost: 13793600,
+        mass: 16,
+        integrity: 80,
+        power: 2.63,
         mount: "F",
-        type: "T",
-        damage: 7,
-        armourpen: "A",
+        type: "KT",
+        armourpen: 85,
+        breachdps: 30.62,
+        breachmin: .4,
+        breachmax: .8,
+        dps: 30,
+        eps: 6.312,
+        hps: 8.85,
+        range: 3500,
         rof: .3,
-        dps: 4,
-        thermload: 10,
         clip: 5,
-        mjdps: 6.89,
-        ssdam: 27.85,
         ammo: 100,
-        ammocost: 200
+        reload: 8,
+        speed: 875,
+        roundspershot: 1
       }, {
         id: "2b",
         edID: 128049466,
@@ -6280,41 +6647,51 @@ module.exports = {
         rating: "B",
         cost: 3051200,
         mass: 8,
+        integrity: 64,
         power: 1.97,
         mount: "F",
-        type: "TK",
-        damage: 9,
-        armourpen: "A",
+        type: "KT",
+        armourpen: 70,
+        breachdps: 20.4,
+        breachmin: .4,
+        breachmax: .8,
+        dps: 23.2,
+        eps: 4.08,
+        hps: 6.54,
+        range: 3500,
         rof: .3,
-        dps: 4,
-        thermload: 8,
         clip: 5,
-        mjdps: 20.98,
-        ssdam: 92.82,
         ammo: 100,
-        ammocost: 200
+        reload: 8,
+        speed: 875,
+        roundspershot: 1
       }, {
-        id: "2c",
-        edID: 128049467,
-        eddbID: 875,
+        id: "1g",
+        edID: 128049465,
+        eddbID: 873,
         grp: "pa",
-        class: 4,
-        rating: "A",
-        cost: 13793600,
-        mass: 16,
-        power: 2.63,
+        class: 2,
+        rating: "C",
+        cost: 834200,
+        mass: 4,
+        integrity: 51,
+        power: 1.43,
         mount: "F",
-        type: "TK",
-        damage: 10,
-        armourpen: "A",
+        type: "KT",
+        armourpen: 55,
+        breachdps: 13.26,
+        breachmin: .4,
+        breachmax: .8,
+        dps: 17.2,
+        eps: 2.595,
+        hps: 4.68,
+        range: 3500,
         rof: .3,
-        dps: 5,
-        thermload: 10,
         clip: 5,
-        mjdps: 25.55,
-        ssdam: 123.76,
         ammo: 100,
-        ammocost: 200
+        reload: 8,
+        speed: 875,
+        roundspershot: 1
       }, {
         id: "Ap",
         edID: 128671339,
@@ -6327,7 +6704,7 @@ module.exports = {
         mass: 8,
         power: 1.97,
         mount: "F",
-        type: "TK",
+        type: "KT",
         damage: 8,
         armourpen: "A",
         rof: 1.67,
@@ -6335,10 +6712,33 @@ module.exports = {
         thermload: 4,
         clip: 20,
         ammo: 300,
-        ammocost: 67,
-        pp: "Denton Patreus"
+        ammocost: 67
       } ],
       mr: [ {
+        id: "1z",
+        edID: 0,
+        eddbID: 0,
+        grp: "mr",
+        name: "Rocket Propelled FSD Disruptor",
+        class: 2,
+        rating: "B",
+        cost: 190227,
+        mass: 4,
+        power: 1.2,
+        mount: "F",
+        type: "?",
+        damage: 50,
+        armourpen: "?",
+        rof: .5,
+        dps: 0,
+        thermload: 0,
+        clip: 12,
+        ammo: 48,
+        mjdps: 0,
+        ssdam: 0,
+        missile: "D",
+        ammocost: 0
+      }, {
         id: "2f",
         edID: 128666725,
         eddbID: 1327,
@@ -6347,20 +6747,23 @@ module.exports = {
         rating: "B",
         cost: 240400,
         mass: 4,
+        integrity: 51,
         power: 1.2,
         mount: "F",
         type: "E",
-        damage: 7,
-        armourpen: "F",
-        rof: 2.5,
-        dps: 8,
-        thermload: 3,
+        armourpen: 60,
+        breachdps: 0,
+        breachmin: 0,
+        breachmax: 0,
+        dps: 25,
+        eps: .12,
+        hps: 1.8,
         clip: 12,
-        ammo: 24,
-        mjdps: 1.72,
-        ssdam: 3.87,
-        missile: "D",
-        ammocost: 500
+        ammo: 48,
+        speed: 750,
+        reload: 5,
+        roundspershot: 1,
+        missile: "D"
       }, {
         id: "2g",
         edID: 128049493,
@@ -6370,20 +6773,23 @@ module.exports = {
         rating: "B",
         cost: 512400,
         mass: 4,
+        integrity: 51,
         power: 1.2,
         mount: "F",
         type: "E",
-        damage: 6,
-        armourpen: "F",
-        rof: .3,
-        dps: 3,
-        thermload: 3,
+        armourpen: 60,
+        breachdps: 0,
+        breachmin: 0,
+        breachmax: 0,
+        dps: 13.3,
+        eps: .07,
+        hps: 1.08,
         clip: 6,
         ammo: 18,
-        mjdps: .57,
-        ssdam: 2.58,
-        missile: "S",
-        ammocost: 666.67
+        speed: 625,
+        reload: 12,
+        roundspershot: 1,
+        missile: "S"
       }, {
         id: "2d",
         edID: 128666724,
@@ -6393,20 +6799,24 @@ module.exports = {
         rating: "B",
         cost: 32180,
         mass: 2,
+        integrity: 40,
         power: .4,
         mount: "F",
         type: "E",
-        damage: 7,
-        armourpen: "F",
-        rof: 2.5,
-        dps: 8,
-        thermload: 3,
+        armourpen: 60,
+        breachdps: 0,
+        breachmin: 0,
+        breachmax: 0,
+        dps: 25,
+        eps: .12,
+        hps: 1.8,
+        rof: .5,
         clip: 8,
         ammo: 16,
-        mjdps: 1.63,
-        ssdam: 3.87,
-        missile: "D",
-        ammocost: 500
+        speed: 750,
+        reload: 5,
+        roundspershot: 1,
+        missile: "D"
       }, {
         id: "2e",
         edID: 128049492,
@@ -6416,20 +6826,24 @@ module.exports = {
         rating: "B",
         cost: 72600,
         mass: 2,
+        integrity: 40,
         power: .6,
         mount: "F",
         type: "E",
-        damage: 6,
-        armourpen: "F",
+        armourpen: 60,
+        breachdps: 0,
+        breachmin: 0,
+        breachmax: 0,
+        dps: 13.3,
+        eps: .07,
+        hps: 1.08,
         rof: .3,
-        dps: 3,
-        thermload: 3,
         clip: 6,
         ammo: 6,
-        mjdps: .57,
-        ssdam: 2.58,
-        missile: "S",
-        ammocost: 666.67
+        speed: 625,
+        reload: 12,
+        roundspershot: 1,
+        missile: "S"
       }, {
         id: "Ph",
         edID: 128671344,
@@ -6450,8 +6864,7 @@ module.exports = {
         thermload: 3,
         clip: 12,
         ammo: 120,
-        missile: "S",
-        pp: "Li Yong-Rui"
+        missile: "S"
       } ],
       tp: [ {
         id: "2h",
@@ -6462,13 +6875,22 @@ module.exports = {
         rating: "I",
         cost: 11200,
         mass: 2,
+        integrity: 40,
         power: .4,
         mount: "F",
-        armourpen: "C",
-        thermload: 10,
+        type: "E",
+        armourpen: 1e4,
+        breachdps: 60,
+        breachmin: .6,
+        breachmax: .8,
+        dps: 120,
+        eps: 0,
+        hps: 45,
+        rof: 1,
         clip: 1,
-        ammo: 0,
-        ammocost: 15e3,
+        ammo: 1,
+        reload: 5,
+        speed: 250,
         missile: "S"
       }, {
         id: "2i",
@@ -6479,13 +6901,22 @@ module.exports = {
         rating: "I",
         cost: 44800,
         mass: 4,
+        integrity: 51,
         power: .4,
         mount: "F",
-        armourpen: "C",
-        thermload: 10,
-        clip: 2,
-        ammo: 0,
-        ammocost: 15e3,
+        type: "E",
+        armourpen: 1e4,
+        breachdps: 60,
+        breachmin: .6,
+        breachmax: .8,
+        dps: 120,
+        eps: 0,
+        hps: 50,
+        rof: 1,
+        clip: 1,
+        ammo: 2,
+        reload: 5,
+        speed: 250,
         missile: "S"
       } ],
       nl: [ {
@@ -6497,14 +6928,20 @@ module.exports = {
         rating: "I",
         cost: 24260,
         mass: 2,
+        integrity: 40,
         power: .4,
         mount: "F",
-        type: "E",
-        armourpen: "C",
-        thermload: 2,
-        clip: 1,
-        ammo: 24,
-        ammocost: 209
+        type: "ET",
+        armourpen: 60,
+        breachdps: 0,
+        breachmin: 0,
+        breachmax: 0,
+        dps: 44,
+        hps: 5,
+        rof: 1,
+        clip: 3,
+        ammo: 36,
+        reload: 2
       }, {
         id: "2k",
         edID: 128049501,
@@ -6514,14 +6951,20 @@ module.exports = {
         rating: "I",
         cost: 294080,
         mass: 4,
+        integrity: 51,
         power: .4,
         mount: "F",
-        type: "E",
-        armourpen: "C",
-        thermload: 3,
+        type: "ET",
+        armourpen: 60,
+        breachdps: 0,
+        breachmin: 0,
+        breachmax: 0,
+        dps: 44,
+        hps: 7.5,
+        rof: 1,
         clip: 3,
-        ammo: 24,
-        ammocost: 209
+        ammo: 36,
+        reload: 2
       }, {
         id: "kp",
         edID: 128671448,
@@ -6532,14 +6975,20 @@ module.exports = {
         rating: "I",
         cost: 36400,
         mass: 2,
+        integrity: 40,
         power: .4,
         mount: "F",
-        type: "E",
+        type: "ET",
         armourpen: "C",
-        thermload: 2,
-        clip: 1,
-        ammo: 24,
-        ammocost: 209
+        breachdps: 0,
+        breachmin: 0,
+        breachmax: 0,
+        dps: 32,
+        hps: 5,
+        rof: 1,
+        clip: 3,
+        ammo: 36,
+        reload: 2
       } ],
       ml: [ {
         id: "2l",
@@ -6550,10 +6999,16 @@ module.exports = {
         rating: "D",
         cost: 6800,
         mass: 2,
+        integrity: 40,
         power: .5,
         mount: "F",
-        armourpen: "D",
-        thermload: 3
+        armourpen: 18,
+        breachdps: .3,
+        breachmin: .1,
+        breachmax: .2,
+        dps: 2,
+        eps: 1.5,
+        hps: 2
       }, {
         id: "2m",
         edID: 128049526,
@@ -6563,10 +7018,16 @@ module.exports = {
         rating: "D",
         cost: 22580,
         mass: 2,
+        integrity: 51,
         power: .75,
         mount: "F",
-        armourpen: "D",
-        thermload: 5
+        armourpen: 18,
+        breachdps: .6,
+        breachmin: .1,
+        breachmax: .2,
+        dps: 4,
+        eps: 3,
+        hps: 4
       }, {
         id: "ml",
         eddbID: 1479,
@@ -6582,8 +7043,7 @@ module.exports = {
         damage: 3,
         dps: 3,
         armourpen: "D",
-        thermload: 3,
-        pp: "Zemina Torval"
+        thermload: 3
       } ],
       cs: [ {
         id: "0d",
@@ -6595,7 +7055,7 @@ module.exports = {
         cost: 13540,
         mass: 1.3,
         power: .2,
-        range: 2,
+        range: 2e3,
         time: 10
       }, {
         id: "0c",
@@ -6607,7 +7067,7 @@ module.exports = {
         cost: 40630,
         mass: 1.3,
         power: .4,
-        range: 2.5,
+        range: 2500,
         time: 10
       }, {
         id: "0b",
@@ -6619,7 +7079,7 @@ module.exports = {
         cost: 121900,
         mass: 1.3,
         power: .8,
-        range: 3,
+        range: 3e3,
         time: 10
       }, {
         id: "0a",
@@ -6631,7 +7091,7 @@ module.exports = {
         cost: 365700,
         mass: 1.3,
         power: 1.6,
-        range: 3.5,
+        range: 3500,
         time: 10
       }, {
         id: "09",
@@ -6643,7 +7103,7 @@ module.exports = {
         cost: 1097100,
         mass: 1.3,
         power: 3.2,
-        range: 4,
+        range: 4e3,
         time: 10
       } ],
       cm: [ {
@@ -6658,7 +7118,6 @@ module.exports = {
         mass: 1.3,
         power: .2,
         passive: 1,
-        armourpen: "F",
         thermload: 2,
         clip: 1,
         ammo: 10,
@@ -6674,7 +7133,7 @@ module.exports = {
         cost: 12500,
         mass: 1.3,
         power: .2,
-        range: 3,
+        range: 3e3,
         chargeup: 4,
         activepower: 4,
         cooldown: 10
@@ -6690,7 +7149,6 @@ module.exports = {
         mass: 1.3,
         power: .2,
         passive: 1,
-        armourpen: "F",
         thermload: 0,
         clip: 1,
         ammo: 2,
@@ -6707,7 +7165,6 @@ module.exports = {
         mass: .5,
         power: .2,
         passive: 1,
-        armourpen: "F",
         thermload: 1,
         clip: 50,
         ammo: 1e4,
@@ -6723,7 +7180,7 @@ module.exports = {
         cost: 13540,
         mass: 1.3,
         power: .2,
-        range: 2,
+        range: 2e3,
         time: 10
       }, {
         id: "0h",
@@ -6735,7 +7192,7 @@ module.exports = {
         cost: 40630,
         mass: 1.3,
         power: .4,
-        range: 2.5,
+        range: 2500,
         time: 10
       }, {
         id: "0g",
@@ -6747,7 +7204,7 @@ module.exports = {
         cost: 121900,
         mass: 1.3,
         power: .8,
-        range: 3,
+        range: 3e3,
         time: 10
       }, {
         id: "0f",
@@ -6759,7 +7216,7 @@ module.exports = {
         cost: 365700,
         mass: 1.3,
         power: 1.6,
-        range: 3.5,
+        range: 3500,
         time: 10
       }, {
         id: "0e",
@@ -6771,7 +7228,7 @@ module.exports = {
         cost: 1097100,
         mass: 1.3,
         power: 3.2,
-        range: 4,
+        range: 4e3,
         time: 10
       } ],
       kw: [ {
@@ -6784,7 +7241,7 @@ module.exports = {
         cost: 13540,
         mass: 1.3,
         power: .2,
-        range: 2,
+        range: 2e3,
         time: 10
       }, {
         id: "0m",
@@ -6796,7 +7253,7 @@ module.exports = {
         cost: 40630,
         mass: 1.3,
         power: .4,
-        range: 2.5,
+        range: 2500,
         time: 10
       }, {
         id: "0l",
@@ -6808,7 +7265,7 @@ module.exports = {
         cost: 121900,
         mass: 1.3,
         power: .8,
-        range: 3,
+        range: 3e3,
         time: 10
       }, {
         id: "0k",
@@ -6820,7 +7277,7 @@ module.exports = {
         cost: 365700,
         mass: 1.3,
         power: 1.6,
-        range: 3.5,
+        range: 3500,
         time: 10
       }, {
         id: "0j",
@@ -6832,7 +7289,7 @@ module.exports = {
         cost: 1097100,
         mass: 1.3,
         power: 3.2,
-        range: 4,
+        range: 4e3,
         time: 10
       } ],
       sb: [ {
@@ -7588,26 +8045,6 @@ module.exports = {
         rating: "E",
         cost: 3829870,
         cargo: 256
-      }, {
-        id: "c0",
-        edID: 128681641,
-        eddbID: 1553,
-        grp: "cr",
-        class: 1,
-        rating: "E",
-        cost: 6250,
-        cargo: 1,
-        name: "Corrosion Resistant"
-      }, {
-        id: "c1",
-        edID: 128681992,
-        eddbID: 1552,
-        grp: "cr",
-        class: 1,
-        rating: "F",
-        cost: 12563,
-        cargo: 2,
-        name: "Corrosion Resistant"
       } ],
       cc: [ {
         id: "Cf",
@@ -7881,6 +8318,43 @@ module.exports = {
         cost: 4500,
         power: .39
       } ],
+      fh: [ {
+        id: "fh",
+        edID: -1,
+        eddbID: -1,
+        grp: "fh",
+        class: 7,
+        rating: "D",
+        cost: -1,
+        power: .35,
+        mass: 60,
+        bays: 2,
+        rebuildsperbay: 15
+      }, {
+        id: "fm",
+        edID: -1,
+        eddbID: -1,
+        grp: "fh",
+        class: 6,
+        rating: "D",
+        cost: -1,
+        power: .35,
+        mass: 40,
+        bays: 2,
+        rebuildsperbay: 8
+      }, {
+        id: "fr",
+        edID: -1,
+        eddbID: -1,
+        grp: "fh",
+        class: 5,
+        rating: "D",
+        cost: -1,
+        power: .25,
+        mass: 20,
+        bays: 1,
+        rebuildsperbay: 6
+      } ],
       fi: [ {
         id: "6p",
         edID: 128666707,
@@ -9262,8 +9736,7 @@ module.exports = {
         minmul: 2,
         optmul: 1.5,
         maxmul: 1,
-        recover: 1.2,
-        pp: "Aisling Duval"
+        recover: 1.2
       }, {
         id: "p5",
         edID: 128671324,
@@ -9280,8 +9753,7 @@ module.exports = {
         minmul: 2,
         optmul: 1.5,
         maxmul: 1,
-        recover: 1.2,
-        pp: "Aisling Duval"
+        recover: 1.2
       }, {
         id: "p4",
         edID: 128671325,
@@ -9298,8 +9770,7 @@ module.exports = {
         minmul: 2,
         optmul: 1.5,
         maxmul: 1,
-        recover: 1.2,
-        pp: "Aisling Duval"
+        recover: 1.2
       }, {
         id: "p3",
         edID: 128671326,
@@ -9316,8 +9787,7 @@ module.exports = {
         minmul: 2,
         optmul: 1.5,
         maxmul: 1,
-        recover: 1.425,
-        pp: "Aisling Duval"
+        recover: 1.425
       }, {
         id: "p2",
         edID: 128671327,
@@ -9334,8 +9804,7 @@ module.exports = {
         minmul: 2,
         optmul: 1.5,
         maxmul: 1,
-        recover: 1.875,
-        pp: "Aisling Duval"
+        recover: 1.875
       }, {
         id: "p1",
         edID: 128671328,
@@ -9352,8 +9821,7 @@ module.exports = {
         minmul: 2,
         optmul: 1.5,
         maxmul: 1,
-        recover: 2.4,
-        pp: "Aisling Duval"
+        recover: 2.4
       }, {
         id: "p0",
         edID: 128671329,
@@ -9370,8 +9838,7 @@ module.exports = {
         minmul: 2,
         optmul: 1.5,
         maxmul: 1,
-        recover: 3,
-        pp: "Aisling Duval"
+        recover: 3
       }, {
         id: "p7",
         edID: 128671330,
@@ -9388,8 +9855,7 @@ module.exports = {
         minmul: 2,
         optmul: 1.5,
         maxmul: 1,
-        recover: 3.6,
-        pp: "Aisling Duval"
+        recover: 3.6
       } ],
       pc: [ {
         id: "Pf",
@@ -9632,6 +10098,150 @@ module.exports = {
         range: 7,
         maximum: 1
       } ],
+      pce: [ {
+        id: "ma",
+        edID: -1,
+        eddbID: -1,
+        grp: "pce",
+        class: 2,
+        rating: "E",
+        cost: -1,
+        mass: 2.5,
+        passengers: 2
+      }, {
+        id: "mb",
+        edID: -1,
+        eddbID: -1,
+        grp: "pce",
+        class: 3,
+        rating: "E",
+        cost: -1,
+        mass: 5,
+        passengers: 4
+      }, {
+        id: "mc",
+        edID: -1,
+        eddbID: -1,
+        grp: "pce",
+        class: 4,
+        rating: "E",
+        cost: -1,
+        mass: 10,
+        passengers: 8
+      }, {
+        id: "md",
+        edID: -1,
+        eddbID: -1,
+        grp: "pce",
+        class: 5,
+        rating: "E",
+        cost: -1,
+        mass: 20,
+        passengers: 16
+      }, {
+        id: "me",
+        edID: -1,
+        eddbID: -1,
+        grp: "pce",
+        class: 6,
+        rating: "E",
+        cost: -1,
+        mass: 40,
+        passengers: 32
+      } ],
+      pci: [ {
+        id: "mf",
+        edID: -1,
+        eddbID: -1,
+        grp: "pci",
+        class: 3,
+        rating: "D",
+        cost: -1,
+        mass: 5,
+        passengers: 3
+      }, {
+        id: "mg",
+        edID: -1,
+        eddbID: -1,
+        grp: "pci",
+        class: 4,
+        rating: "D",
+        cost: -1,
+        mass: 10,
+        passengers: 6
+      }, {
+        id: "mh",
+        edID: -1,
+        eddbID: -1,
+        grp: "pci",
+        class: 5,
+        rating: "D",
+        cost: -1,
+        mass: 20,
+        passengers: 10
+      }, {
+        id: "mi",
+        edID: -1,
+        eddbID: -1,
+        grp: "pci",
+        class: 6,
+        rating: "D",
+        cost: -1,
+        mass: 40,
+        passengers: 16
+      } ],
+      pcm: [ {
+        id: "mj",
+        edID: -1,
+        eddbID: -1,
+        grp: "pcm",
+        class: 4,
+        rating: "C",
+        cost: -1,
+        mass: 10,
+        passengers: 3
+      }, {
+        id: "mk",
+        edID: -1,
+        eddbID: -1,
+        grp: "pcm",
+        class: 5,
+        rating: "C",
+        cost: -1,
+        mass: 20,
+        passengers: 6
+      }, {
+        id: "ml",
+        edID: -1,
+        eddbID: -1,
+        grp: "pcm",
+        class: 6,
+        rating: "C",
+        cost: -1,
+        mass: 40,
+        passengers: 12
+      } ],
+      pcq: [ {
+        id: "mm",
+        edID: -1,
+        eddbID: -1,
+        grp: "pcq",
+        class: 5,
+        rating: "B",
+        cost: -1,
+        mass: 20,
+        passengers: 4
+      }, {
+        id: "mn",
+        edID: -1,
+        eddbID: -1,
+        grp: "pcq",
+        class: 6,
+        rating: "B",
+        cost: -1,
+        mass: 40,
+        passengers: 8
+      } ],
       rf: [ {
         id: "23",
         edID: 128666687,
@@ -11038,7 +11648,7 @@ module.exports = {
         maxmul: .7,
         recover: 1.6
       }, {
-        id: "3w",
+        id: "1x",
         edID: 128064262,
         eddbID: 1551,
         grp: "sg",
diff --git a/dist/index.json b/dist/index.json
index bb5797f..7771736 100644
--- a/dist/index.json
+++ b/dist/index.json
@@ -12,7 +12,7 @@
 				"boost": 320,
 				"boostEnergy": 9,
 				"agility": 8,
-				"baseShieldStrength": 60,
+				"baseShieldStrength": 78,
 				"baseArmour": 162,
 				"hullMass": 35,
 				"masslock": 7,
@@ -115,15 +115,16 @@
 				"manufacturer": "Faulcon DeLacy",
 				"class": 3,
 				"hullCost": 141889930,
-				"speed": 180,
-				"boost": 240,
+				"speed": 183,
+				"boost": 244,
 				"boostEnergy": 29,
 				"agility": 2,
-				"baseShieldStrength": 350,
+				"baseShieldStrength": 362,
 				"baseArmour": 945,
 				"hullMass": 400,
 				"masslock": 23,
-				"pipSpeed": 0.13875
+				"pipSpeed": 0.13875,
+				"fighterHangars": true
 			},
 			"retailCost": 146969450,
 			"bulkheads": [
@@ -256,11 +257,11 @@
 				"manufacturer": "Lakon",
 				"class": 2,
 				"hullCost": 6135660,
-				"speed": 250,
-				"boost": 340,
+				"speed": 254,
+				"boost": 345,
 				"boostEnergy": 14,
 				"agility": 6,
-				"baseShieldStrength": 140,
+				"baseShieldStrength": 152,
 				"baseArmour": 378,
 				"hullMass": 280,
 				"masslock": 11,
@@ -377,11 +378,11 @@
 				"manufacturer": "Lakon",
 				"class": 2,
 				"hullCost": 3818240,
-				"speed": 220,
-				"boost": 300,
+				"speed": 223,
+				"boost": 304,
 				"boostEnergy": 13,
 				"agility": 8,
-				"baseShieldStrength": 120,
+				"baseShieldStrength": 105,
 				"baseArmour": 324,
 				"hullMass": 150,
 				"masslock": 8,
@@ -478,6 +479,179 @@
 				]
 			}
 		},
+		"beluga": {
+			"edID": -1,
+			"eddbID": -1,
+			"properties": {
+				"name": "Beluga Liner",
+				"manufacturer": "Saud Kruger",
+				"class": 3,
+				"hullCost": -1,
+				"speed": 195,
+				"boost": 273,
+				"boostEnergy": 20,
+				"agility": 2,
+				"baseShieldStrength": 92,
+				"baseArmour": 504,
+				"hullMass": 1100,
+				"masslock": 18,
+				"pipSpeed": -1,
+				"luxuryCabins": true,
+				"fighterHangars": true
+			},
+			"retailCost": -1,
+			"bulkheads": [
+				{
+					"id": "cl",
+					"edID": -1,
+					"eddbID": -1,
+					"cost": 0,
+					"mass": 0
+				},
+				{
+					"id": "cm",
+					"edID": -1,
+					"eddbID": -1,
+					"cost": -1,
+					"mass": 83
+				},
+				{
+					"id": "cn",
+					"edID": -1,
+					"eddbID": -1,
+					"cost": -1,
+					"mass": 165
+				},
+				{
+					"id": "co",
+					"edID": -1,
+					"eddbID": -1,
+					"cost": -1,
+					"mass": 165
+				},
+				{
+					"id": "cp",
+					"edID": -1,
+					"eddbID": -1,
+					"cost": -1,
+					"mass": 165
+				}
+			],
+			"slots": {
+				"standard": [
+					6,
+					7,
+					7,
+					8,
+					6,
+					5,
+					7
+				],
+				"hardpoints": [
+					2,
+					2,
+					2,
+					2,
+					2,
+					0,
+					0,
+					0,
+					0,
+					0,
+					0
+				],
+				"internal": [
+					6,
+					6,
+					{
+						"class": 6,
+						"eligible": {
+							"cr": 1,
+							"hr": 1,
+							"pce": 1,
+							"pci": 1,
+							"pcm": 1,
+							"pcq": 1
+						}
+					},
+					{
+						"class": 6,
+						"eligible": {
+							"cr": 1,
+							"hr": 1,
+							"pce": 1,
+							"pci": 1,
+							"pcm": 1,
+							"pcq": 1
+						}
+					},
+					{
+						"class": 5,
+						"eligible": {
+							"cr": 1,
+							"hr": 1,
+							"pce": 1,
+							"pci": 1,
+							"pcm": 1,
+							"pcq": 1
+						}
+					},
+					{
+						"class": 5,
+						"eligible": {
+							"cr": 1,
+							"hr": 1,
+							"pce": 1,
+							"pci": 1,
+							"pcm": 1,
+							"pcq": 1
+						}
+					},
+					4,
+					3,
+					3,
+					3,
+					3
+				]
+			},
+			"defaults": {
+				"standard": [
+					"6E",
+					"7E",
+					"7E",
+					"8E",
+					"6E",
+					"5E",
+					"7C"
+				],
+				"hardpoints": [
+					17,
+					17,
+					0,
+					0,
+					0,
+					0,
+					0,
+					0,
+					0,
+					0,
+					0
+				],
+				"internal": [
+					"4j",
+					"04",
+					"6dbusiness",
+					"6dbusiness",
+					"4dbusiness",
+					"4dbusiness",
+					"02",
+					"01",
+					0,
+					0,
+					"2h"
+				]
+			}
+		},
 		"cobra_mk_iii": {
 			"edID": 128049279,
 			"eddbID": 4,
@@ -486,11 +660,11 @@
 				"manufacturer": "Faulcon DeLacy",
 				"class": 1,
 				"hullCost": 205800,
-				"speed": 280,
-				"boost": 400,
+				"speed": 282,
+				"boost": 402,
 				"boostEnergy": 11,
 				"agility": 6,
-				"baseShieldStrength": 80,
+				"baseShieldStrength": 92,
 				"baseArmour": 216,
 				"hullMass": 180,
 				"masslock": 8,
@@ -598,10 +772,10 @@
 				"class": 1,
 				"hullCost": 603740,
 				"speed": 200,
-				"boost": 300,
+				"boost": 299,
 				"boostEnergy": 11,
 				"agility": 4,
-				"baseShieldStrength": 120,
+				"baseShieldStrength": 125,
 				"baseArmour": 216,
 				"hullMass": 210,
 				"masslock": 8,
@@ -714,11 +888,11 @@
 				"manufacturer": "Lakon",
 				"class": 1,
 				"hullCost": 1635700,
-				"speed": 260,
-				"boost": 340,
+				"speed": 242,
+				"boost": 316,
 				"boostEnergy": 14,
 				"agility": 5,
-				"baseShieldStrength": 146,
+				"baseShieldStrength": 115,
 				"baseArmour": 270,
 				"hullMass": 298,
 				"masslock": 10,
@@ -826,10 +1000,10 @@
 				"class": 1,
 				"hullCost": 461340,
 				"speed": 283,
-				"boost": 380,
+				"boost": 384,
 				"boostEnergy": 11,
 				"agility": 8,
-				"baseShieldStrength": 118,
+				"baseShieldStrength": 93,
 				"baseArmour": 216,
 				"hullMass": 170,
 				"masslock": 8,
@@ -936,11 +1110,11 @@
 				"manufacturer": "Core Dynamics",
 				"class": 1,
 				"hullCost": 10440,
-				"speed": 240,
-				"boost": 350,
+				"speed": 239,
+				"boost": 349,
 				"boostEnergy": 9,
 				"agility": 10,
-				"baseShieldStrength": 60,
+				"baseShieldStrength": 89,
 				"baseArmour": 72,
 				"hullMass": 50,
 				"masslock": 6,
@@ -1039,11 +1213,11 @@
 				"manufacturer": "Core Dynamics",
 				"class": 2,
 				"hullCost": 19072000,
-				"speed": 210,
-				"boost": 350,
+				"speed": 214,
+				"boost": 357,
 				"boostEnergy": 21,
 				"agility": 6,
-				"baseShieldStrength": 200,
+				"baseShieldStrength": 133,
 				"baseArmour": 540,
 				"hullMass": 480,
 				"masslock": 14,
@@ -1154,15 +1328,16 @@
 				"manufacturer": "Core Dynamics",
 				"class": 3,
 				"hullCost": 182589570,
-				"speed": 200,
-				"boost": 260,
+				"speed": 198,
+				"boost": 257,
 				"boostEnergy": 27,
 				"agility": 2,
-				"baseShieldStrength": 555,
+				"baseShieldStrength": 516,
 				"baseArmour": 666,
 				"hullMass": 900,
 				"masslock": 24,
-				"pipSpeed": 0.125
+				"pipSpeed": 0.125,
+				"fighterHangars": true
 			},
 			"retailCost": 187969450,
 			"bulkheads": [
@@ -1291,11 +1466,11 @@
 				"manufacturer": "Core Dynamics",
 				"class": 2,
 				"hullCost": 13469990,
-				"speed": 180,
-				"boost": 300,
+				"speed": 182,
+				"boost": 304,
 				"boostEnergy": 21,
 				"agility": 2,
-				"baseShieldStrength": 200,
+				"baseShieldStrength": 104,
 				"baseArmour": 540,
 				"hullMass": 580,
 				"masslock": 14,
@@ -1410,15 +1585,16 @@
 				"manufacturer": "Core Dynamics",
 				"class": 2,
 				"hullCost": 34774790,
-				"speed": 170,
-				"boost": 280,
+				"speed": 171,
+				"boost": 282,
 				"boostEnergy": 21,
 				"agility": 2,
-				"baseShieldStrength": 250,
+				"baseShieldStrength": 186,
 				"baseArmour": 630,
 				"hullMass": 580,
 				"masslock": 14,
-				"pipSpeed": 0.1025
+				"pipSpeed": 0.1025,
+				"fighterHangars": true
 			},
 			"retailCost": 35814210,
 			"bulkheads": [
@@ -1529,11 +1705,11 @@
 				"manufacturer": "Zorgon Peterson",
 				"class": 2,
 				"hullCost": 51232230,
-				"speed": 260,
-				"boost": 350,
+				"speed": 265,
+				"boost": 357,
 				"boostEnergy": 21,
 				"agility": 6,
-				"baseShieldStrength": 300,
+				"baseShieldStrength": 271,
 				"baseArmour": 405,
 				"hullMass": 250,
 				"masslock": 12,
@@ -1648,11 +1824,11 @@
 				"manufacturer": "Zorgon Peterson",
 				"class": 1,
 				"hullCost": 29790,
-				"speed": 200,
-				"boost": 300,
+				"speed": 203,
+				"boost": 305,
 				"agility": 6,
 				"boostEnergy": 7,
-				"baseShieldStrength": 50,
+				"baseShieldStrength": 65,
 				"baseArmour": 90,
 				"hullMass": 14,
 				"masslock": 6,
@@ -1749,11 +1925,11 @@
 				"manufacturer": "Gutamaya",
 				"class": 3,
 				"hullCost": 21077780,
-				"speed": 300,
-				"boost": 380,
+				"speed": 306,
+				"boost": 388,
 				"boostEnergy": 21,
 				"agility": 2,
-				"baseShieldStrength": 180,
+				"baseShieldStrength": 186,
 				"baseArmour": 486,
 				"hullMass": 400,
 				"masslock": 12,
@@ -1872,7 +2048,7 @@
 				"boost": 380,
 				"boostEnergy": 11,
 				"agility": 6,
-				"baseShieldStrength": 197,
+				"baseShieldStrength": 230,
 				"baseArmour": 144,
 				"hullMass": 35,
 				"masslock": 7,
@@ -1981,15 +2157,16 @@
 				"manufacturer": "Gutamaya",
 				"class": 3,
 				"hullCost": 199926890,
-				"speed": 200,
-				"boost": 320,
+				"speed": 202,
+				"boost": 323,
 				"boostEnergy": 24,
 				"agility": 2,
-				"baseShieldStrength": 605,
+				"baseShieldStrength": 703,
 				"baseArmour": 720,
 				"hullMass": 1100,
 				"masslock": 27,
-				"pipSpeed": 0.05
+				"pipSpeed": 0.05,
+				"fighterHangars": true
 			},
 			"retailCost": 208969450,
 			"bulkheads": [
@@ -2116,11 +2293,11 @@
 				"manufacturer": "Core Dynamics",
 				"class": 1,
 				"hullCost": 72180,
-				"speed": 300,
-				"boost": 400,
+				"speed": 298,
+				"boost": 397,
 				"boostEnergy": 9,
 				"agility": 6,
-				"baseShieldStrength": 80,
+				"baseShieldStrength": 104,
 				"baseArmour": 108,
 				"hullMass": 50,
 				"masslock": 6,
@@ -2219,15 +2396,16 @@
 				"manufacturer": "Lakon",
 				"class": 2,
 				"hullCost": 2951180,
-				"speed": 200,
-				"boost": 300,
+				"speed": 202,
+				"boost": 303,
 				"boostEnergy": 10,
 				"agility": 2,
-				"baseShieldStrength": 110,
-				"baseArmour": 198,
+				"baseShieldStrength": 99,
+				"baseArmour": 243,
 				"hullMass": 180,
 				"masslock": 8,
-				"pipSpeed": 0.1375
+				"pipSpeed": 0.1375,
+				"fighterHangars": true
 			},
 			"retailCost": 3126150,
 			"bulkheads": [
@@ -2289,7 +2467,7 @@
 				"internal": [
 					5,
 					5,
-					3,
+					4,
 					3,
 					2,
 					2
@@ -2317,7 +2495,7 @@
 				"internal": [
 					"03",
 					"03",
-					"01",
+					"02",
 					"44",
 					"00",
 					"2h"
@@ -2332,15 +2510,16 @@
 				"manufacturer": "Saud Kruger",
 				"class": 3,
 				"hullCost": 47798080,
-				"speed": 300,
-				"boost": 380,
+				"speed": 303,
+				"boost": 384,
 				"boostEnergy": 17,
 				"agility": 2,
-				"baseShieldStrength": 220,
+				"baseShieldStrength": 114,
 				"baseArmour": 396,
 				"hullMass": 580,
 				"masslock": 13,
-				"pipSpeed": 0.08375
+				"pipSpeed": 0.08375,
+				"luxuryCabins": true
 			},
 			"retailCost": 48539890,
 			"bulkheads": [
@@ -2388,7 +2567,7 @@
 					6,
 					5,
 					4,
-					4
+					5
 				],
 				"hardpoints": [
 					3,
@@ -2404,14 +2583,22 @@
 						"class": 6,
 						"eligible": {
 							"cr": 1,
-							"hr": 1
+							"hr": 1,
+							"pce": 1,
+							"pci": 1,
+							"pcm": 1,
+							"pcq": 1
 						}
 					},
 					{
 						"class": 5,
 						"eligible": {
 							"cr": 1,
-							"hr": 1
+							"hr": 1,
+							"pce": 1,
+							"pci": 1,
+							"pcm": 1,
+							"pcq": 1
 						}
 					},
 					5,
@@ -2430,7 +2617,7 @@
 					"6E",
 					"5E",
 					"4E",
-					"4C"
+					"5C"
 				],
 				"hardpoints": [
 					0,
@@ -2442,8 +2629,8 @@
 					0
 				],
 				"internal": [
-					"04",
-					"03",
+					"6e economy",
+					"4e economy",
 					"03",
 					"4e",
 					"02",
@@ -2461,11 +2648,11 @@
 				"manufacturer": "Faulcon DeLacy",
 				"class": 2,
 				"hullCost": 55171380,
-				"speed": 230,
-				"boost": 300,
+				"speed": 234,
+				"boost": 305,
 				"boostEnergy": 24,
 				"agility": 6,
-				"baseShieldStrength": 260,
+				"baseShieldStrength": 294,
 				"baseArmour": 468,
 				"hullMass": 350,
 				"masslock": 17,
@@ -2585,10 +2772,10 @@
 				"class": 1,
 				"hullCost": 12870,
 				"speed": 220,
-				"boost": 320,
+				"boost": 321,
 				"boostEnergy": 7,
 				"agility": 8,
-				"baseShieldStrength": 40,
+				"baseShieldStrength": 52,
 				"baseArmour": 108,
 				"hullMass": 25,
 				"masslock": 6,
@@ -2687,11 +2874,11 @@
 				"manufacturer": "Lakon",
 				"class": 2,
 				"hullCost": 865790,
-				"speed": 220,
-				"boost": 350,
+				"speed": 223,
+				"boost": 355,
 				"boostEnergy": 11,
 				"agility": 3,
-				"baseShieldStrength": 90,
+				"baseShieldStrength": 77,
 				"baseArmour": 162,
 				"hullMass": 155,
 				"masslock": 8,
@@ -2798,12 +2985,12 @@
 				"manufacturer": "Lakon",
 				"class": 3,
 				"hullCost": 16881510,
-				"speed": 180,
-				"boost": 300,
+				"speed": 181,
+				"boost": 301,
 				"boostEnergy": 11,
 				"agility": 2,
-				"baseShieldStrength": 120,
-				"baseArmour": 216,
+				"baseShieldStrength": 78,
+				"baseArmour": 306,
 				"hullMass": 420,
 				"masslock": 10,
 				"pipSpeed": 0.16625
@@ -2867,14 +3054,14 @@
 					0
 				],
 				"internal": [
+					6,
 					6,
 					6,
 					5,
 					5,
-					4,
-					4,
-					2,
-					2
+					5,
+					3,
+					3
 				]
 			},
 			"defaults": {
@@ -2898,11 +3085,11 @@
 					0
 				],
 				"internal": [
+					"04",
 					"04",
 					"04",
 					"03",
 					"03",
-					"02",
 					"49",
 					0,
 					"2h"
@@ -2917,15 +3104,16 @@
 				"manufacturer": "Lakon",
 				"class": 3,
 				"hullCost": 73255150,
-				"speed": 130,
-				"boost": 200,
+				"speed": 131,
+				"boost": 201,
 				"boostEnergy": 21,
 				"agility": 0,
-				"baseShieldStrength": 240,
+				"baseShieldStrength": 88,
 				"baseArmour": 432,
 				"hullMass": 1000,
 				"masslock": 16,
-				"pipSpeed": 0.17375
+				"pipSpeed": 0.17375,
+				"fighterHangars": true
 			},
 			"retailCost": 76555840,
 			"bulkheads": [
@@ -3040,11 +3228,11 @@
 				"manufacturer": "Faulcon DeLacy",
 				"class": 1,
 				"hullCost": 95900,
-				"speed": 320,
-				"boost": 400,
+				"speed": 310,
+				"boost": 388,
 				"boostEnergy": 11,
 				"agility": 6,
-				"baseShieldStrength": 105,
+				"baseShieldStrength": 137,
 				"baseArmour": 126,
 				"hullMass": 60,
 				"masslock": 7,
@@ -3147,11 +3335,11 @@
 				"manufacturer": "Faulcon DeLacy",
 				"class": 1,
 				"hullCost": 310220,
-				"speed": 270,
-				"boost": 340,
+				"speed": 271,
+				"boost": 342,
 				"boostEnergy": 10,
 				"agility": 4,
-				"baseShieldStrength": 150,
+				"baseShieldStrength": 103,
 				"baseArmour": 270,
 				"hullMass": 190,
 				"masslock": 7,
@@ -3258,11 +3446,11 @@
 				"manufacturer": "Core Dynamics",
 				"class": 1,
 				"hullCost": 4689640,
-				"speed": 210,
-				"boost": 340,
+				"speed": 215,
+				"boost": 348,
 				"boostEnergy": 17,
 				"agility": 9,
-				"baseShieldStrength": 240,
+				"baseShieldStrength": 293,
 				"baseArmour": 288,
 				"hullMass": 230,
 				"masslock": 10,
@@ -4313,7 +4501,7 @@
 				{
 					"id": "tz",
 					"edID": 128682013,
-					"eddbID": 1548,
+					"eddbID": 0,
 					"grp": "t",
 					"class": 3,
 					"rating": "A",
@@ -4329,7 +4517,7 @@
 				{
 					"id": "u0",
 					"edID": 128682014,
-					"eddbID": 1547,
+					"eddbID": 0,
 					"grp": "t",
 					"class": 2,
 					"rating": "A",
@@ -6623,16 +6811,19 @@
 					"rating": "A",
 					"cost": 177600,
 					"mass": 16,
+					"integrity": 80,
 					"power": 1.33,
 					"mount": "F",
 					"type": "T",
-					"damage": 5,
-					"armourpen": "A",
-					"rof": 2.6,
+					"armourpen": 65,
+					"breachdps": 22.62,
+					"breachmin": 0.4,
+					"breachmax": 0.8,
 					"dps": 26.9,
-					"mjeps": 4.264,
-					"ssdam": 10.2,
-					"thermload": 1.6
+					"eps": 4.264,
+					"hps": 4.16,
+					"range": 3000,
+					"rof": 2.6
 				},
 				{
 					"id": "7r",
@@ -6643,16 +6834,19 @@
 					"rating": "A",
 					"cost": 877600,
 					"mass": 16,
+					"integrity": 80,
 					"power": 1.37,
 					"mount": "G",
 					"type": "T",
-					"damage": 5,
-					"armourpen": "A",
-					"rof": 2.8,
+					"armourpen": 65,
+					"breachdps": 18.48,
+					"breachmin": 0.4,
+					"breachmax": 0.8,
 					"dps": 21.7,
-					"mjeps": 4.368,
-					"ssdam": 7.8,
-					"thermload": 1.6
+					"eps": 4.368,
+					"hps": 4.48,
+					"range": 3000,
+					"rof": 2.8
 				},
 				{
 					"id": "1d",
@@ -6663,17 +6857,19 @@
 					"rating": "D",
 					"cost": 70400,
 					"mass": 8,
+					"integrity": 64,
 					"power": 0.9,
 					"mount": "F",
 					"type": "T",
-					"damage": 4,
-					"armourpen": "A",
-					"rof": 3,
-					"dps": 4,
-					"mjdps": 21.62,
-					"mjeps": 2.86,
-					"ssdam": 7.07,
-					"thermload": 1
+					"armourpen": 52,
+					"breachdps": 15.3,
+					"breachmin": 0.4,
+					"breachmax": 0.8,
+					"dps": 18.1,
+					"eps": 2.88,
+					"hps": 3,
+					"range": 3000,
+					"rof": 3
 				},
 				{
 					"id": "1e",
@@ -6684,17 +6880,19 @@
 					"rating": "E",
 					"cost": 140600,
 					"mass": 8,
+					"integrity": 64,
 					"power": 0.92,
 					"mount": "G",
 					"type": "T",
-					"damage": 3,
-					"armourpen": "A",
-					"rof": 3.2,
-					"dps": 4,
-					"mjdps": 18.28,
-					"mjeps": 2.98,
-					"ssdam": 5.59,
-					"thermload": 1
+					"armourpen": 52,
+					"breachdps": 12.48,
+					"breachmin": 0.4,
+					"breachmax": 0.8,
+					"dps": 14.8,
+					"eps": 2.944,
+					"hps": 2.88,
+					"range": 3000,
+					"rof": 3.2
 				},
 				{
 					"id": "1f",
@@ -6705,17 +6903,19 @@
 					"rating": "F",
 					"cost": 400400,
 					"mass": 8,
+					"integrity": 64,
 					"power": 0.89,
 					"mount": "T",
 					"type": "T",
-					"damage": 3,
-					"armourpen": "A",
-					"rof": 2.3,
-					"dps": 3,
-					"mjdps": 7.05,
-					"mjeps": 1.24,
-					"ssdam": 3.15,
-					"thermload": 1
+					"armourpen": 52,
+					"breachdps": 8.1,
+					"breachmin": 0.4,
+					"breachmax": 0.8,
+					"dps": 9.5,
+					"eps": 1.512,
+					"hps": 1.62,
+					"range": 3000,
+					"rof": 2.7
 				},
 				{
 					"id": "1a",
@@ -6723,20 +6923,22 @@
 					"eddbID": 824,
 					"grp": "pl",
 					"class": 2,
-					"rating": "E",
+					"rating": "F",
 					"cost": 17600,
 					"mass": 4,
+					"integrity": 51,
 					"power": 0.6,
 					"mount": "F",
 					"type": "T",
-					"damage": 3,
-					"armourpen": "A",
-					"rof": 3.4,
-					"dps": 3,
-					"mjdps": 14.29,
-					"mjeps": 1.89,
-					"ssdam": 4.2,
-					"thermload": 1
+					"armourpen": 35,
+					"breachdps": 10.2,
+					"breachmin": 0.4,
+					"breachmax": 0.8,
+					"dps": 12.1,
+					"eps": 1.904,
+					"hps": 2.04,
+					"range": 3000,
+					"rof": 3.4
 				},
 				{
 					"id": "1b",
@@ -6747,17 +6949,19 @@
 					"rating": "F",
 					"cost": 35400,
 					"mass": 4,
+					"integrity": 51,
 					"power": 0.6,
 					"mount": "G",
 					"type": "T",
-					"damage": 3,
-					"armourpen": "A",
-					"rof": 3.6,
-					"dps": 3,
-					"mjdps": 11.62,
-					"mjeps": 1.89,
-					"ssdam": 3.24,
-					"thermload": 1
+					"armourpen": 35,
+					"breachdps": 8.28,
+					"breachmin": 0.4,
+					"breachmax": 0.8,
+					"dps": 9.6,
+					"eps": 1.944,
+					"hps": 1.8,
+					"range": 3000,
+					"rof": 3.6
 				},
 				{
 					"id": "1c",
@@ -6768,17 +6972,19 @@
 					"rating": "F",
 					"cost": 132800,
 					"mass": 4,
+					"integrity": 51,
 					"power": 0.58,
 					"mount": "T",
 					"type": "T",
-					"damage": 2,
-					"armourpen": "A",
-					"rof": 2.5,
-					"dps": 3,
-					"mjdps": 4.72,
-					"mjeps": 0.83,
-					"ssdam": 1.86,
-					"thermload": 1
+					"armourpen": 35,
+					"breachdps": 5.1,
+					"breachmin": 0.4,
+					"breachmax": 0.8,
+					"dps": 6.2,
+					"eps": 1,
+					"hps": 0.9,
+					"range": 3000,
+					"rof": 3
 				},
 				{
 					"id": "17",
@@ -6789,17 +6995,19 @@
 					"rating": "F",
 					"cost": 2200,
 					"mass": 2,
+					"integrity": 40,
 					"power": 0.39,
 					"mount": "F",
 					"type": "T",
-					"damage": 2,
-					"armourpen": "A",
-					"rof": 3.8,
-					"dps": 3,
-					"mjdps": 9.35,
-					"mjeps": 1.24,
-					"ssdam": 2.48,
-					"thermload": 1
+					"armourpen": 20,
+					"breachdps": 6.46,
+					"breachmin": 0.4,
+					"breachmax": 0.8,
+					"dps": 7.9,
+					"eps": 1.254,
+					"hps": 1.14,
+					"range": 3000,
+					"rof": 3.8
 				},
 				{
 					"id": "18",
@@ -6810,17 +7018,19 @@
 					"rating": "G",
 					"cost": 6600,
 					"mass": 2,
+					"integrity": 40,
 					"power": 0.39,
 					"mount": "G",
 					"type": "T",
-					"damage": 2,
-					"armourpen": "A",
-					"rof": 4,
-					"dps": 3,
-					"mjdps": 7.3,
-					"mjeps": 1.19,
-					"ssdam": 1.88,
-					"thermload": 1
+					"armourpen": 20,
+					"breachdps": 5.2,
+					"breachmin": 0.4,
+					"breachmax": 0.8,
+					"dps": 6.2,
+					"eps": 1.24,
+					"hps": 1.2,
+					"range": 3000,
+					"rof": 4
 				},
 				{
 					"id": "19",
@@ -6831,17 +7041,19 @@
 					"rating": "G",
 					"cost": 26000,
 					"mass": 2,
+					"integrity": 40,
 					"power": 0.38,
 					"mount": "T",
 					"type": "T",
-					"damage": 2,
-					"armourpen": "A",
-					"rof": 2.8,
-					"dps": 2,
-					"mjdps": 2.9,
-					"mjeps": 0.51,
-					"ssdam": 1.07,
-					"thermload": 1
+					"armourpen": 20,
+					"breachdps": 3.3,
+					"breachmin": 0.4,
+					"breachmax": 0.8,
+					"dps": 4,
+					"eps": 0.627,
+					"hps": 6.6,
+					"range": 3000,
+					"rof": 3.3
 				},
 				{
 					"id": "PL",
@@ -6859,8 +7071,7 @@
 					"armourpen": "A",
 					"rof": 1.6,
 					"dps": 2,
-					"thermload": 1,
-					"pp": "Felicia Winters"
+					"thermload": 1
 				}
 			],
 			"ul": [
@@ -6873,16 +7084,21 @@
 					"rating": "E",
 					"cost": 281600,
 					"mass": 16,
+					"integrity": 80,
 					"power": 2.58,
 					"mount": "F",
 					"type": "T",
-					"damage": 5,
-					"armourpen": "A",
-					"rof": 1.6,
+					"armourpen": 65,
+					"breachdps": 28,
+					"breachmin": 0.4,
+					"breachmax": 0.8,
 					"dps": 32.3,
-					"mjeps": 3.71,
-					"ssdam": 20.6,
-					"thermload": 4.5
+					"eps": 5.936,
+					"hps": 7.2,
+					"range": 3000,
+					"rof": 1.6,
+					"burst": 3,
+					"burstrof": 3
 				},
 				{
 					"id": "7t",
@@ -6893,16 +7109,21 @@
 					"rating": "E",
 					"cost": 1245600,
 					"mass": 16,
+					"integrity": 80,
 					"power": 2.59,
 					"mount": "G",
 					"type": "T",
-					"damage": 4,
-					"armourpen": "A",
-					"rof": 2.1,
+					"armourpen": 65,
+					"breachdps": 21.63,
+					"breachmin": 0.4,
+					"breachmax": 0.8,
 					"dps": 25.9,
-					"mjeps": 2.59,
-					"ssdam": 12.1,
-					"thermload": 3.3
+					"eps": 5.712,
+					"hps": 6.93,
+					"range": 3000,
+					"rof": 2.1,
+					"burst": 3,
+					"burstrof": 5
 				},
 				{
 					"id": "14",
@@ -6913,17 +7134,21 @@
 					"rating": "D",
 					"cost": 140400,
 					"mass": 8,
+					"integrity": 64,
 					"power": 1.66,
 					"mount": "F",
 					"type": "T",
-					"damage": 4,
-					"armourpen": "B",
-					"rof": 1,
-					"dps": 4,
-					"mjdps": 24.97,
-					"mjeps": 3.52,
-					"ssdam": 27.85,
-					"thermload": 1
+					"armourpen": 52,
+					"breachdps": 10.53,
+					"breachmin": 0.4,
+					"breachmax": 0.8,
+					"dps": 20.8,
+					"eps": 3.753,
+					"hps": 4.59,
+					"range": 3000,
+					"rof": 2.7,
+					"burst": 3,
+					"burstrof": 7
 				},
 				{
 					"id": "15",
@@ -6934,17 +7159,21 @@
 					"rating": "E",
 					"cost": 281600,
 					"mass": 8,
+					"integrity": 64,
 					"power": 1.65,
 					"mount": "G",
 					"type": "T",
-					"damage": 3,
-					"armourpen": "A",
-					"rof": 1.2,
-					"dps": 4,
-					"mjdps": 18.56,
-					"mjeps": 3.27,
-					"ssdam": 18.56,
-					"thermload": 1
+					"armourpen": 52,
+					"breachdps": 14.08,
+					"breachmin": 0.4,
+					"breachmax": 0.8,
+					"dps": 16.6,
+					"eps": 3.712,
+					"hps": 4.48,
+					"range": 3000,
+					"rof": 3.2,
+					"burst": 3,
+					"burstrof": 9
 				},
 				{
 					"id": "16",
@@ -6955,17 +7184,21 @@
 					"rating": "E",
 					"cost": 800400,
 					"mass": 8,
+					"integrity": 64,
 					"power": 1.57,
 					"mount": "T",
 					"type": "T",
-					"damage": 3,
-					"armourpen": "A",
-					"rof": 0.9,
-					"dps": 4,
-					"mjdps": 8.78,
-					"mjeps": 1.69,
-					"ssdam": 9.45,
-					"thermload": 1
+					"armourpen": 52,
+					"breachdps": 5.58,
+					"breachmin": 0.4,
+					"breachmax": 0.8,
+					"dps": 11,
+					"eps": 1.913,
+					"hps": 2.48,
+					"range": 3000,
+					"rof": 3.1,
+					"burst": 3,
+					"burstrof": 11
 				},
 				{
 					"id": "7h",
@@ -6976,14 +7209,21 @@
 					"rating": "E",
 					"cost": 23000,
 					"mass": 4,
+					"integrity": 40,
 					"power": 1.05,
 					"mount": "F",
 					"type": "T",
-					"damage": 3,
-					"armourpen": "A",
-					"rof": 1.3,
-					"dps": 4,
-					"thermload": 1
+					"armourpen": 35,
+					"breachdps": 11.1,
+					"breachmin": 0.4,
+					"breachmax": 0.8,
+					"dps": 13,
+					"eps": 2.331,
+					"hps": 2.96,
+					"range": 3000,
+					"rof": 3.7,
+					"burst": 3,
+					"burstrof": 11
 				},
 				{
 					"id": "7i",
@@ -6994,14 +7234,21 @@
 					"rating": "F",
 					"cost": 48500,
 					"mass": 4,
+					"integrity": 40,
 					"power": 1.04,
 					"mount": "G",
 					"type": "T",
-					"damage": 3,
-					"armourpen": "A",
-					"rof": 1.5,
-					"dps": 4,
-					"thermload": 1
+					"armourpen": 35,
+					"breachdps": 8.82,
+					"breachmin": 0.4,
+					"breachmax": 0.8,
+					"dps": 10.3,
+					"eps": 2.31,
+					"hps": 2.94,
+					"range": 3000,
+					"rof": 4.2,
+					"burst": 3,
+					"burstrof": 13
 				},
 				{
 					"id": "7j",
@@ -7012,14 +7259,21 @@
 					"rating": "F",
 					"cost": 162800,
 					"mass": 4,
+					"integrity": 40,
 					"power": 0.98,
 					"mount": "T",
 					"type": "T",
-					"damage": 2,
-					"armourpen": "A",
-					"rof": 1.1,
-					"dps": 3,
-					"thermload": 1
+					"armourpen": 35,
+					"breachdps": 3.51,
+					"breachmin": 0.4,
+					"breachmax": 0.8,
+					"dps": 6.8,
+					"eps": 1.209,
+					"hps": 1.56,
+					"range": 3000,
+					"rof": 3.9,
+					"burst": 3,
+					"burstrof": 15
 				},
 				{
 					"id": "11",
@@ -7030,17 +7284,21 @@
 					"rating": "F",
 					"cost": 4400,
 					"mass": 2,
+					"integrity": 40,
 					"power": 0.65,
 					"mount": "F",
 					"type": "T",
-					"damage": 2,
-					"armourpen": "A",
-					"rof": 1.6,
-					"dps": 3,
-					"mjdps": 9.94,
-					"mjeps": 1.4,
-					"ssdam": 6.45,
-					"thermload": 1
+					"armourpen": 20,
+					"breachdps": 7.05,
+					"breachmin": 0.4,
+					"breachmax": 0.8,
+					"dps": 8.1,
+					"eps": 1.457,
+					"hps": 1.88,
+					"range": 3000,
+					"rof": 4.7,
+					"burst": 3,
+					"burstrof": 15
 				},
 				{
 					"id": "12",
@@ -7051,17 +7309,21 @@
 					"rating": "G",
 					"cost": 8600,
 					"mass": 2,
+					"integrity": 40,
 					"power": 0.64,
 					"mount": "G",
 					"type": "T",
-					"damage": 2,
-					"armourpen": "A",
-					"rof": 1.7,
-					"dps": 3,
-					"mjdps": 7.95,
-					"mjeps": 1.4,
-					"ssdam": 4.53,
-					"thermload": 1
+					"armourpen": 20,
+					"breachdps": 5.3,
+					"breachmin": 0.4,
+					"breachmax": 0.8,
+					"dps": 6.4,
+					"eps": 1.4,
+					"hps": 1.6,
+					"range": 3000,
+					"rof": 5.3,
+					"burst": 3,
+					"burstrof": 17
 				},
 				{
 					"id": "13",
@@ -7072,17 +7334,21 @@
 					"rating": "G",
 					"cost": 52800,
 					"mass": 2,
+					"integrity": 40,
 					"power": 0.6,
 					"mount": "T",
 					"type": "T",
-					"damage": 1,
-					"armourpen": "B",
-					"rof": 1.3,
-					"dps": 2,
-					"mjdps": 2.98,
-					"mjeps": 0.63,
-					"ssdam": 2.24,
-					"thermload": 1
+					"armourpen": 20,
+					"breachdps": 1.92,
+					"breachmin": 0.4,
+					"breachmax": 0.8,
+					"dps": 4.2,
+					"eps": 0.768,
+					"hps": 0.96,
+					"range": 3000,
+					"rof": 4.8,
+					"burst": 3,
+					"burstrof": 19
 				},
 				{
 					"id": "cy",
@@ -7101,48 +7367,51 @@
 					"armourpen": "A",
 					"rof": 1.6,
 					"dps": 3,
-					"thermload": 1,
-					"pp": "Archon Delaine"
+					"thermload": 1
 				}
 			],
 			"bl": [
 				{
 					"id": "0w",
 					"edID": 128049431,
-					"eddbID": 1540,
+					"eddbID": 0,
 					"grp": "bl",
 					"class": 4,
 					"rating": "A",
 					"cost": 2396160,
 					"mass": 16,
+					"integrity": 80,
 					"power": 2.9,
 					"mount": "F",
 					"type": "T",
-					"damage": 7,
-					"armourpen": "A",
-					"rof": null,
+					"armourpen": 60,
+					"breachdps": 33.1,
+					"breachmin": 0.4,
+					"breachmax": 0.8,
 					"dps": 41.4,
-					"mjeps": 9.1,
-					"thermload": 9.9
+					"eps": 9.1,
+					"hps": 9.9
 				},
 				{
 					"id": "0x",
 					"edID": 128681994,
-					"eddbID": 1544,
+					"eddbID": 0,
 					"grp": "bl",
 					"class": 4,
 					"rating": "A",
 					"cost": 8746160,
 					"mass": 16,
+					"integrity": 80,
 					"power": 2.86,
 					"mount": "G",
 					"type": "T",
-					"damage": 7,
-					"armourpen": "A",
-					"rof": null,
+					"armourpen": 60,
+					"breachdps": 26.1,
+					"breachmin": 0.4,
+					"breachmax": 0.8,
 					"dps": 32.7,
-					"mjeps": 8.99,
-					"thermload": 10.6
+					"eps": 8.99,
+					"hps": 10.6
 				},
 				{
 					"id": "0u",
@@ -7153,16 +7422,17 @@
 					"rating": "C",
 					"cost": 1177600,
 					"mass": 8,
+					"integrity": 64,
 					"power": 1.8,
 					"mount": "F",
 					"type": "T",
-					"damage": 6,
-					"armourpen": "A",
-					"rof": null,
-					"dps": 5,
-					"mjdps": 30.33,
-					"mjeps": 5.65,
-					"thermload": 5
+					"armourpen": 50,
+					"breachdps": 20.6,
+					"breachmin": 0.4,
+					"breachmax": 0.8,
+					"dps": 25.8,
+					"eps": 5.67,
+					"hps": 7.2
 				},
 				{
 					"id": "0v",
@@ -7173,16 +7443,17 @@
 					"rating": "C",
 					"cost": 2396160,
 					"mass": 8,
+					"integrity": 64,
 					"power": 1.78,
 					"mount": "G",
 					"type": "T",
-					"damage": 6,
-					"armourpen": "A",
-					"rof": null,
-					"dps": 4,
-					"mjdps": 24,
-					"mjeps": 5.59,
-					"thermload": 6
+					"armourpen": 50,
+					"breachdps": 16.2,
+					"breachmin": 0.4,
+					"breachmax": 0.8,
+					"dps": 20.3,
+					"eps": 5.58,
+					"hps": 7.6
 				},
 				{
 					"id": "0o",
@@ -7193,16 +7464,17 @@
 					"rating": "D",
 					"cost": 19399600,
 					"mass": 8,
+					"integrity": 64,
 					"power": 1.68,
 					"mount": "T",
 					"type": "T",
-					"damage": 5,
-					"armourpen": "A",
-					"rof": null,
-					"dps": 4,
-					"mjdps": 14.44,
-					"mjeps": 3.54,
-					"thermload": 4
+					"armourpen": 50,
+					"breachdps": 11.5,
+					"breachmin": 0.4,
+					"breachmax": 0.8,
+					"dps": 14.4,
+					"eps": 3.51,
+					"hps": 5.1
 				},
 				{
 					"id": "0r",
@@ -7213,16 +7485,17 @@
 					"rating": "D",
 					"cost": 299520,
 					"mass": 4,
+					"integrity": 51,
 					"power": 1.12,
 					"mount": "F",
 					"type": "T",
-					"damage": 5,
-					"armourpen": "A",
-					"rof": null,
-					"dps": 4,
-					"mjdps": 19.38,
-					"mjeps": 3.42,
-					"thermload": 4
+					"armourpen": 35,
+					"breachdps": 12.8,
+					"breachmin": 0.4,
+					"breachmax": 0.8,
+					"dps": 16,
+					"eps": 3.51,
+					"hps": 5.1
 				},
 				{
 					"id": "0s",
@@ -7233,16 +7506,17 @@
 					"rating": "D",
 					"cost": 500600,
 					"mass": 4,
+					"integrity": 51,
 					"power": 1.1,
 					"mount": "G",
 					"type": "T",
-					"damage": 5,
-					"armourpen": "A",
-					"rof": null,
-					"dps": 4,
-					"mjdps": 13.85,
-					"mjeps": 3.26,
-					"thermload": 4
+					"armourpen": 35,
+					"breachdps": 10,
+					"breachmin": 0.4,
+					"breachmax": 0.8,
+					"dps": 12.5,
+					"edps": 3.44,
+					"hps": 5.3
 				},
 				{
 					"id": "0t",
@@ -7253,16 +7527,17 @@
 					"rating": "E",
 					"cost": 2099900,
 					"mass": 4,
+					"integrity": 51,
 					"power": 1.03,
 					"mount": "T",
 					"type": "T",
-					"damage": 4,
-					"armourpen": "A",
-					"rof": null,
-					"dps": 3,
-					"mjdps": 8.95,
-					"mjeps": 2.1,
-					"thermload": 3
+					"armourpen": 35,
+					"breachdps": 7.1,
+					"breachmin": 0.4,
+					"breachmax": 0.8,
+					"dps": 8.8,
+					"eps": 2.16,
+					"hps": 3.5
 				},
 				{
 					"id": "10",
@@ -7273,16 +7548,17 @@
 					"rating": "E",
 					"cost": 37430,
 					"mass": 2,
+					"integrity": 40,
 					"power": 0.69,
 					"mount": "F",
 					"type": "T",
-					"damage": 4,
-					"armourpen": "A",
-					"rof": null,
-					"dps": 3,
-					"mjdps": 11.61,
-					"mjeps": 2.16,
-					"thermload": 3
+					"armourpen": 18,
+					"breachdps": 7.9,
+					"breachmin": 0.4,
+					"breachmax": 0.8,
+					"dps": 9.8,
+					"eps": 2.16,
+					"hps": 3.5
 				},
 				{
 					"id": "0p",
@@ -7293,16 +7569,18 @@
 					"rating": "E",
 					"cost": 74650,
 					"mass": 2,
+					"integrity": 40,
 					"power": 0.67,
 					"mount": "G",
 					"type": "T",
-					"damage": 4,
-					"armourpen": "A",
-					"rof": null,
-					"dps": 3,
-					"mjdps": 8.7,
-					"mjeps": 2.05,
-					"thermload": 3
+					"armourpen": 18,
+					"breachdps": 6.1,
+					"breachmin": 0.4,
+					"breachmax": 0.8,
+					"dps": 7.7,
+					"eps": 2.11,
+					"hps": 3.7,
+					"range": 3000
 				},
 				{
 					"id": "0q",
@@ -7313,16 +7591,17 @@
 					"rating": "F",
 					"cost": 500000,
 					"mass": 2,
+					"integrity": 40,
 					"power": 0.63,
 					"mount": "T",
 					"type": "T",
-					"damage": 3,
-					"armourpen": "A",
-					"rof": null,
-					"dps": 3,
-					"mjdps": 5.49,
-					"mjeps": 1.29,
-					"thermload": 2
+					"armourpen": 18,
+					"breachdps": 4.3,
+					"breachmin": 0.4,
+					"breachmax": 0.8,
+					"dps": 5.4,
+					"eps": 1.32,
+					"hps": 2.4
 				},
 				{
 					"id": "b0",
@@ -7338,104 +7617,122 @@
 					"type": "T",
 					"damage": 0,
 					"armourpen": "A",
-					"rof": null,
 					"dps": 3,
-					"thermload": 1,
-					"pp": "Edmund Mahon"
+					"thermload": 1
 				}
 			],
 			"mc": [
 				{
 					"id": "7n",
 					"edID": 128049458,
-					"eddbID": 1542,
+					"eddbID": 0,
 					"grp": "mc",
 					"class": 4,
 					"rating": "A",
 					"cost": 1177600,
 					"mass": 16,
+					"integrity": 80,
 					"power": 0.73,
 					"mount": "F",
 					"type": "K",
-					"damage": 4,
-					"armourpen": "A",
+					"armourpen": 68,
+					"breachdps": 25.2,
+					"breachmin": 0.4,
+					"breachmax": 0.8,
+					"dps": 28,
+					"eps": 1.44,
+					"hps": 2.4,
+					"range": 4000,
 					"rof": 3,
-					"dps": 24.5,
-					"mjeps": 0.72,
-					"thermload": 0.4,
 					"clip": 90,
-					"ssdam": 4,
 					"ammo": 2100,
-					"ammocost": 1
+					"speed": 1600,
+					"reload": 4,
+					"roundspershot": 2
 				},
 				{
 					"id": "7o",
 					"edID": 128681996,
-					"eddbID": 1546,
+					"eddbID": 0,
 					"grp": "mc",
 					"class": 4,
 					"rating": "A",
 					"cost": 6377600,
 					"mass": 16,
+					"integrity": 80,
 					"power": 1.22,
 					"mount": "G",
 					"type": "K",
-					"damage": 4,
-					"armourpen": "A",
-					"rof": 3.4,
+					"armourpen": 68,
+					"breachdps": 21.08,
+					"breachmin": 0.4,
+					"breachmax": 0.8,
 					"dps": 23.3,
-					"mjeps": 1.258,
-					"thermload": 0.5,
+					"eps": 2.516,
+					"hps": 3.4,
+					"range": 4000,
+					"rof": 3.4,
 					"clip": 90,
-					"ssdam": 3.5,
 					"ammo": 2100,
-					"ammocost": 1
+					"speed": 1600,
+					"reload": 4,
+					"roundspershot": 2
 				},
 				{
 					"id": "7k",
 					"edID": 128049457,
-					"eddbID": 1541,
+					"eddbID": 0,
 					"grp": "mc",
 					"class": 3,
 					"rating": "C",
 					"cost": 140400,
 					"mass": 8,
+					"integrity": 64,
 					"power": 0.64,
 					"mount": "F",
 					"type": "K",
-					"damage": 3,
-					"armourpen": "A",
+					"armourpen": 54,
+					"breachdps": 20.65,
+					"breachmin": 0.4,
+					"breachmax": 0.8,
+					"dps": 23.1,
+					"eps": 1.062,
+					"hps": 1.77,
+					"range": 4000,
 					"rof": 5.9,
-					"dps": 20.8,
-					"mjeps": 1.062,
-					"thermload": 0.3,
 					"clip": 90,
-					"ssdam": 3.5,
 					"ammo": 2100,
-					"ammocost": 1
+					"speed": 1600,
+					"reload": 4,
+					"roundspershot": 1
 				},
 				{
 					"id": "7l",
 					"edID": 128049461,
-					"eddbID": 1543,
+					"eddbID": 0,
 					"grp": "mc",
 					"class": 3,
 					"rating": "C",
 					"cost": 578436,
 					"mass": 8,
+					"integrity": 64,
 					"power": 0.97,
 					"mount": "G",
 					"type": "K",
-					"damage": 3,
-					"armourpen": "A",
-					"rof": 6.7,
+					"armourpen": 54,
+					"breachdps": 17.42,
+					"breachmin": 0.4,
+					"breachmax": 0.8,
 					"dps": 18.9,
-					"mjeps": 1.675,
-					"thermload": 0.3,
+					"eps": 1.675,
+					"hps": 2.01,
+					"range": 4000,
+					"rof": 6.7,
 					"clip": 90,
-					"ssdam": 2.8,
 					"ammo": 2100,
-					"ammocost": 1
+					"speed": 1600,
+					"reload": 4,
+					"roundspershot": 1
 				},
 				{
 					"id": "26",
@@ -7446,19 +7743,24 @@
 					"rating": "E",
 					"cost": 38000,
 					"mass": 4,
+					"integrity": 51,
 					"power": 0.46,
 					"mount": "F",
 					"type": "K",
-					"damage": 2,
-					"armourpen": "A",
-					"rof": 7,
-					"dps": 4,
-					"thermload": 1,
+					"armourpen": 37,
+					"breachdps": 14.2,
+					"breachmin": 0.4,
+					"breachmax": 0.8,
+					"dps": 15.6,
+					"eps": 0.781,
+					"hps": 1.42,
+					"range": 4000,
+					"rof": 7.1,
 					"clip": 90,
-					"mjdps": 6.02,
-					"ssdam": 1.2,
 					"ammo": 2100,
-					"ammocost": 1
+					"speed": 1600,
+					"reload": 4,
+					"roundspershot": 1
 				},
 				{
 					"id": "27",
@@ -7469,19 +7771,24 @@
 					"rating": "F",
 					"cost": 57000,
 					"mass": 4,
+					"integrity": 51,
 					"power": 0.64,
 					"mount": "G",
 					"type": "K",
-					"damage": 2,
-					"armourpen": "A",
-					"rof": 7.5,
-					"dps": 4,
-					"thermload": 1,
+					"armourpen": 37,
+					"breachdps": 11.55,
+					"breachmin": 0.4,
+					"breachmax": 0.8,
+					"dps": 12.6,
+					"eps": 1.078,
+					"hps": 1.54,
+					"range": 4000,
+					"rof": 7.7,
 					"clip": 90,
-					"mjdps": 5.59,
-					"ssdam": 1.03,
 					"ammo": 2100,
-					"ammocost": 1
+					"speed": 1600,
+					"reload": 4,
+					"roundspershot": 1
 				},
 				{
 					"id": "28",
@@ -7492,19 +7799,24 @@
 					"rating": "F",
 					"cost": 1292800,
 					"mass": 4,
+					"integrity": 51,
 					"power": 0.5,
 					"mount": "T",
 					"type": "K",
-					"damage": 2,
-					"armourpen": "A",
-					"rof": 5.3,
-					"dps": 3,
-					"thermload": 1,
+					"armourpen": 37,
+					"breachdps": 6.82,
+					"breachmin": 0.4,
+					"breachmax": 0.8,
+					"dps": 7.3,
+					"eps": 0.372,
+					"hps": 0.62,
+					"range": 4000,
+					"rof": 6.2,
 					"clip": 90,
-					"mjdps": 2.15,
-					"ssdam": 0.52,
 					"ammo": 2100,
-					"ammocost": 1
+					"speed": 1600,
+					"reload": 4,
+					"roundspershot": 1
 				},
 				{
 					"id": "23",
@@ -7515,19 +7827,24 @@
 					"rating": "F",
 					"cost": 9500,
 					"mass": 2,
+					"integrity": 40,
 					"power": 0.28,
 					"mount": "F",
 					"type": "K",
-					"damage": 2,
-					"armourpen": "A",
-					"rof": 8,
-					"dps": 3,
-					"thermload": 1,
+					"armourpen": 22,
+					"breachdps": 7.7,
+					"breachmin": 0.4,
+					"breachmax": 0.8,
+					"dps": 8.6,
+					"eps": 0.462,
+					"hps": 0.77,
+					"range": 4000,
+					"rof": 7.7,
 					"clip": 90,
-					"mjdps": 3.75,
-					"ssdam": 0.69,
 					"ammo": 2100,
-					"ammocost": 1
+					"speed": 1600,
+					"reload": 4,
+					"roundspershot": 1
 				},
 				{
 					"id": "24",
@@ -7538,19 +7855,24 @@
 					"rating": "G",
 					"cost": 14250,
 					"mass": 2,
+					"integrity": 40,
 					"power": 0.37,
 					"mount": "G",
 					"type": "K",
-					"damage": 2,
-					"armourpen": "A",
-					"rof": 8.5,
-					"dps": 3,
-					"thermload": 1,
+					"armourpen": 22,
+					"breachdps": 5.8,
+					"breachmin": 0.4,
+					"breachmax": 0.8,
+					"dps": 6.8,
+					"eps": 0.58,
+					"hps": 0.83,
+					"range": 4000,
+					"rof": 8.3,
 					"clip": 90,
-					"mjdps": 2.03,
-					"ssdam": 0.34,
 					"ammo": 2100,
-					"ammocost": 1
+					"speed": 1600,
+					"reload": 4,
+					"roundspershot": 1
 				},
 				{
 					"id": "25",
@@ -7561,19 +7883,24 @@
 					"rating": "G",
 					"cost": 81600,
 					"mass": 2,
+					"integrity": 40,
 					"power": 0.26,
 					"mount": "T",
 					"type": "K",
-					"damage": 0,
-					"armourpen": "A",
-					"rof": 6,
-					"dps": 2,
-					"thermload": 1,
+					"armourpen": 22,
+					"breachdps": 3.55,
+					"breachmin": 0.4,
+					"breachmax": 0.8,
+					"dps": 4,
+					"eps": 0.213,
+					"hps": 0,
+					"range": 4000,
+					"rof": 7.1,
 					"clip": 90,
-					"mjdps": 1.54,
-					"ssdam": 0.34,
 					"ammo": 2100,
-					"ammocost": 1
+					"speed": 1600,
+					"reload": 4,
+					"roundspershot": 1
 				},
 				{
 					"id": "e0",
@@ -7593,8 +7920,7 @@
 					"dps": 4,
 					"thermload": 1,
 					"clip": 60,
-					"ammo": 1000,
-					"pp": "Pranav Antal"
+					"ammo": 1000
 				}
 			],
 			"c": [
@@ -7607,19 +7933,23 @@
 					"rating": "B",
 					"cost": 2700800,
 					"mass": 16,
+					"integrity": 80,
 					"power": 0.92,
 					"mount": "F",
 					"type": "K",
-					"damage": 9,
-					"armourpen": "A",
+					"armourpen": 90,
+					"breachdps": 25.28,
+					"breachmin": 0.6,
+					"breachmax": 0.8,
+					"dps": 25.3,
+					"eps": 0.644,
+					"hps": 1.92,
+					"range": 4500,
 					"rof": 0.4,
-					"dps": 5,
-					"thermload": 2,
 					"clip": 5,
-					"mjdps": 8.13,
-					"ssdam": 37.13,
 					"ammo": 100,
-					"ammocost": 20
+					"speed": 900,
+					"reload": 5
 				},
 				{
 					"id": "1r",
@@ -7630,19 +7960,23 @@
 					"rating": "B",
 					"cost": 5401600,
 					"mass": 16,
+					"integrity": 80,
 					"power": 1.03,
 					"mount": "G",
 					"type": "K",
-					"damage": 8,
-					"armourpen": "A",
+					"armourpen": 90,
+					"breachdps": 16.92,
+					"breachmin": 0.6,
+					"breachmax": 0.8,
+					"dps": 19.7,
+					"eps": 0.688,
+					"hps": 1.76,
+					"range": 4500,
 					"rof": 0.4,
-					"dps": 4,
-					"thermload": 2,
 					"clip": 5,
-					"mjdps": 10.97,
-					"ssdam": 30.94,
 					"ammo": 100,
-					"ammocost": 20
+					"speed": 750,
+					"reload": 4
 				},
 				{
 					"id": "1n",
@@ -7653,19 +7987,23 @@
 					"rating": "C",
 					"cost": 675200,
 					"mass": 8,
+					"integrity": 64,
 					"power": 0.67,
 					"mount": "F",
 					"type": "K",
-					"damage": 7,
-					"armourpen": "A",
+					"armourpen": 90,
+					"breachdps": 16.92,
+					"breachmin": 0.6,
+					"breachmax": 0.8,
+					"dps": 18.7,
+					"eps": 0.428,
+					"hps": 1.28,
+					"range": 4000,
 					"rof": 0.4,
-					"dps": 4,
-					"thermload": 2,
 					"clip": 5,
-					"mjdps": 8.13,
-					"ssdam": 22.28,
 					"ammo": 100,
-					"ammocost": 20
+					"speed": 959,
+					"reload": 4
 				},
 				{
 					"id": "1o",
@@ -7676,19 +8014,23 @@
 					"rating": "C",
 					"cost": 1350400,
 					"mass": 8,
+					"integrity": 64,
 					"power": 0.75,
 					"mount": "G",
 					"type": "K",
-					"damage": 7,
-					"armourpen": "A",
+					"armourpen": 90,
+					"breachdps": 30.9,
+					"breachmin": 0.6,
+					"breachmax": 0.8,
+					"dps": 14.3,
+					"eps": 0.456,
+					"hps": 1.16,
+					"range": 4000,
 					"rof": 0.4,
-					"dps": 4,
-					"thermload": 1,
 					"clip": 5,
-					"mjdps": 7.95,
-					"ssdam": 21.04,
 					"ammo": 100,
-					"ammocost": 20
+					"speed": 800,
+					"reload": 4
 				},
 				{
 					"id": "1p",
@@ -7699,19 +8041,23 @@
 					"rating": "D",
 					"cost": 16204800,
 					"mass": 8,
+					"integrity": 64,
 					"power": 0.64,
 					"mount": "T",
 					"type": "K",
-					"damage": 6,
-					"armourpen": "A",
-					"rof": 0.3,
-					"dps": 4,
-					"thermload": 1,
+					"armourpen": 90,
+					"breachdps": 10.04,
+					"breachmin": 0.6,
+					"breachmax": 0.8,
+					"dps": 9.7,
+					"eps": 0.212,
+					"hps": 0.64,
+					"range": 4000,
+					"rof": 0.4,
 					"clip": 5,
-					"mjdps": 3.58,
-					"ssdam": 12.38,
 					"ammo": 100,
-					"ammocost": 20
+					"speed": 800,
+					"reload": 4
 				},
 				{
 					"id": "1k",
@@ -7722,19 +8068,23 @@
 					"rating": "D",
 					"cost": 168430,
 					"mass": 4,
+					"integrity": 51,
 					"power": 0.49,
 					"mount": "F",
 					"type": "K",
-					"damage": 6,
-					"armourpen": "A",
+					"armourpen": 90,
+					"breachdps": 14,
+					"breachmin": 0.6,
+					"breachmax": 0.8,
+					"dps": 13.6,
+					"eps": 0.35,
+					"hps": 1.05,
+					"range": 3500,
 					"rof": 0.5,
-					"dps": 4,
-					"thermload": 1,
 					"clip": 5,
-					"mjdps": 6,
-					"ssdam": 15.47,
 					"ammo": 100,
-					"ammocost": 20
+					"speed": 1051,
+					"reload": 4
 				},
 				{
 					"id": "1l",
@@ -7745,19 +8095,23 @@
 					"rating": "D",
 					"cost": 337600,
 					"mass": 4,
+					"integrity": 51,
 					"power": 0.54,
 					"mount": "G",
 					"type": "K",
-					"damage": 6,
-					"armourpen": "A",
+					"armourpen": 90,
+					"breachdps": 101.5,
+					"breachmin": 0.6,
+					"breachmax": 0.8,
+					"dps": 10.3,
+					"eps": 0.375,
+					"hps": 0.95,
+					"range": 3500,
 					"rof": 0.5,
-					"dps": 3,
-					"thermload": 1,
 					"clip": 5,
-					"mjdps": 6.24,
-					"ssdam": 15.47,
 					"ammo": 100,
-					"ammocost": 20
+					"speed": 875,
+					"reload": 4
 				},
 				{
 					"id": "1m",
@@ -7768,19 +8122,23 @@
 					"rating": "E",
 					"cost": 4051200,
 					"mass": 4,
+					"integrity": 51,
 					"power": 0.45,
 					"mount": "T",
 					"type": "K",
-					"damage": 5,
-					"armourpen": "A",
-					"rof": 0.3,
-					"dps": 3,
-					"thermload": 1,
+					"armourpen": 90,
+					"breachdps": 6.52,
+					"breachmin": 0.6,
+					"breachmax": 0.8,
+					"dps": 6.9,
+					"eps": 0.136,
+					"hps": 0.4,
+					"range": 3500,
+					"rof": 0.4,
 					"clip": 5,
-					"mjdps": 2.41,
-					"ssdam": 7.74,
 					"ammo": 100,
-					"ammocost": 20
+					"speed": 875,
+					"reload": 4
 				},
 				{
 					"id": "1h",
@@ -7791,19 +8149,23 @@
 					"rating": "D",
 					"cost": 21100,
 					"mass": 2,
+					"integrity": 40,
 					"power": 0.34,
 					"mount": "F",
 					"type": "K",
-					"damage": 5,
-					"armourpen": "A",
+					"armourpen": 90,
+					"breachdps": 8.55,
+					"breachmin": 0.6,
+					"breachmax": 0.8,
+					"dps": 9,
+					"eps": 0.23,
+					"hps": 0.7,
+					"range": 3000,
 					"rof": 0.5,
-					"dps": 3,
-					"thermload": 1,
 					"clip": 5,
-					"mjdps": 4,
-					"ssdam": 9.59,
 					"ammo": 100,
-					"ammocost": 20
+					"speed": 1200,
+					"reload": 4
 				},
 				{
 					"id": "1i",
@@ -7814,19 +8176,23 @@
 					"rating": "E",
 					"cost": 42200,
 					"mass": 2,
+					"integrity": 40,
 					"power": 0.38,
 					"mount": "G",
 					"type": "K",
-					"damage": 5,
-					"armourpen": "A",
+					"armourpen": 35,
+					"breachdps": 6.6,
+					"breachmin": 0.6,
+					"breachmax": 0.9,
+					"dps": 7.2,
+					"eps": 0.24,
+					"hps": 0.65,
+					"range": 3000,
 					"rof": 0.5,
-					"dps": 3,
-					"thermload": 1,
 					"clip": 5,
-					"mjdps": 3.8,
-					"ssdam": 8.97,
 					"ammo": 100,
-					"ammocost": 20
+					"speed": 1000,
+					"reload": 4
 				},
 				{
 					"id": "1j",
@@ -7837,19 +8203,23 @@
 					"rating": "F",
 					"cost": 506400,
 					"mass": 2,
+					"integrity": 40,
 					"power": 0.32,
 					"mount": "T",
 					"type": "K",
-					"damage": 4,
-					"armourpen": "A",
+					"armourpen": 90,
+					"breachdps": 4.24,
+					"breachmin": 0.6,
+					"breachmax": 0.8,
+					"dps": 4.8,
+					"eps": 0.088,
+					"hps": 0.28,
+					"range": 3000,
 					"rof": 0.4,
-					"dps": 3,
-					"thermload": 1,
 					"clip": 5,
-					"mjdps": 1.35,
-					"ssdam": 4.13,
 					"ammo": 100,
-					"ammocost": 20
+					"speed": 1000,
+					"reload": 4
 				}
 			],
 			"fc": [
@@ -7862,19 +8232,25 @@
 					"rating": "C",
 					"cost": 1167360,
 					"mass": 8,
+					"integrity": 80,
 					"power": 1.02,
 					"mount": "F",
 					"type": "K",
-					"damage": 3,
-					"armourpen": "A",
+					"armourpen": 52,
 					"rof": 4.5,
-					"dps": 10,
-					"thermload": 1,
+					"breachdps": 189,
+					"breachmin": 0.4,
+					"breachmax": 0.8,
+					"dps": 113.8,
+					"eps": 30.78,
+					"hps": 59.4,
+					"range": 2000,
 					"clip": 3,
-					"mjdps": 15.19,
-					"ssdam": 28.36,
 					"ammo": 90,
-					"ammocost": 50
+					"speed": 667,
+					"reload": 5,
+					"roundspershot": 12,
+					"jitter": 0.5
 				},
 				{
 					"id": "1u",
@@ -7885,19 +8261,25 @@
 					"rating": "C",
 					"cost": 1751040,
 					"mass": 8,
+					"integrity": 80,
 					"power": 1.55,
 					"mount": "G",
 					"type": "K",
-					"damage": 3,
-					"armourpen": "A",
+					"armourpen": 52,
 					"rof": 4.8,
-					"dps": 10,
-					"thermload": 1,
+					"breachdps": 167.04,
+					"breachmin": 0.4,
+					"breachmax": 0.8,
+					"dps": 184.6,
+					"eps": 46.66,
+					"hps": 80.64,
+					"range": 2000,
 					"clip": 3,
-					"mjdps": 12.77,
-					"ssdam": 23.21,
 					"ammo": 90,
-					"ammocost": 50
+					"speed": 667,
+					"reload": 5,
+					"roundspershot": 12,
+					"jitter": 0.5
 				},
 				{
 					"id": "1v",
@@ -7908,19 +8290,25 @@
 					"rating": "C",
 					"cost": 5836800,
 					"mass": 8,
+					"integrity": 80,
 					"power": 1.29,
 					"mount": "T",
 					"type": "K",
-					"damage": 2,
-					"armourpen": "A",
-					"rof": 3.3,
-					"dps": 9,
-					"thermload": 1,
+					"armourpen": 52,
+					"rof": 4,
+					"breachdps": 110.4,
+					"breachmin": 0.4,
+					"breachmax": 0.8,
+					"dps": 122.9,
+					"eps": 17.76,
+					"hps": 33.6,
+					"range": 2000,
 					"clip": 3,
-					"mjdps": 6.85,
-					"ssdam": 12.89,
 					"ammo": 90,
-					"ammocost": 50
+					"speed": 667,
+					"reload": 5,
+					"roundspershot": 12,
+					"jitter": 0.5
 				},
 				{
 					"id": "1s",
@@ -7931,19 +8319,25 @@
 					"rating": "A",
 					"cost": 291840,
 					"mass": 4,
+					"integrity": 80,
 					"power": 0.74,
 					"mount": "F",
 					"type": "K",
-					"damage": 3,
-					"armourpen": "A",
+					"armourpen": 35,
 					"rof": 5,
-					"dps": 9,
-					"thermload": 1,
+					"breachdps": 138,
+					"breachmin": 0.4,
+					"breachmax": 0.8,
+					"dps": 122.9,
+					"eps": 22.2,
+					"hps": 42,
+					"range": 2000,
 					"clip": 3,
-					"mjdps": 9.5,
-					"ssdam": 18.05,
 					"ammo": 90,
-					"ammocost": 50
+					"speed": 667,
+					"reload": 5,
+					"roundspershot": 12,
+					"jitter": 0.5
 				},
 				{
 					"id": "7e",
@@ -7954,17 +8348,25 @@
 					"rating": "D",
 					"cost": 437800,
 					"mass": 4,
+					"integrity": 80,
 					"power": 1.03,
 					"mount": "G",
 					"type": "K",
-					"damage": 2,
-					"armourpen": "A",
+					"armourpen": 35,
 					"rof": 5.3,
-					"dps": 9,
-					"thermload": 1,
+					"breachdps": 114.48,
+					"breachmin": 0.4,
+					"breachmax": 0.8,
+					"dps": 153.6,
+					"eps": 31.6,
+					"hps": 50.88,
+					"range": 2000,
 					"clip": 3,
 					"ammo": 90,
-					"ammocost": 50
+					"speed": 667,
+					"reload": 5,
+					"roundspershot": 12,
+					"jitter": 0.5
 				},
 				{
 					"id": "7f",
@@ -7975,17 +8377,25 @@
 					"rating": "D",
 					"cost": 1459200,
 					"mass": 4,
+					"integrity": 80,
 					"power": 0.79,
 					"mount": "T",
 					"type": "K",
-					"damage": 2,
-					"armourpen": "A",
+					"armourpen": 35,
 					"rof": 3.7,
-					"dps": 9,
-					"thermload": 1,
+					"breachdps": 67.08,
+					"breachmin": 0.4,
+					"breachmax": 0.8,
+					"dps": 123.2,
+					"eps": 10.84,
+					"hps": 20.64,
+					"range": 2000,
 					"clip": 3,
 					"ammo": 90,
-					"ammocost": 50
+					"speed": 667,
+					"reload": 5,
+					"roundspershot": 12,
+					"jitter": 0.5
 				},
 				{
 					"id": "20",
@@ -7996,19 +8406,25 @@
 					"rating": "E",
 					"cost": 36000,
 					"mass": 2,
+					"integrity": 40,
 					"power": 0.45,
 					"mount": "F",
 					"type": "K",
-					"damage": 2,
-					"armourpen": "A",
-					"rof": 5.5,
-					"dps": 8,
-					"thermload": 1,
+					"armourpen": 20,
+					"breachdps": 87.36,
+					"breachmin": 0.4,
+					"breachmax": 0.8,
+					"dps": 95.3,
+					"eps": 14.112,
+					"hps": 26.88,
+					"range": 2000,
+					"rof": 5.6,
 					"clip": 3,
-					"mjdps": 5.53,
-					"ssdam": 10.31,
 					"ammo": 90,
-					"ammocost": 50
+					"speed": 667,
+					"reload": 5,
+					"roundspershot": 12,
+					"jitter": 0.5
 				},
 				{
 					"id": "21",
@@ -8019,19 +8435,25 @@
 					"rating": "E",
 					"cost": 54720,
 					"mass": 2,
+					"integrity": 40,
 					"power": 0.59,
 					"mount": "G",
 					"type": "K",
-					"damage": 2,
-					"armourpen": "A",
-					"rof": 5.8,
-					"dps": 7,
-					"thermload": 1,
+					"armourpen": 20,
+					"breachdps": 63.4,
+					"breachmin": 0.4,
+					"breachmax": 0.8,
+					"dps": 71.3,
+					"eps": 18.408,
+					"hps": 28.32,
+					"range": 2000,
+					"rof": 5.9,
 					"clip": 3,
-					"mjdps": 3.58,
-					"ssdam": 6.45,
 					"ammo": 90,
-					"ammocost": 50
+					"speed": 667,
+					"reload": 5,
+					"roundspershot": 12,
+					"jitter": 0.5
 				},
 				{
 					"id": "22",
@@ -8042,19 +8464,25 @@
 					"rating": "E",
 					"cost": 182400,
 					"mass": 2,
+					"integrity": 40,
 					"power": 0.42,
 					"mount": "T",
 					"type": "K",
-					"damage": 1,
-					"armourpen": "A",
-					"rof": 4,
-					"dps": 6,
-					"thermload": 1,
+					"armourpen": 20,
+					"breachdps": 34.56,
+					"breachmin": 0.4,
+					"breachmax": 0.8,
+					"dps": 39.4,
+					"eps": 6.72,
+					"hps": 13.44,
+					"range": 2000,
+					"rof": 4.8,
 					"clip": 3,
-					"mjdps": 2.11,
-					"ssdam": 3.87,
 					"ammo": 90,
-					"ammocost": 50
+					"speed": 667,
+					"reload": 5,
+					"roundspershot": 12,
+					"jitter": 0.5
 				},
 				{
 					"id": "pa",
@@ -8075,8 +8503,7 @@
 					"dps": 9,
 					"thermload": 1,
 					"clip": 3,
-					"ammo": 90,
-					"pp": "Zachary Hudson"
+					"ammo": 90
 				}
 			],
 			"rg": [
@@ -8089,19 +8516,22 @@
 					"rating": "D",
 					"cost": 51600,
 					"mass": 2,
+					"integrity": 40,
 					"power": 1.15,
 					"mount": "F",
-					"type": "TK",
-					"damage": 6,
-					"armourpen": "A",
-					"rof": 0.6,
-					"dps": 4,
-					"thermload": 7,
+					"type": "KT",
+					"armourpen": 30,
+					"breachdps": 35.2,
+					"breachmin": 0.4,
+					"breachmax": 0.8,
+					"dps": 37,
+					"eps": 4.3,
+					"hps": 28.48,
+					"range": 3000,
+					"rof": 1.6,
 					"clip": 1,
-					"mjdps": 13.75,
-					"ssdam": 24.75,
 					"ammo": 30,
-					"ammocost": 200
+					"reload": 1
 				},
 				{
 					"id": "2a",
@@ -8112,19 +8542,22 @@
 					"rating": "B",
 					"cost": 412800,
 					"mass": 4,
+					"integrity": 51,
 					"power": 1.63,
 					"mount": "F",
-					"type": "TK",
-					"damage": 7,
-					"armourpen": "A",
-					"rof": 0.5,
-					"dps": 4,
-					"thermload": 10,
+					"type": "KT",
+					"armourpen": 48,
+					"breachdps": 47.4,
+					"breachmin": 0.4,
+					"breachmax": 0.8,
+					"dps": 50,
+					"eps": 6.132,
+					"hps": 36,
+					"range": 3000,
+					"rof": 1.2,
 					"clip": 1,
-					"mjdps": 21.66,
-					"ssdam": 43.32,
 					"ammo": 30,
-					"ammocost": 200
+					"reload": 1
 				},
 				{
 					"id": "ih",
@@ -8138,40 +8571,44 @@
 					"mass": 4,
 					"power": 1.63,
 					"mount": "F",
-					"type": "TK",
+					"type": "KT",
 					"damage": 5,
 					"armourpen": "A",
 					"rof": 0.6,
 					"dps": 5,
 					"thermload": 3,
 					"clip": 3,
-					"ammo": 90,
-					"pp": "Arissa Lavigny-Duval"
+					"ammo": 90
 				}
 			],
 			"pa": [
 				{
-					"id": "1g",
-					"edID": 128049465,
-					"eddbID": 873,
+					"id": "2c",
+					"edID": 128049467,
+					"eddbID": 875,
 					"grp": "pa",
-					"class": 2,
-					"rating": "C",
-					"cost": 834200,
-					"mass": 4,
-					"power": 1.43,
+					"class": 4,
+					"rating": "A",
+					"cost": 13793600,
+					"mass": 16,
+					"integrity": 80,
+					"power": 2.63,
 					"mount": "F",
-					"type": "T",
-					"damage": 7,
-					"armourpen": "A",
+					"type": "KT",
+					"armourpen": 85,
+					"breachdps": 30.62,
+					"breachmin": 0.4,
+					"breachmax": 0.8,
+					"dps": 30,
+					"eps": 6.312,
+					"hps": 8.85,
+					"range": 3500,
 					"rof": 0.3,
-					"dps": 4,
-					"thermload": 10,
 					"clip": 5,
-					"mjdps": 6.89,
-					"ssdam": 27.85,
 					"ammo": 100,
-					"ammocost": 200
+					"reload": 8,
+					"speed": 875,
+					"roundspershot": 1
 				},
 				{
 					"id": "2b",
@@ -8182,42 +8619,52 @@
 					"rating": "B",
 					"cost": 3051200,
 					"mass": 8,
+					"integrity": 64,
 					"power": 1.97,
 					"mount": "F",
-					"type": "TK",
-					"damage": 9,
-					"armourpen": "A",
+					"type": "KT",
+					"armourpen": 70,
+					"breachdps": 20.4,
+					"breachmin": 0.4,
+					"breachmax": 0.8,
+					"dps": 23.2,
+					"eps": 4.08,
+					"hps": 6.54,
+					"range": 3500,
 					"rof": 0.3,
-					"dps": 4,
-					"thermload": 8,
 					"clip": 5,
-					"mjdps": 20.98,
-					"ssdam": 92.82,
 					"ammo": 100,
-					"ammocost": 200
+					"reload": 8,
+					"speed": 875,
+					"roundspershot": 1
 				},
 				{
-					"id": "2c",
-					"edID": 128049467,
-					"eddbID": 875,
+					"id": "1g",
+					"edID": 128049465,
+					"eddbID": 873,
 					"grp": "pa",
-					"class": 4,
-					"rating": "A",
-					"cost": 13793600,
-					"mass": 16,
-					"power": 2.63,
+					"class": 2,
+					"rating": "C",
+					"cost": 834200,
+					"mass": 4,
+					"integrity": 51,
+					"power": 1.43,
 					"mount": "F",
-					"type": "TK",
-					"damage": 10,
-					"armourpen": "A",
+					"type": "KT",
+					"armourpen": 55,
+					"breachdps": 13.26,
+					"breachmin": 0.4,
+					"breachmax": 0.8,
+					"dps": 17.2,
+					"eps": 2.595,
+					"hps": 4.68,
+					"range": 3500,
 					"rof": 0.3,
-					"dps": 5,
-					"thermload": 10,
 					"clip": 5,
-					"mjdps": 25.55,
-					"ssdam": 123.76,
 					"ammo": 100,
-					"ammocost": 200
+					"reload": 8,
+					"speed": 875,
+					"roundspershot": 1
 				},
 				{
 					"id": "Ap",
@@ -8231,7 +8678,7 @@
 					"mass": 8,
 					"power": 1.97,
 					"mount": "F",
-					"type": "TK",
+					"type": "KT",
 					"damage": 8,
 					"armourpen": "A",
 					"rof": 1.67,
@@ -8239,11 +8686,35 @@
 					"thermload": 4,
 					"clip": 20,
 					"ammo": 300,
-					"ammocost": 67,
-					"pp": "Denton Patreus"
+					"ammocost": 67
 				}
 			],
 			"mr": [
+				{
+					"id": "1z",
+					"edID": 0,
+					"eddbID": 0,
+					"grp": "mr",
+					"name": "Rocket Propelled FSD Disruptor",
+					"class": 2,
+					"rating": "B",
+					"cost": 190227,
+					"mass": 4,
+					"power": 1.2,
+					"mount": "F",
+					"type": "?",
+					"damage": 50,
+					"armourpen": "?",
+					"rof": 0.5,
+					"dps": 0,
+					"thermload": 0,
+					"clip": 12,
+					"ammo": 48,
+					"mjdps": 0,
+					"ssdam": 0,
+					"missile": "D",
+					"ammocost": 0
+				},
 				{
 					"id": "2f",
 					"edID": 128666725,
@@ -8253,20 +8724,23 @@
 					"rating": "B",
 					"cost": 240400,
 					"mass": 4,
+					"integrity": 51,
 					"power": 1.2,
 					"mount": "F",
 					"type": "E",
-					"damage": 7,
-					"armourpen": "F",
-					"rof": 2.5,
-					"dps": 8,
-					"thermload": 3,
+					"armourpen": 60,
+					"breachdps": 0,
+					"breachmin": 0,
+					"breachmax": 0,
+					"dps": 25,
+					"eps": 0.12,
+					"hps": 1.8,
 					"clip": 12,
-					"ammo": 24,
-					"mjdps": 1.72,
-					"ssdam": 3.87,
-					"missile": "D",
-					"ammocost": 500
+					"ammo": 48,
+					"speed": 750,
+					"reload": 5,
+					"roundspershot": 1,
+					"missile": "D"
 				},
 				{
 					"id": "2g",
@@ -8277,20 +8751,23 @@
 					"rating": "B",
 					"cost": 512400,
 					"mass": 4,
+					"integrity": 51,
 					"power": 1.2,
 					"mount": "F",
 					"type": "E",
-					"damage": 6,
-					"armourpen": "F",
-					"rof": 0.3,
-					"dps": 3,
-					"thermload": 3,
+					"armourpen": 60,
+					"breachdps": 0,
+					"breachmin": 0,
+					"breachmax": 0,
+					"dps": 13.3,
+					"eps": 0.07,
+					"hps": 1.08,
 					"clip": 6,
 					"ammo": 18,
-					"mjdps": 0.57,
-					"ssdam": 2.58,
-					"missile": "S",
-					"ammocost": 666.67
+					"speed": 625,
+					"reload": 12,
+					"roundspershot": 1,
+					"missile": "S"
 				},
 				{
 					"id": "2d",
@@ -8301,20 +8778,24 @@
 					"rating": "B",
 					"cost": 32180,
 					"mass": 2,
+					"integrity": 40,
 					"power": 0.4,
 					"mount": "F",
 					"type": "E",
-					"damage": 7,
-					"armourpen": "F",
-					"rof": 2.5,
-					"dps": 8,
-					"thermload": 3,
+					"armourpen": 60,
+					"breachdps": 0,
+					"breachmin": 0,
+					"breachmax": 0,
+					"dps": 25,
+					"eps": 0.12,
+					"hps": 1.8,
+					"rof": 0.5,
 					"clip": 8,
 					"ammo": 16,
-					"mjdps": 1.63,
-					"ssdam": 3.87,
-					"missile": "D",
-					"ammocost": 500
+					"speed": 750,
+					"reload": 5,
+					"roundspershot": 1,
+					"missile": "D"
 				},
 				{
 					"id": "2e",
@@ -8325,20 +8806,24 @@
 					"rating": "B",
 					"cost": 72600,
 					"mass": 2,
+					"integrity": 40,
 					"power": 0.6,
 					"mount": "F",
 					"type": "E",
-					"damage": 6,
-					"armourpen": "F",
+					"armourpen": 60,
+					"breachdps": 0,
+					"breachmin": 0,
+					"breachmax": 0,
+					"dps": 13.3,
+					"eps": 0.07,
+					"hps": 1.08,
 					"rof": 0.3,
-					"dps": 3,
-					"thermload": 3,
 					"clip": 6,
 					"ammo": 6,
-					"mjdps": 0.57,
-					"ssdam": 2.58,
-					"missile": "S",
-					"ammocost": 666.67
+					"speed": 625,
+					"reload": 12,
+					"roundspershot": 1,
+					"missile": "S"
 				},
 				{
 					"id": "Ph",
@@ -8360,8 +8845,7 @@
 					"thermload": 3,
 					"clip": 12,
 					"ammo": 120,
-					"missile": "S",
-					"pp": "Li Yong-Rui"
+					"missile": "S"
 				}
 			],
 			"tp": [
@@ -8374,13 +8858,22 @@
 					"rating": "I",
 					"cost": 11200,
 					"mass": 2,
+					"integrity": 40,
 					"power": 0.4,
 					"mount": "F",
-					"armourpen": "C",
-					"thermload": 10,
+					"type": "E",
+					"armourpen": 10000,
+					"breachdps": 60,
+					"breachmin": 0.6,
+					"breachmax": 0.8,
+					"dps": 120,
+					"eps": 0,
+					"hps": 45,
+					"rof": 1,
 					"clip": 1,
-					"ammo": 0,
-					"ammocost": 15000,
+					"ammo": 1,
+					"reload": 5,
+					"speed": 250,
 					"missile": "S"
 				},
 				{
@@ -8392,13 +8885,22 @@
 					"rating": "I",
 					"cost": 44800,
 					"mass": 4,
+					"integrity": 51,
 					"power": 0.4,
 					"mount": "F",
-					"armourpen": "C",
-					"thermload": 10,
-					"clip": 2,
-					"ammo": 0,
-					"ammocost": 15000,
+					"type": "E",
+					"armourpen": 10000,
+					"breachdps": 60,
+					"breachmin": 0.6,
+					"breachmax": 0.8,
+					"dps": 120,
+					"eps": 0,
+					"hps": 50,
+					"rof": 1,
+					"clip": 1,
+					"ammo": 2,
+					"reload": 5,
+					"speed": 250,
 					"missile": "S"
 				}
 			],
@@ -8412,14 +8914,20 @@
 					"rating": "I",
 					"cost": 24260,
 					"mass": 2,
+					"integrity": 40,
 					"power": 0.4,
 					"mount": "F",
-					"type": "E",
-					"armourpen": "C",
-					"thermload": 2,
-					"clip": 1,
-					"ammo": 24,
-					"ammocost": 209
+					"type": "ET",
+					"armourpen": 60,
+					"breachdps": 0,
+					"breachmin": 0,
+					"breachmax": 0,
+					"dps": 44,
+					"hps": 5,
+					"rof": 1,
+					"clip": 3,
+					"ammo": 36,
+					"reload": 2
 				},
 				{
 					"id": "2k",
@@ -8430,14 +8938,20 @@
 					"rating": "I",
 					"cost": 294080,
 					"mass": 4,
+					"integrity": 51,
 					"power": 0.4,
 					"mount": "F",
-					"type": "E",
-					"armourpen": "C",
-					"thermload": 3,
+					"type": "ET",
+					"armourpen": 60,
+					"breachdps": 0,
+					"breachmin": 0,
+					"breachmax": 0,
+					"dps": 44,
+					"hps": 7.5,
+					"rof": 1,
 					"clip": 3,
-					"ammo": 24,
-					"ammocost": 209
+					"ammo": 36,
+					"reload": 2
 				},
 				{
 					"id": "kp",
@@ -8449,14 +8963,20 @@
 					"rating": "I",
 					"cost": 36400,
 					"mass": 2,
+					"integrity": 40,
 					"power": 0.4,
 					"mount": "F",
-					"type": "E",
+					"type": "ET",
 					"armourpen": "C",
-					"thermload": 2,
-					"clip": 1,
-					"ammo": 24,
-					"ammocost": 209
+					"breachdps": 0,
+					"breachmin": 0,
+					"breachmax": 0,
+					"dps": 32,
+					"hps": 5,
+					"rof": 1,
+					"clip": 3,
+					"ammo": 36,
+					"reload": 2
 				}
 			],
 			"ml": [
@@ -8469,10 +8989,16 @@
 					"rating": "D",
 					"cost": 6800,
 					"mass": 2,
+					"integrity": 40,
 					"power": 0.5,
 					"mount": "F",
-					"armourpen": "D",
-					"thermload": 3
+					"armourpen": 18,
+					"breachdps": 0.3,
+					"breachmin": 0.1,
+					"breachmax": 0.2,
+					"dps": 2,
+					"eps": 1.5,
+					"hps": 2
 				},
 				{
 					"id": "2m",
@@ -8483,10 +9009,16 @@
 					"rating": "D",
 					"cost": 22580,
 					"mass": 2,
+					"integrity": 51,
 					"power": 0.75,
 					"mount": "F",
-					"armourpen": "D",
-					"thermload": 5
+					"armourpen": 18,
+					"breachdps": 0.6,
+					"breachmin": 0.1,
+					"breachmax": 0.2,
+					"dps": 4,
+					"eps": 3,
+					"hps": 4
 				},
 				{
 					"id": "ml",
@@ -8503,8 +9035,7 @@
 					"damage": 3,
 					"dps": 3,
 					"armourpen": "D",
-					"thermload": 3,
-					"pp": "Zemina Torval"
+					"thermload": 3
 				}
 			],
 			"cs": [
@@ -8518,7 +9049,7 @@
 					"cost": 13540,
 					"mass": 1.3,
 					"power": 0.2,
-					"range": 2,
+					"range": 2000,
 					"time": 10
 				},
 				{
@@ -8531,7 +9062,7 @@
 					"cost": 40630,
 					"mass": 1.3,
 					"power": 0.4,
-					"range": 2.5,
+					"range": 2500,
 					"time": 10
 				},
 				{
@@ -8544,7 +9075,7 @@
 					"cost": 121900,
 					"mass": 1.3,
 					"power": 0.8,
-					"range": 3,
+					"range": 3000,
 					"time": 10
 				},
 				{
@@ -8557,7 +9088,7 @@
 					"cost": 365700,
 					"mass": 1.3,
 					"power": 1.6,
-					"range": 3.5,
+					"range": 3500,
 					"time": 10
 				},
 				{
@@ -8570,7 +9101,7 @@
 					"cost": 1097100,
 					"mass": 1.3,
 					"power": 3.2,
-					"range": 4,
+					"range": 4000,
 					"time": 10
 				}
 			],
@@ -8587,7 +9118,6 @@
 					"mass": 1.3,
 					"power": 0.2,
 					"passive": 1,
-					"armourpen": "F",
 					"thermload": 2,
 					"clip": 1,
 					"ammo": 10,
@@ -8604,7 +9134,7 @@
 					"cost": 12500,
 					"mass": 1.3,
 					"power": 0.2,
-					"range": 3,
+					"range": 3000,
 					"chargeup": 4,
 					"activepower": 4,
 					"cooldown": 10
@@ -8621,7 +9151,6 @@
 					"mass": 1.3,
 					"power": 0.2,
 					"passive": 1,
-					"armourpen": "F",
 					"thermload": 0,
 					"clip": 1,
 					"ammo": 2,
@@ -8639,7 +9168,6 @@
 					"mass": 0.5,
 					"power": 0.2,
 					"passive": 1,
-					"armourpen": "F",
 					"thermload": 1,
 					"clip": 50,
 					"ammo": 10000,
@@ -8657,7 +9185,7 @@
 					"cost": 13540,
 					"mass": 1.3,
 					"power": 0.2,
-					"range": 2,
+					"range": 2000,
 					"time": 10
 				},
 				{
@@ -8670,7 +9198,7 @@
 					"cost": 40630,
 					"mass": 1.3,
 					"power": 0.4,
-					"range": 2.5,
+					"range": 2500,
 					"time": 10
 				},
 				{
@@ -8683,7 +9211,7 @@
 					"cost": 121900,
 					"mass": 1.3,
 					"power": 0.8,
-					"range": 3,
+					"range": 3000,
 					"time": 10
 				},
 				{
@@ -8696,7 +9224,7 @@
 					"cost": 365700,
 					"mass": 1.3,
 					"power": 1.6,
-					"range": 3.5,
+					"range": 3500,
 					"time": 10
 				},
 				{
@@ -8709,7 +9237,7 @@
 					"cost": 1097100,
 					"mass": 1.3,
 					"power": 3.2,
-					"range": 4,
+					"range": 4000,
 					"time": 10
 				}
 			],
@@ -8724,7 +9252,7 @@
 					"cost": 13540,
 					"mass": 1.3,
 					"power": 0.2,
-					"range": 2,
+					"range": 2000,
 					"time": 10
 				},
 				{
@@ -8737,7 +9265,7 @@
 					"cost": 40630,
 					"mass": 1.3,
 					"power": 0.4,
-					"range": 2.5,
+					"range": 2500,
 					"time": 10
 				},
 				{
@@ -8750,7 +9278,7 @@
 					"cost": 121900,
 					"mass": 1.3,
 					"power": 0.8,
-					"range": 3,
+					"range": 3000,
 					"time": 10
 				},
 				{
@@ -8763,7 +9291,7 @@
 					"cost": 365700,
 					"mass": 1.3,
 					"power": 1.6,
-					"range": 3.5,
+					"range": 3500,
 					"time": 10
 				},
 				{
@@ -8776,7 +9304,7 @@
 					"cost": 1097100,
 					"mass": 1.3,
 					"power": 3.2,
-					"range": 4,
+					"range": 4000,
 					"time": 10
 				}
 			],
@@ -9597,28 +10125,6 @@
 					"rating": "E",
 					"cost": 3829870,
 					"cargo": 256
-				},
-				{
-					"id": "c0",
-					"edID": 128681641,
-					"eddbID": 1553,
-					"grp": "cr",
-					"class": 1,
-					"rating": "E",
-					"cost": 6250,
-					"cargo": 1,
-					"name": "Corrosion Resistant"
-				},
-				{
-					"id": "c1",
-					"edID": 128681992,
-					"eddbID": 1552,
-					"grp": "cr",
-					"class": 1,
-					"rating": "F",
-					"cost": 12563,
-					"cargo": 2,
-					"name": "Corrosion Resistant"
 				}
 			],
 			"cc": [
@@ -9916,6 +10422,47 @@
 					"power": 0.39
 				}
 			],
+			"fh": [
+				{
+					"id": "fh",
+					"edID": -1,
+					"eddbID": -1,
+					"grp": "fh",
+					"class": 7,
+					"rating": "D",
+					"cost": -1,
+					"power": 0.35,
+					"mass": 60,
+					"bays": 2,
+					"rebuildsperbay": 15
+				},
+				{
+					"id": "fm",
+					"edID": -1,
+					"eddbID": -1,
+					"grp": "fh",
+					"class": 6,
+					"rating": "D",
+					"cost": -1,
+					"power": 0.35,
+					"mass": 40,
+					"bays": 2,
+					"rebuildsperbay": 8
+				},
+				{
+					"id": "fr",
+					"edID": -1,
+					"eddbID": -1,
+					"grp": "fh",
+					"class": 5,
+					"rating": "D",
+					"cost": -1,
+					"power": 0.25,
+					"mass": 20,
+					"bays": 1,
+					"rebuildsperbay": 6
+				}
+			],
 			"fi": [
 				{
 					"id": "6p",
@@ -11429,8 +11976,7 @@
 					"minmul": 2,
 					"optmul": 1.5,
 					"maxmul": 1,
-					"recover": 1.2,
-					"pp": "Aisling Duval"
+					"recover": 1.2
 				},
 				{
 					"id": "p5",
@@ -11448,8 +11994,7 @@
 					"minmul": 2,
 					"optmul": 1.5,
 					"maxmul": 1,
-					"recover": 1.2,
-					"pp": "Aisling Duval"
+					"recover": 1.2
 				},
 				{
 					"id": "p4",
@@ -11467,8 +12012,7 @@
 					"minmul": 2,
 					"optmul": 1.5,
 					"maxmul": 1,
-					"recover": 1.2,
-					"pp": "Aisling Duval"
+					"recover": 1.2
 				},
 				{
 					"id": "p3",
@@ -11486,8 +12030,7 @@
 					"minmul": 2,
 					"optmul": 1.5,
 					"maxmul": 1,
-					"recover": 1.425,
-					"pp": "Aisling Duval"
+					"recover": 1.425
 				},
 				{
 					"id": "p2",
@@ -11505,8 +12048,7 @@
 					"minmul": 2,
 					"optmul": 1.5,
 					"maxmul": 1,
-					"recover": 1.875,
-					"pp": "Aisling Duval"
+					"recover": 1.875
 				},
 				{
 					"id": "p1",
@@ -11524,8 +12066,7 @@
 					"minmul": 2,
 					"optmul": 1.5,
 					"maxmul": 1,
-					"recover": 2.4,
-					"pp": "Aisling Duval"
+					"recover": 2.4
 				},
 				{
 					"id": "p0",
@@ -11543,8 +12084,7 @@
 					"minmul": 2,
 					"optmul": 1.5,
 					"maxmul": 1,
-					"recover": 3,
-					"pp": "Aisling Duval"
+					"recover": 3
 				},
 				{
 					"id": "p7",
@@ -11562,8 +12102,7 @@
 					"minmul": 2,
 					"optmul": 1.5,
 					"maxmul": 1,
-					"recover": 3.6,
-					"pp": "Aisling Duval"
+					"recover": 3.6
 				}
 			],
 			"pc": [
@@ -11828,6 +12367,168 @@
 					"maximum": 1
 				}
 			],
+			"pce": [
+				{
+					"id": "ma",
+					"edID": -1,
+					"eddbID": -1,
+					"grp": "pce",
+					"class": 2,
+					"rating": "E",
+					"cost": -1,
+					"mass": 2.5,
+					"passengers": 2
+				},
+				{
+					"id": "mb",
+					"edID": -1,
+					"eddbID": -1,
+					"grp": "pce",
+					"class": 3,
+					"rating": "E",
+					"cost": -1,
+					"mass": 5,
+					"passengers": 4
+				},
+				{
+					"id": "mc",
+					"edID": -1,
+					"eddbID": -1,
+					"grp": "pce",
+					"class": 4,
+					"rating": "E",
+					"cost": -1,
+					"mass": 10,
+					"passengers": 8
+				},
+				{
+					"id": "md",
+					"edID": -1,
+					"eddbID": -1,
+					"grp": "pce",
+					"class": 5,
+					"rating": "E",
+					"cost": -1,
+					"mass": 20,
+					"passengers": 16
+				},
+				{
+					"id": "me",
+					"edID": -1,
+					"eddbID": -1,
+					"grp": "pce",
+					"class": 6,
+					"rating": "E",
+					"cost": -1,
+					"mass": 40,
+					"passengers": 32
+				}
+			],
+			"pci": [
+				{
+					"id": "mf",
+					"edID": -1,
+					"eddbID": -1,
+					"grp": "pci",
+					"class": 3,
+					"rating": "D",
+					"cost": -1,
+					"mass": 5,
+					"passengers": 3
+				},
+				{
+					"id": "mg",
+					"edID": -1,
+					"eddbID": -1,
+					"grp": "pci",
+					"class": 4,
+					"rating": "D",
+					"cost": -1,
+					"mass": 10,
+					"passengers": 6
+				},
+				{
+					"id": "mh",
+					"edID": -1,
+					"eddbID": -1,
+					"grp": "pci",
+					"class": 5,
+					"rating": "D",
+					"cost": -1,
+					"mass": 20,
+					"passengers": 10
+				},
+				{
+					"id": "mi",
+					"edID": -1,
+					"eddbID": -1,
+					"grp": "pci",
+					"class": 6,
+					"rating": "D",
+					"cost": -1,
+					"mass": 40,
+					"passengers": 16
+				}
+			],
+			"pcm": [
+				{
+					"id": "mj",
+					"edID": -1,
+					"eddbID": -1,
+					"grp": "pcm",
+					"class": 4,
+					"rating": "C",
+					"cost": -1,
+					"mass": 10,
+					"passengers": 3
+				},
+				{
+					"id": "mk",
+					"edID": -1,
+					"eddbID": -1,
+					"grp": "pcm",
+					"class": 5,
+					"rating": "C",
+					"cost": -1,
+					"mass": 20,
+					"passengers": 6
+				},
+				{
+					"id": "ml",
+					"edID": -1,
+					"eddbID": -1,
+					"grp": "pcm",
+					"class": 6,
+					"rating": "C",
+					"cost": -1,
+					"mass": 40,
+					"passengers": 12
+				}
+			],
+			"pcq": [
+				{
+					"id": "mm",
+					"edID": -1,
+					"eddbID": -1,
+					"grp": "pcq",
+					"class": 5,
+					"rating": "B",
+					"cost": -1,
+					"mass": 20,
+					"passengers": 4
+				},
+				{
+					"id": "mn",
+					"edID": -1,
+					"eddbID": -1,
+					"grp": "pcq",
+					"class": 6,
+					"rating": "B",
+					"cost": -1,
+					"mass": 40,
+					"passengers": 8
+				}
+			],
 			"rf": [
 				{
 					"id": "23",
@@ -13337,7 +14038,7 @@
 					"recover": 1.6
 				},
 				{
-					"id": "3w",
+					"id": "1x",
 					"edID": 128064262,
 					"eddbID": 1551,
 					"grp": "sg",
diff --git a/modules/hardpoints/beam_laser.json b/modules/hardpoints/beam_laser.json
old mode 100644
new mode 100755
index 92b056a..b063b0e
--- a/modules/hardpoints/beam_laser.json
+++ b/modules/hardpoints/beam_laser.json
@@ -1,20 +1,20 @@
 {
   "bl": [
-    { "id": "0w", "edID": 128049431, "eddbID": 1540, "grp": "bl", "class": 4, "rating": "A", "cost": 2396160, "mass": 16, "power": 2.9, "mount": "F", "type": "T", "damage": 7, "armourpen": "A", "rof": null, "dps": 41.4, "mjeps": 9.10, "thermload": 9.9 },
-    { "id": "0x", "edID": 128681994, "eddbID": 1544, "grp": "bl", "class": 4, "rating": "A", "cost": 8746160, "mass": 16, "power": 2.86, "mount": "G", "type": "T", "damage": 7, "armourpen": "A", "rof": null, "dps": 32.7, "mjeps" : 8.99, "thermload": 10.6 },
+    { "id": "0w", "edID": 128049431, "eddbID": 0, "grp": "bl", "class": 4, "rating": "A", "cost": 2396160, "mass": 16, "integrity": 80, "power": 2.9, "mount": "F", "type": "T", "armourpen": 60, "breachdps": 33.1, "breachmin": 0.4, "breachmax": 0.8, "dps": 41.4, "eps": 9.10, "hps": 9.9 },
+    { "id": "0x", "edID": 128681994, "eddbID": 0, "grp": "bl", "class": 4, "rating": "A", "cost": 8746160, "mass": 16, "integrity": 80, "power": 2.86, "mount": "G", "type": "T", "armourpen": 60, "breachdps": 26.1, "breachmin": 0.4, "breachmax": 0.8, "dps": 32.7, "eps" : 8.99, "hps": 10.6 },
 
-    { "id": "0u", "edID": 128049430, "eddbID": 843, "grp": "bl", "class": 3, "rating": "C", "cost": 1177600, "mass": 8, "power": 1.8, "mount": "F", "type": "T", "damage": 6, "armourpen": "A", "rof": null, "dps": 5, "mjdps" : 30.33, "mjeps" : 5.65, "thermload": 5 },
-    { "id": "0v", "edID": 128049434, "eddbID": 846, "grp": "bl", "class": 3, "rating": "C", "cost": 2396160, "mass": 8, "power": 1.78, "mount": "G", "type": "T", "damage": 6, "armourpen": "A", "rof": null, "dps": 4, "mjdps" : 24.00, "mjeps" : 5.59, "thermload": 6 },
-    { "id": "0o", "edID": 128049437, "eddbID": 849, "grp": "bl", "class": 3, "rating": "D", "cost": 19399600, "mass": 8, "power": 1.68, "mount": "T", "type": "T", "damage": 5, "armourpen": "A", "rof": null, "dps": 4, "mjdps" : 14.44, "mjeps" : 3.54, "thermload": 4 },
+    { "id": "0u", "edID": 128049430, "eddbID": 843, "grp": "bl", "class": 3, "rating": "C", "cost": 1177600, "mass": 8, "integrity": 64, "power": 1.8, "mount": "F", "type": "T", "armourpen": 50, "breachdps": 20.6, "breachmin": 0.4, "breachmax": 0.8, "dps": 25.8, "eps" : 5.67, "hps" : 7.2 },
+    { "id": "0v", "edID": 128049434, "eddbID": 846, "grp": "bl", "class": 3, "rating": "C", "cost": 2396160, "mass": 8, "integrity": 64, "power": 1.78, "mount": "G", "type": "T", "armourpen": 50, "breachdps": 16.2, "breachmin": 0.4, "breachmax": 0.8, "dps": 20.3, "eps" : 5.58, "hps": 7.6 },
+    { "id": "0o", "edID": 128049437, "eddbID": 849, "grp": "bl", "class": 3, "rating": "D", "cost": 19399600, "mass": 8, "integrity": 64, "power": 1.68, "mount": "T", "type": "T", "armourpen": 50, "breachdps": 11.5, "breachmin": 0.4, "breachmax": 0.8, "dps": 14.4, "eps" : 3.51, "hps" : 5.1 },
 
-    { "id": "0r", "edID": 128049429, "eddbID": 842, "grp": "bl", "class": 2, "rating": "D", "cost": 299520, "mass": 4, "power": 1.12, "mount": "F", "type": "T", "damage": 5, "armourpen": "A", "rof": null, "dps": 4, "mjdps" : 19.38, "mjeps" : 3.42, "thermload": 4 },
-    { "id": "0s", "edID": 128049433, "eddbID": 845, "grp": "bl", "class": 2, "rating": "D", "cost": 500600, "mass": 4, "power": 1.1, "mount": "G", "type": "T", "damage": 5, "armourpen": "A", "rof": null, "dps": 4, "mjdps" : 13.85, "mjeps" : 3.26, "thermload": 4 },
-    { "id": "0t", "edID": 128049436, "eddbID": 848, "grp": "bl", "class": 2, "rating": "E", "cost": 2099900, "mass": 4, "power": 1.03, "mount": "T", "type": "T", "damage": 4, "armourpen": "A", "rof": null, "dps": 3, "mjdps" : 8.95, "mjeps" : 2.10, "thermload": 3 },
+    { "id": "0r", "edID": 128049429, "eddbID": 842, "grp": "bl", "class": 2, "rating": "D", "cost": 299520, "mass": 4, "integrity": 51, "power": 1.12, "mount": "F", "type": "T", "armourpen": 35, "breachdps": 12.8, "breachmin": 0.4, "breachmax": 0.8, "dps": 16, "eps" : 3.51, "hps" : 5.1 },
+    { "id": "0s", "edID": 128049433, "eddbID": 845, "grp": "bl", "class": 2, "rating": "D", "cost": 500600, "mass": 4, "integrity": 51, "power": 1.1, "mount": "G", "type": "T", "armourpen": 35, "breachdps": 10, "breachmin": 0.4, "breachmax": 0.8, "dps": 12.5, "edps": 3.44, "hps" : 5.3 },
+    { "id": "0t", "edID": 128049436, "eddbID": 848, "grp": "bl", "class": 2, "rating": "E", "cost": 2099900, "mass": 4, "integrity": 51, "power": 1.03, "mount": "T", "type": "T", "armourpen": 35, "breachdps": 7.1, "breachmin": 0.4, "breachmax": 0.8, "dps": 8.8, "eps" : 2.16, "hps" : 3.5 },
 
-    { "id": "10", "edID": 128049428, "eddbID": 841, "grp": "bl", "class": 1, "rating": "E", "cost": 37430, "mass": 2, "power": 0.69, "mount": "F", "type": "T", "damage": 4, "armourpen": "A", "rof": null, "dps": 3, "mjdps" : 11.61, "mjeps" : 2.16, "thermload": 3 },
-    { "id": "0p", "edID": 128049432, "eddbID": 844, "grp": "bl", "class": 1, "rating": "E", "cost": 74650, "mass": 2, "power": 0.67, "mount": "G", "type": "T", "damage": 4, "armourpen": "A", "rof": null, "dps": 3, "mjdps" : 8.70, "mjeps" : 2.05, "thermload": 3 },
-    { "id": "0q", "edID": 128049435, "eddbID": 847, "grp": "bl", "class": 1, "rating": "F", "cost": 500000, "mass": 2, "power": 0.63, "mount": "T", "type": "T", "damage": 3, "armourpen": "A", "rof": null, "dps": 3, "mjdps" : 5.49, "mjeps" : 1.29, "thermload": 2 },
+    { "id": "10", "edID": 128049428, "eddbID": 841, "grp": "bl", "class": 1, "rating": "E", "cost": 37430, "mass": 2, "integrity": 40, "power": 0.69, "mount": "F", "type": "T", "armourpen": 18, "breachdps": 7.9, "breachmin": 0.4, "breachmax": 0.8, "dps": 9.8, "eps" : 2.16, "hps" : 3.5 },
+    { "id": "0p", "edID": 128049432, "eddbID": 844, "grp": "bl", "class": 1, "rating": "E", "cost": 74650, "mass": 2, "integrity": 40, "power": 0.67, "mount": "G", "type": "T", "armourpen": 18, "breachdps": 6.1, "breachmin": 0.4, "breachmax": 0.8, "dps": 7.7, "eps": 2.11, "hps": 3.7, "range": 3000 },
+    { "id": "0q", "edID": 128049435, "eddbID": 847, "grp": "bl", "class": 1, "rating": "F", "cost": 500000, "mass": 2, "integrity": 40, "power": 0.63, "mount": "T", "type": "T", "armourpen": 18, "breachdps": 4.3, "breachmin": 0.4, "breachmax": 0.8, "dps": 5.4, "eps" : 1.32, "hps" : 2.4 },
 
-    { "id": "b0", "eddbID": 1476, "grp": "bl", "name": "Retributor", "class": 1, "rating": "E", "cost": 56150, "mass": 2, "power": 0.69, "mount": "F", "type": "T", "damage": 0, "armourpen": "A", "rof": null, "dps": 3, "thermload": 1, "pp": "Edmund Mahon" }
+    { "id": "b0", "eddbID": 1476, "grp": "bl", "name": "Retributor", "class": 1, "rating": "E", "cost": 56150, "mass": 2, "power": 0.69, "mount": "F", "type": "T", "damage": 0, "armourpen": "A", "dps": 3, "thermload": 1 }
   ]
 }
diff --git a/modules/hardpoints/burst_laser.json b/modules/hardpoints/burst_laser.json
old mode 100644
new mode 100755
index 18fdd35..1f34b0b
--- a/modules/hardpoints/burst_laser.json
+++ b/modules/hardpoints/burst_laser.json
@@ -1,20 +1,20 @@
 {
   "ul": [
-    { "id": "7s", "edID": 128049403, "eddbID": 1549, "grp": "ul", "class": 4, "rating": "E", "cost": 281600, "mass": 16, "power": 2.58, "mount": "F", "type": "T", "damage": 5, "armourpen": "A", "rof": 1.6, "dps": 32.3, "mjeps" : 3.71, "ssdam" : 20.6, "thermload": 4.5 },
-    { "id": "7t", "edID": 128727920, "eddbID": 1550, "grp": "ul", "class": 4, "rating": "E", "cost": 1245600, "mass": 16, "power": 2.59, "mount": "G", "type": "T", "damage": 4, "armourpen": "A", "rof": 2.1, "dps": 25.9, "mjeps" : 2.59, "ssdam" : 12.1, "thermload": 3.3 },
+    { "id": "7s", "edID": 128049403, "eddbID": 1549, "grp": "ul", "class": 4, "rating": "E", "cost": 281600, "mass": 16, "integrity": 80, "power": 2.58, "mount": "F", "type": "T", "armourpen": 65, "breachdps": 28, "breachmin": 0.4, "breachmax": 0.8, "dps": 32.3, "eps": 5.936, "hps": 7.2, "range": 3000, "rof": 1.6, "burst": 3, "burstrof": 3 },
+    { "id": "7t", "edID": 128727920, "eddbID": 1550, "grp": "ul", "class": 4, "rating": "E", "cost": 1245600, "mass": 16, "integrity": 80, "power": 2.59, "mount": "G", "type": "T", "armourpen": 65, "breachdps": 21.63, "breachmin": 0.4, "breachmax": 0.8, "dps": 25.9, "eps" : 5.712,  "hps": 6.93, "range": 3000, "rof": 2.1, "burst": 3, "burstrof": 5 },
 
-    { "id": "14", "edID": 128049402, "eddbID": 834, "grp": "ul", "class": 3, "rating": "D", "cost": 140400, "mass": 8, "power": 1.66, "mount": "F", "type": "T", "damage": 4, "armourpen": "B", "rof": 1, "dps": 4, "mjdps" : 24.97, "mjeps" : 3.52, "ssdam" : 27.85, "thermload": 1 },
-    { "id": "15", "edID": 128049406, "eddbID": 837, "grp": "ul", "class": 3, "rating": "E", "cost": 281600, "mass": 8, "power": 1.65, "mount": "G", "type": "T", "damage": 3, "armourpen": "A", "rof": 1.2, "dps": 4, "mjdps" : 18.56, "mjeps" : 3.27, "ssdam" : 18.56, "thermload": 1 },
-    { "id": "16", "edID": 128049409, "eddbID": 840, "grp": "ul", "class": 3, "rating": "E", "cost": 800400, "mass": 8, "power": 1.57, "mount": "T", "type": "T", "damage": 3, "armourpen": "A", "rof": 0.9, "dps": 4, "mjdps" : 8.78, "mjeps" : 1.69, "ssdam" : 9.45, "thermload": 1 },
+    { "id": "14", "edID": 128049402, "eddbID": 834, "grp": "ul", "class": 3, "rating": "D", "cost": 140400, "mass": 8, "integrity": 64, "power": 1.66, "mount": "F", "type": "T", "armourpen": 52, "breachdps": 10.53, "breachmin": 0.4, "breachmax": 0.8, "dps": 20.8, "eps": 3.753, "hps": 4.59, "range": 3000, "rof": 2.7, "burst": 3, "burstrof": 7 },
+    { "id": "15", "edID": 128049406, "eddbID": 837, "grp": "ul", "class": 3, "rating": "E", "cost": 281600, "mass": 8, "integrity": 64, "power": 1.65, "mount": "G", "type": "T", "armourpen": 52, "breachdps": 14.08, "breachmin": 0.4, "breachmax": 0.8, "dps": 16.6, "eps": 3.712, "hps": 4.48, "range": 3000, "rof": 3.2, "burst": 3, "burstrof": 9 },
+    { "id": "16", "edID": 128049409, "eddbID": 840, "grp": "ul", "class": 3, "rating": "E", "cost": 800400, "mass": 8, "integrity": 64, "power": 1.57, "mount": "T", "type": "T", "armourpen": 52, "breachdps": 5.58, "breachmin": 0.4, "breachmax": 0.8, "dps": 11, "eps": 1.913, "hps": 2.48, "range": 3000, "rof": 3.1, "burst": 3, "burstrof": 11 },
 
-    { "id": "7h", "edID": 128049401, "eddbID": 833, "grp": "ul", "class": 2, "rating":"E", "cost": 23000, "mass": 4, "power":1.05, "mount":"F", "type":"T", "damage": 3, "armourpen":"A", "rof":1.3, "dps": 4, "thermload": 1 },
-    { "id": "7i", "edID": 128049405, "eddbID": 836, "grp": "ul", "class": 2, "rating":"F", "cost": 48500, "mass": 4, "power":1.04, "mount":"G", "type":"T", "damage": 3, "armourpen":"A", "rof":1.5, "dps": 4, "thermload": 1 },
-    { "id": "7j", "edID": 128049408, "eddbID": 839, "grp": "ul", "class": 2, "rating":"F", "cost": 162800, "mass": 4, "power":0.98, "mount":"T", "type":"T", "damage": 2, "armourpen":"A", "rof":1.1, "dps": 3, "thermload": 1 },
+    { "id": "7h", "edID": 128049401, "eddbID": 833, "grp": "ul", "class": 2, "rating":"E", "cost": 23000, "mass": 4, "integrity": 40, "power":1.05, "mount":"F", "type":"T", "armourpen": 35, "breachdps": 11.1, "breachmin": 0.4, "breachmax": 0.8, "dps": 13, "eps": 2.331, "hps": 2.96, "range": 3000, "rof": 3.7, "burst": 3, "burstrof": 11 },
+    { "id": "7i", "edID": 128049405, "eddbID": 836, "grp": "ul", "class": 2, "rating":"F", "cost": 48500, "mass": 4, "integrity": 40, "power":1.04, "mount":"G", "type":"T", "armourpen": 35, "breachdps": 8.82, "breachmin": 0.4, "breachmax": 0.8, "dps": 10.3, "eps": 2.31, "hps": 2.94, "range": 3000, "rof": 4.2, "burst": 3, "burstrof": 13 },
+    { "id": "7j", "edID": 128049408, "eddbID": 839, "grp": "ul", "class": 2, "rating":"F", "cost": 162800, "mass": 4, "integrity": 40, "power":0.98, "mount":"T", "type":"T", "armourpen": 35, "breachdps": 3.51, "breachmin": 0.4, "breachmax": 0.8, "dps": 6.8, "eps": 1.209, "hps": 1.56, "range": 3000, "rof": 3.9, "burst": 3, "burstrof": 15 },
 
-    { "id": "11", "edID": 128049400, "eddbID": 832, "grp": "ul", "class": 1, "rating": "F", "cost": 4400, "mass": 2, "power": 0.65, "mount": "F", "type": "T", "damage": 2, "armourpen": "A", "rof": 1.6, "dps": 3, "mjdps" : 9.94, "mjeps" : 1.40, "ssdam" : 6.45, "thermload": 1 },
-    { "id": "12", "edID": 128049404, "eddbID": 835, "grp": "ul", "class": 1, "rating": "G", "cost": 8600, "mass": 2, "power": 0.64, "mount": "G", "type": "T", "damage": 2, "armourpen": "A", "rof": 1.7, "dps": 3, "mjdps" : 7.95, "mjeps" : 1.40, "ssdam" : 4.53, "thermload": 1 },
-    { "id": "13", "edID": 128049407, "eddbID": 838, "grp": "ul", "class": 1, "rating": "G", "cost": 52800, "mass": 2, "power": 0.6, "mount": "T", "type": "T", "damage": 1, "armourpen": "B", "rof": 1.3, "dps": 2, "mjdps" : 2.98, "mjeps" : 0.63, "ssdam" : 2.24, "thermload": 1 },
+    { "id": "11", "edID": 128049400, "eddbID": 832, "grp": "ul", "class": 1, "rating": "F", "cost": 4400, "mass": 2, "integrity": 40, "power": 0.65, "mount": "F", "type": "T", "armourpen": 20, "breachdps": 7.05, "breachmin": 0.4, "breachmax": 0.8, "dps": 8.1, "eps": 1.457, "hps": 1.88, "range": 3000, "rof": 4.7, "burst": 3, "burstrof": 15 },
+    { "id": "12", "edID": 128049404, "eddbID": 835, "grp": "ul", "class": 1, "rating": "G", "cost": 8600, "mass": 2, "integrity": 40, "power": 0.64, "mount": "G", "type": "T", "armourpen": 20, "breachdps": 5.3, "breachmin": 0.4, "breachmax": 0.8, "dps":6.4, "eps": 1.4, "hps": 1.6, "range": 3000, "rof": 5.3, "burst": 3, "burstrof": 17 },
+    { "id": "13", "edID": 128049407, "eddbID": 838, "grp": "ul", "class": 1, "rating": "G", "cost": 52800, "mass": 2, "integrity": 40, "power": 0.6, "mount": "T", "type": "T", "armourpen": 20, "breachdps": 1.92, "breachmin": 0.4, "breachmax": 0.8, "dps": 4.2, "eps": 0.768, "hps": 0.96, "range": 3000, "rof": 4.8, "burst": 3, "burstrof": 19 },
 
-    { "id": "cy", "edID": 128671449, "eddbID": 1477, "grp": "ul", "name": "Cytoscrambler", "class": 1, "rating": "F", "cost": 8800, "mass": 2, "power": 0.65, "mount": "F", "type": "T", "damage": 2, "armourpen": "A", "rof": 1.6, "dps": 3, "thermload": 1, "pp": "Archon Delaine" }
+    { "id": "cy", "edID": 128671449, "eddbID": 1477, "grp": "ul", "name": "Cytoscrambler", "class": 1, "rating": "F", "cost": 8800, "mass": 2, "power": 0.65, "mount": "F", "type": "T", "damage": 2, "armourpen": "A", "rof": 1.6, "dps": 3, "thermload": 1 }
   ]
 }
diff --git a/modules/hardpoints/cannon.json b/modules/hardpoints/cannon.json
old mode 100644
new mode 100755
index d827bbb..511f68c
--- a/modules/hardpoints/cannon.json
+++ b/modules/hardpoints/cannon.json
@@ -1,18 +1,18 @@
 {
   "c": [
-    { "id": "1q", "edID": 128049441, "eddbID": 853, "grp": "c", "class": 4, "rating": "B", "cost": 2700800, "mass": 16, "power": 0.92, "mount": "F", "type": "K", "damage": 9, "armourpen": "A", "rof": 0.4, "dps": 5, "thermload": 2, "clip": 5, "mjdps": 8.13, "ssdam" : 37.13, "ammo": 100, "ammocost": 20 },
-    { "id": "1r", "edID": 128049444, "eddbID": 856, "grp": "c", "class": 4, "rating": "B", "cost": 5401600, "mass": 16, "power": 1.03, "mount": "G", "type": "K", "damage": 8, "armourpen": "A", "rof": 0.4, "dps": 4, "thermload": 2, "clip": 5, "mjdps": 10.97, "ssdam" : 30.94, "ammo": 100, "ammocost": 20 },
+    { "id": "1q", "edID": 128049441, "eddbID": 853, "grp": "c", "class": 4, "rating": "B", "cost": 2700800, "mass": 16, "integrity": 80, "power": 0.92, "mount": "F", "type": "K", "armourpen": 90, "breachdps": 25.28, "breachmin": 0.6, "breachmax": 0.8, "dps": 25.3, "eps": 0.644, "hps": 1.92, "range": 4500, "rof": 0.4, "clip": 5, "ammo": 100, "speed": 900, "reload": 5 },
+    { "id": "1r", "edID": 128049444, "eddbID": 856, "grp": "c", "class": 4, "rating": "B", "cost": 5401600, "mass": 16, "integrity": 80, "power": 1.03, "mount": "G", "type": "K", "armourpen": 90, "breachdps": 16.92, "breachmin": 0.6, "breachmax": 0.8, "dps": 19.7, "eps": 0.688, "hps": 1.76, "range": 4500, "rof": 0.4, "clip": 5, "ammo": 100, "speed": 750, "reload": 4 },
 
-    { "id": "1n", "edID": 128049440, "eddbID": 852, "grp": "c", "class": 3, "rating": "C", "cost": 675200, "mass": 8, "power": 0.67, "mount": "F", "type": "K", "damage": 7, "armourpen": "A", "rof": 0.4, "dps": 4, "thermload": 2, "clip": 5, "mjdps": 8.13, "ssdam" : 22.28, "ammo": 100, "ammocost": 20 },
-    { "id": "1o", "edID": 128671120, "eddbID": 1383, "grp": "c", "class": 3, "rating": "C", "cost": 1350400, "mass": 8, "power": 0.75, "mount": "G", "type": "K", "damage": 7, "armourpen": "A", "rof": 0.4, "dps": 4, "thermload": 1, "clip": 5, "mjdps" : 7.95, "ssdam" : 21.04, "ammo": 100, "ammocost": 20 },
-    { "id": "1p", "edID": 128049447, "eddbID": 859, "grp": "c", "class": 3, "rating": "D", "cost": 16204800, "mass": 8, "power": 0.64, "mount": "T", "type": "K", "damage": 6, "armourpen": "A", "rof": 0.3, "dps": 4, "thermload": 1, "clip": 5, "mjdps" : 3.58, "ssdam" : 12.38, "ammo": 100, "ammocost": 20 },
+    { "id": "1n", "edID": 128049440, "eddbID": 852, "grp": "c", "class": 3, "rating": "C", "cost": 675200, "mass": 8, "integrity": 64, "power": 0.67, "mount": "F", "type": "K", "armourpen": 90, "breachdps": 16.92, "breachmin": 0.6, "breachmax": 0.8, "dps": 18.7, "eps": 0.428, "hps": 1.28, "range": 4000, "rof": 0.4, "clip": 5, "ammo": 100, "speed": 959, "reload": 4 },
+    { "id": "1o", "edID": 128671120, "eddbID": 1383, "grp": "c", "class": 3, "rating": "C", "cost": 1350400, "mass": 8, "integrity": 64, "power": 0.75, "mount": "G", "type": "K", "armourpen": 90, "breachdps": 30.9, "breachmin": 0.6, "breachmax": 0.8, "dps": 14.3, "eps": 0.456, "hps": 1.16, "range": 4000, "rof": 0.4, "clip": 5, "ammo": 100, "speed": 800, "reload": 4 },
+    { "id": "1p", "edID": 128049447, "eddbID": 859, "grp": "c", "class": 3, "rating": "D", "cost": 16204800, "mass": 8, "integrity": 64, "power": 0.64, "mount": "T", "type": "K", "armourpen": 90, "breachdps": 10.04, "breachmin": 0.6, "breachmax": 0.8, "dps": 9.7, "eps": 0.212, "hps": 0.64, "range": 4000, "rof": 0.4, "clip": 5, "ammo": 100, "speed": 800, "reload": 4 },
 
-    { "id": "1k", "edID": 128049439, "eddbID": 851, "grp": "c", "class": 2, "rating": "D", "cost": 168430, "mass": 4, "power": 0.49, "mount": "F", "type": "K", "damage": 6, "armourpen": "A", "rof": 0.5, "dps": 4, "thermload": 1, "clip": 5, "mjdps" : 6.00, "ssdam" : 15.47, "ammo": 100, "ammocost": 20 },
-    { "id": "1l", "edID": 128049443, "eddbID": 855, "grp": "c", "class": 2, "rating": "D", "cost": 337600, "mass": 4, "power": 0.54, "mount": "G", "type": "K", "damage": 6, "armourpen": "A", "rof": 0.5, "dps": 3, "thermload": 1, "clip": 5, "mjdps" : 6.24, "ssdam" : 15.47, "ammo": 100, "ammocost": 20 },
-    { "id": "1m", "edID": 128049446, "eddbID": 858, "grp": "c", "class": 2, "rating": "E", "cost": 4051200, "mass": 4, "power": 0.45, "mount": "T", "type": "K", "damage": 5, "armourpen": "A", "rof": 0.3, "dps": 3, "thermload": 1, "clip": 5, "mjdps" : 2.41, "ssdam" : 7.74, "ammo": 100, "ammocost": 20 },
+    { "id": "1k", "edID": 128049439, "eddbID": 851, "grp": "c", "class": 2, "rating": "D", "cost": 168430, "mass": 4, "integrity": 51, "power": 0.49, "mount": "F", "type": "K", "armourpen": 90, "breachdps": 14, "breachmin": 0.6, "breachmax": 0.8, "dps": 13.6, "eps": 0.35, "hps": 1.05, "range": 3500, "rof": 0.5, "clip": 5, "ammo": 100, "speed": 1051, "reload": 4 },
+    { "id": "1l", "edID": 128049443, "eddbID": 855, "grp": "c", "class": 2, "rating": "D", "cost": 337600, "mass": 4, "integrity": 51, "power": 0.54, "mount": "G", "type": "K", "armourpen": 90, "breachdps": 101.5, "breachmin": 0.6, "breachmax": 0.8, "dps": 10.3, "eps": 0.375, "hps": 0.95, "range": 3500, "rof": 0.5, "clip": 5, "ammo": 100, "speed": 875, "reload": 4 },
+    { "id": "1m", "edID": 128049446, "eddbID": 858, "grp": "c", "class": 2, "rating": "E", "cost": 4051200, "mass": 4, "integrity": 51, "power": 0.45, "mount": "T", "type": "K", "armourpen": 90, "breachdps": 6.52, "breachmin": 0.6, "breachmax": 0.8, "dps": 6.9, "eps": 0.136, "hps": 0.4, "range": 3500, "rof": 0.4, "clip": 5, "ammo": 100, "speed": 875, "reload": 4 },
 
-    { "id": "1h", "edID": 128049438, "eddbID": 850, "grp": "c", "class": 1, "rating": "D", "cost": 21100, "mass": 2, "power": 0.34, "mount": "F", "type": "K", "damage": 5, "armourpen": "A", "rof": 0.5, "dps": 3, "thermload": 1, "clip": 5, "mjdps" : 4.00, "ssdam" : 9.59, "ammo": 100, "ammocost": 20 },
-    { "id": "1i", "edID": 128049442, "eddbID": 854, "grp": "c", "class": 1, "rating": "E", "cost": 42200, "mass": 2, "power": 0.38, "mount": "G", "type": "K", "damage": 5, "armourpen": "A", "rof": 0.5, "dps": 3, "thermload": 1, "clip": 5, "mjdps" : 3.80, "ssdam" : 8.97, "ammo": 100, "ammocost": 20 },
-    { "id": "1j", "edID": 128049445, "eddbID": 857, "grp": "c", "class": 1, "rating": "F", "cost": 506400, "mass": 2, "power": 0.32, "mount": "T", "type": "K", "damage": 4, "armourpen": "A", "rof": 0.4, "dps": 3, "thermload": 1, "clip": 5, "mjdps" : 1.35, "ssdam" : 4.13, "ammo": 100, "ammocost": 20 }
+    { "id": "1h", "edID": 128049438, "eddbID": 850, "grp": "c", "class": 1, "rating": "D", "cost": 21100, "mass": 2, "integrity": 40, "power": 0.34, "mount": "F", "type": "K", "armourpen": 90, "breachdps": 8.55, "breachmin": 0.6, "breachmax": 0.8, "dps": 9, "eps": 0.23, "hps": 0.7, "range": 3000, "rof": 0.5, "clip": 5, "ammo": 100, "speed": 1200, "reload": 4 },
+    { "id": "1i", "edID": 128049442, "eddbID": 854, "grp": "c", "class": 1, "rating": "E", "cost": 42200, "mass": 2, "integrity": 40, "power": 0.38, "mount": "G", "type": "K", "armourpen": 35, "breachdps": 6.6, "breachmin": 0.6, "breachmax": 0.9, "dps": 7.2, "eps": 0.24, "hps": 0.65, "range": 3000, "rof": 0.5, "clip": 5, "ammo": 100, "speed": 1000, "reload": 4 },
+    { "id": "1j", "edID": 128049445, "eddbID": 857, "grp": "c", "class": 1, "rating": "F", "cost": 506400, "mass": 2, "integrity": 40, "power": 0.32, "mount": "T", "type": "K", "armourpen": 90, "breachdps": 4.24, "breachmin": 0.6, "breachmax": 0.8, "dps": 4.8, "eps": 0.088, "hps": 0.28, "range": 3000, "rof": 0.4, "clip": 5, "ammo": 100, "speed": 1000, "reload": 4 }
   ]
 }
diff --git a/modules/hardpoints/cargo_scanner.json b/modules/hardpoints/cargo_scanner.json
old mode 100644
new mode 100755
index e41701c..3d6e570
--- a/modules/hardpoints/cargo_scanner.json
+++ b/modules/hardpoints/cargo_scanner.json
@@ -1,9 +1,9 @@
 {
   "cs": [
-    { "id": "0d", "edID": 128662520, "eddbID": 1227, "grp": "cs", "class": 0, "rating": "E", "cost": 13540, "mass": 1.3, "power": 0.2, "range": 2, "time": 10 },
-    { "id": "0c", "edID": 128662521, "eddbID": 1228, "grp": "cs", "class": 0, "rating": "D", "cost": 40630, "mass": 1.3, "power": 0.4, "range": 2.5, "time": 10 },
-    { "id": "0b", "edID": 128662522, "eddbID": 1229, "grp": "cs", "class": 0, "rating": "C", "cost": 121900, "mass": 1.3, "power": 0.8, "range": 3, "time": 10 },
-    { "id": "0a", "edID": 128662523, "eddbID": 1230, "grp": "cs", "class": 0, "rating": "B", "cost": 365700, "mass": 1.3, "power": 1.6, "range": 3.5, "time": 10 },
-    { "id": "09", "edID": 128662524, "eddbID": 1231, "grp": "cs", "class": 0, "rating": "A", "cost": 1097100, "mass": 1.3, "power": 3.2, "range": 4, "time": 10 }
+    { "id": "0d", "edID": 128662520, "eddbID": 1227, "grp": "cs", "class": 0, "rating": "E", "cost": 13540, "mass": 1.3, "power": 0.2, "range": 2000, "time": 10 },
+    { "id": "0c", "edID": 128662521, "eddbID": 1228, "grp": "cs", "class": 0, "rating": "D", "cost": 40630, "mass": 1.3, "power": 0.4, "range": 2500, "time": 10 },
+    { "id": "0b", "edID": 128662522, "eddbID": 1229, "grp": "cs", "class": 0, "rating": "C", "cost": 121900, "mass": 1.3, "power": 0.8, "range": 3000, "time": 10 },
+    { "id": "0a", "edID": 128662523, "eddbID": 1230, "grp": "cs", "class": 0, "rating": "B", "cost": 365700, "mass": 1.3, "power": 1.6, "range": 3500, "time": 10 },
+    { "id": "09", "edID": 128662524, "eddbID": 1231, "grp": "cs", "class": 0, "rating": "A", "cost": 1097100, "mass": 1.3, "power": 3.2, "range": 4000, "time": 10 }
   ]
-}
\ No newline at end of file
+}
diff --git a/modules/hardpoints/countermeasures.json b/modules/hardpoints/countermeasures.json
old mode 100644
new mode 100755
index 233c877..47e4f69
--- a/modules/hardpoints/countermeasures.json
+++ b/modules/hardpoints/countermeasures.json
@@ -1,8 +1,8 @@
 {
   "cm": [
-    { "id": "00", "edID": 128049513, "eddbID": 884, "grp": "cm", "name": "Chaff Launcher", "class": 0, "rating": "I", "cost": 8500, "mass": 1.3, "power": 0.2, "passive": 1, "armourpen": "F", "thermload": 2, "clip": 1, "ammo": 10, "ammocost": 30 },
-    { "id": "01", "edID": 128049516, "eddbID": 885, "grp": "cm", "name": "Electronic Countermeasure", "class": 0, "rating": "F", "cost": 12500, "mass": 1.3, "power": 0.2, "range": 3, "chargeup": 4, "activepower": 4, "cooldown": 10 },
-    { "id": "02", "edID": 128049519, "eddbID": 886, "grp": "cm", "name": "Heat Sink Launcher", "class": 0, "rating": "I", "cost": 3500, "mass": 1.3, "power": 0.2, "passive": 1, "armourpen": "F", "thermload": 0, "clip": 1, "ammo": 2, "ammocost": 25 },
-    { "id": "03", "edID": 128049522, "eddbID": 887, "grp": "cm", "name": "Point Defence", "class": 0, "rating": "I", "cost": 18550, "mass": 0.5, "power": 0.2, "passive": 1, "armourpen": "F", "thermload": 1, "clip": 50, "ammo": 10000, "ammocost": 1 }
+    { "id": "00", "edID": 128049513, "eddbID": 884, "grp": "cm", "name": "Chaff Launcher", "class": 0, "rating": "I", "cost": 8500, "mass": 1.3, "power": 0.2, "passive": 1, "thermload": 2, "clip": 1, "ammo": 10, "ammocost": 30 },
+    { "id": "01", "edID": 128049516, "eddbID": 885, "grp": "cm", "name": "Electronic Countermeasure", "class": 0, "rating": "F", "cost": 12500, "mass": 1.3, "power": 0.2, "range": 3000, "chargeup": 4, "activepower": 4, "cooldown": 10 },
+    { "id": "02", "edID": 128049519, "eddbID": 886, "grp": "cm", "name": "Heat Sink Launcher", "class": 0, "rating": "I", "cost": 3500, "mass": 1.3, "power": 0.2, "passive": 1, "thermload": 0, "clip": 1, "ammo": 2, "ammocost": 25 },
+    { "id": "03", "edID": 128049522, "eddbID": 887, "grp": "cm", "name": "Point Defence", "class": 0, "rating": "I", "cost": 18550, "mass": 0.5, "power": 0.2, "passive": 1, "thermload": 1, "clip": 50, "ammo": 10000, "ammocost": 1 }
   ]
 }
diff --git a/modules/hardpoints/fragment_cannon.json b/modules/hardpoints/fragment_cannon.json
old mode 100644
new mode 100755
index 2f643f8..ea371e0
--- a/modules/hardpoints/fragment_cannon.json
+++ b/modules/hardpoints/fragment_cannon.json
@@ -1,17 +1,17 @@
 {
   "fc": [
-    { "id": "1t", "edID": 128049450, "eddbID": 862, "grp": "fc", "class": 3, "rating": "C", "cost": 1167360, "mass": 8, "power": 1.02, "mount": "F", "type": "K", "damage": 3, "armourpen": "A", "rof": 4.5, "dps": 10, "thermload": 1, "clip": 3, "mjdps": 15.19, "ssdam" : 28.36, "ammo": 90, "ammocost": 50 },
-    { "id": "1u", "edID": 128671321, "eddbID": 1454, "grp": "fc", "class": 3, "rating": "C", "cost": 1751040, "mass": 8, "power": 1.55, "mount": "G", "type": "K", "damage": 3, "armourpen": "A", "rof": 4.8, "dps": 10, "thermload": 1, "clip": 3, "mjdps" : 12.77, "ssdam" : 23.21, "ammo": 90, "ammocost": 50 },
-    { "id": "1v", "edID": 128671322, "eddbID": 1455, "grp": "fc", "class": 3, "rating": "C", "cost": 5836800, "mass": 8, "power": 1.29, "mount": "T", "type": "K", "damage": 2, "armourpen": "A", "rof": 3.3, "dps": 9, "thermload": 1, "clip": 3, "mjdps" : 6.85, "ssdam" : 12.89, "ammo": 90, "ammocost": 50 },
+    { "id": "1t", "edID": 128049450, "eddbID": 862, "grp": "fc", "class": 3, "rating": "C", "cost": 1167360, "mass": 8, "integrity": 80, "power": 1.02, "mount": "F", "type": "K", "armourpen": 52, "rof": 4.5, "breachdps": 189, "breachmin": 0.4, "breachmax": 0.8, "dps": 113.8, "eps": 30.78, "hps": 59.4, "range": 2000, "clip": 3, "ammo": 90, "speed": 667, "reload": 5, "roundspershot": 12, "jitter": 0.5 },
+    { "id": "1u", "edID": 128671321, "eddbID": 1454, "grp": "fc", "class": 3, "rating": "C", "cost": 1751040, "mass": 8, "integrity": 80, "power": 1.55, "mount": "G", "type": "K", "armourpen": 52, "rof": 4.8, "breachdps": 167.04, "breachmin": 0.4, "breachmax": 0.8, "dps": 184.6, "eps": 46.66, "hps": 80.64, "range": 2000, "clip": 3, "ammo": 90, "speed": 667, "reload": 5, "roundspershot": 12, "jitter": 0.5 },
+    { "id": "1v", "edID": 128671322, "eddbID": 1455, "grp": "fc", "class": 3, "rating": "C", "cost": 5836800, "mass": 8, "integrity": 80, "power": 1.29, "mount": "T", "type": "K", "armourpen": 52, "rof": 4.0, "breachdps": 110.4, "breachmin": 0.4, "breachmax": 0.8, "dps": 122.9, "eps": 17.76, "hps": 33.6, "range": 2000, "clip": 3, "ammo": 90, "speed": 667, "reload": 5, "roundspershot": 12, "jitter": 0.5 },
 
-    { "id": "1s", "edID": 128049449, "eddbID": 861, "grp": "fc", "class": 2, "rating": "A", "cost": 291840, "mass": 4, "power": 0.74, "mount": "F", "type": "K", "damage": 3, "armourpen": "A", "rof": 5, "dps": 9, "thermload": 1, "clip": 3, "mjdps" : 9.50, "ssdam" : 18.05, "ammo": 90, "ammocost": 50 },
-    { "id": "7e", "edID": 128049452, "eddbID": 864, "grp": "fc", "class": 2, "rating": "D", "cost": 437800, "mass": 4, "power": 1.03, "mount": "G", "type": "K", "damage": 2, "armourpen": "A", "rof": 5.3, "dps": 9, "thermload": 1, "clip": 3, "ammo": 90, "ammocost": 50 },
-    { "id": "7f", "edID": 128049454, "eddbID": 866, "grp": "fc", "class": 2, "rating": "D", "cost": 1459200, "mass": 4, "power": 0.79, "mount": "T", "type": "K", "damage": 2, "armourpen": "A", "rof": 3.7, "dps": 9, "thermload": 1, "clip": 3, "ammo": 90, "ammocost": 50 },
+    { "id": "1s", "edID": 128049449, "eddbID": 861, "grp": "fc", "class": 2, "rating": "A", "cost": 291840, "mass": 4, "integrity": 80, "power": 0.74, "mount": "F", "type": "K", "armourpen": 35, "rof": 5, "breachdps": 138, "breachmin": 0.4, "breachmax": 0.8, "dps": 122.9, "eps": 22.2, "hps": 42, "range": 2000, "clip": 3, "ammo": 90, "speed": 667, "reload": 5, "roundspershot": 12, "jitter": 0.5 },
+    { "id": "7e", "edID": 128049452, "eddbID": 864, "grp": "fc", "class": 2, "rating": "D", "cost": 437800, "mass": 4, "integrity": 80, "power": 1.03, "mount": "G", "type": "K", "armourpen": 35, "rof": 5.3, "breachdps": 114.48, "breachmin": 0.4, "breachmax": 0.8, "dps": 153.6, "eps": 31.6, "hps": 50.88, "range": 2000, "clip": 3, "ammo": 90, "speed": 667, "reload": 5, "roundspershot": 12, "jitter": 0.5 },
+    { "id": "7f", "edID": 128049454, "eddbID": 866, "grp": "fc", "class": 2, "rating": "D", "cost": 1459200, "mass": 4, "integrity": 80, "power": 0.79, "mount": "T", "type": "K", "armourpen": 35, "rof": 3.7, "breachdps": 67.08, "breachmin": 0.4, "breachmax": 0.8, "dps": 123.2, "eps": 10.84, "hps": 20.64, "range": 2000, "clip": 3, "ammo": 90, "speed": 667, "reload": 5, "roundspershot": 12, "jitter": 0.5 },
 
-    { "id": "20", "edID": 128049448, "eddbID": 860, "grp": "fc", "class": 1, "rating": "E", "cost": 36000, "mass": 2, "power": 0.45, "mount": "F", "type": "K", "damage": 2, "armourpen": "A", "rof": 5.5, "dps": 8, "thermload": 1, "clip": 3, "mjdps" : 5.53, "ssdam" : 10.31, "ammo": 90, "ammocost": 50 },
-    { "id": "21", "edID": 128049451, "eddbID": 863, "grp": "fc", "class": 1, "rating": "E", "cost": 54720, "mass": 2, "power": 0.59, "mount": "G", "type": "K", "damage": 2, "armourpen": "A", "rof": 5.8, "dps": 7, "thermload": 1, "clip": 3, "mjdps" : 3.58, "ssdam" : 6.45, "ammo": 90, "ammocost": 50 },
-    { "id": "22", "edID": 128049453, "eddbID": 865, "grp": "fc", "class": 1, "rating": "E", "cost": 182400, "mass": 2, "power": 0.42, "mount": "T", "type": "K", "damage": 1, "armourpen": "A", "rof": 4, "dps": 6, "thermload": 1, "clip": 3, "mjdps" : 2.11, "ssdam" : 3.87, "ammo": 90, "ammocost": 50 },
+    { "id": "20", "edID": 128049448, "eddbID": 860, "grp": "fc", "class": 1, "rating": "E", "cost": 36000, "mass": 2, "integrity": 40, "power": 0.45, "mount": "F", "type": "K", "armourpen": 20, "breachdps": 87.36, "breachmin": 0.4, "breachmax": 0.8, "dps": 95.3, "eps": 14.112, "hps": 26.88, "range": 2000, "rof": 5.6, "clip": 3, "ammo": 90, "speed": 667, "reload": 5, "roundspershot": 12, "jitter": 0.5 },
+    { "id": "21", "edID": 128049451, "eddbID": 863, "grp": "fc", "class": 1, "rating": "E", "cost": 54720, "mass": 2, "integrity": 40, "power": 0.59, "mount": "G", "type": "K", "armourpen": 20, "breachdps": 63.4, "breachmin": 0.4, "breachmax": 0.8, "dps": 71.3, "eps": 18.408, "hps": 28.32, "range": 2000, "rof": 5.9, "clip": 3, "ammo": 90, "speed": 667, "reload": 5, "roundspershot": 12, "jitter": 0.5 },
+    { "id": "22", "edID": 128049453, "eddbID": 865, "grp": "fc", "class": 1, "rating": "E", "cost": 182400, "mass": 2, "integrity": 40, "power": 0.42, "mount": "T", "type": "K", "armourpen": 20, "breachdps": 34.56, "breachmin": 0.4, "breachmax": 0.8, "dps": 39.4, "eps": 6.72, "hps": 13.44, "range": 2000, "rof": 4.8, "clip": 3, "ammo": 90, "speed": 667, "reload": 5, "roundspershot": 12, "jitter": 0.5 },
 
-    { "id": "pa", "edID": 128671343, "eddbID": 1478, "grp": "fc", "name": "Pacifier", "class": 3, "rating": "C", "cost": 1400830, "mass": 8, "power": 1.02, "mount": "F", "type": "K", "damage": 3, "armourpen": "A", "rof": 4.5, "dps": 9, "thermload": 1, "clip": 3, "ammo": 90, "pp": "Zachary Hudson" }
+    { "id": "pa", "edID": 128671343, "eddbID": 1478, "grp": "fc", "name": "Pacifier", "class": 3, "rating": "C", "cost": 1400830, "mass": 8, "power": 1.02, "mount": "F", "type": "K", "damage": 3, "armourpen": "A", "rof": 4.5, "dps": 9, "thermload": 1, "clip": 3, "ammo": 90 }
   ]
 }
diff --git a/modules/hardpoints/frame_shift_wake_scanner.json b/modules/hardpoints/frame_shift_wake_scanner.json
old mode 100644
new mode 100755
index c897ea5..74ecf94
--- a/modules/hardpoints/frame_shift_wake_scanner.json
+++ b/modules/hardpoints/frame_shift_wake_scanner.json
@@ -1,9 +1,9 @@
 {
   "ws": [
-    { "id": "0i", "edID": 128662525, "eddbID": 1232, "grp": "ws", "class": 0, "rating": "E", "cost": 13540, "mass": 1.3, "power": 0.2, "range": 2, "time": 10 },
-    { "id": "0h", "edID": 128662526, "eddbID": 1233, "grp": "ws", "class": 0, "rating": "D", "cost": 40630, "mass": 1.3, "power": 0.4, "range": 2.5, "time": 10 },
-    { "id": "0g", "edID": 128662527, "eddbID": 1234, "grp": "ws", "class": 0, "rating": "C", "cost": 121900, "mass": 1.3, "power": 0.8, "range": 3, "time": 10 },
-    { "id": "0f", "edID": 128662528, "eddbID": 1235, "grp": "ws", "class": 0, "rating": "B", "cost": 365700, "mass": 1.3, "power": 1.6, "range": 3.5, "time": 10 },
-    { "id": "0e", "edID": 128662529, "eddbID": 1236, "grp": "ws", "class": 0, "rating": "A", "cost": 1097100, "mass": 1.3, "power": 3.2, "range": 4, "time": 10 }
+    { "id": "0i", "edID": 128662525, "eddbID": 1232, "grp": "ws", "class": 0, "rating": "E", "cost": 13540, "mass": 1.3, "power": 0.2, "range": 2000, "time": 10 },
+    { "id": "0h", "edID": 128662526, "eddbID": 1233, "grp": "ws", "class": 0, "rating": "D", "cost": 40630, "mass": 1.3, "power": 0.4, "range": 2500, "time": 10 },
+    { "id": "0g", "edID": 128662527, "eddbID": 1234, "grp": "ws", "class": 0, "rating": "C", "cost": 121900, "mass": 1.3, "power": 0.8, "range": 3000, "time": 10 },
+    { "id": "0f", "edID": 128662528, "eddbID": 1235, "grp": "ws", "class": 0, "rating": "B", "cost": 365700, "mass": 1.3, "power": 1.6, "range": 3500, "time": 10 },
+    { "id": "0e", "edID": 128662529, "eddbID": 1236, "grp": "ws", "class": 0, "rating": "A", "cost": 1097100, "mass": 1.3, "power": 3.2, "range": 4000, "time": 10 }
   ]
-}
\ No newline at end of file
+}
diff --git a/modules/hardpoints/kill_warrant_scanner.json b/modules/hardpoints/kill_warrant_scanner.json
old mode 100644
new mode 100755
index 8e9a12f..d50f70e
--- a/modules/hardpoints/kill_warrant_scanner.json
+++ b/modules/hardpoints/kill_warrant_scanner.json
@@ -1,9 +1,9 @@
 {
   "kw": [
-    { "id": "0n", "edID": 128662530, "eddbID": 1237, "grp": "kw", "class": 0, "rating": "E", "cost": 13540, "mass": 1.3, "power": 0.2, "range": 2, "time": 10 },
-    { "id": "0m", "edID": 128662531, "eddbID": 1238, "grp": "kw", "class": 0, "rating": "D", "cost": 40630, "mass": 1.3, "power": 0.4, "range": 2.5, "time": 10 },
-    { "id": "0l", "edID": 128662532, "eddbID": 1239, "grp": "kw", "class": 0, "rating": "C", "cost": 121900, "mass": 1.3, "power": 0.8, "range": 3, "time": 10 },
-    { "id": "0k", "edID": 128662533, "eddbID": 1240, "grp": "kw", "class": 0, "rating": "B", "cost": 365700, "mass": 1.3, "power": 1.6, "range": 3.5, "time": 10 },
-    { "id": "0j", "edID": 128662534, "eddbID": 1241, "grp": "kw", "class": 0, "rating": "A", "cost": 1097100, "mass": 1.3, "power": 3.2, "range": 4, "time": 10 }
+    { "id": "0n", "edID": 128662530, "eddbID": 1237, "grp": "kw", "class": 0, "rating": "E", "cost": 13540, "mass": 1.3, "power": 0.2, "range": 2000, "time": 10 },
+    { "id": "0m", "edID": 128662531, "eddbID": 1238, "grp": "kw", "class": 0, "rating": "D", "cost": 40630, "mass": 1.3, "power": 0.4, "range": 2500, "time": 10 },
+    { "id": "0l", "edID": 128662532, "eddbID": 1239, "grp": "kw", "class": 0, "rating": "C", "cost": 121900, "mass": 1.3, "power": 0.8, "range": 3000, "time": 10 },
+    { "id": "0k", "edID": 128662533, "eddbID": 1240, "grp": "kw", "class": 0, "rating": "B", "cost": 365700, "mass": 1.3, "power": 1.6, "range": 3500, "time": 10 },
+    { "id": "0j", "edID": 128662534, "eddbID": 1241, "grp": "kw", "class": 0, "rating": "A", "cost": 1097100, "mass": 1.3, "power": 3.2, "range": 4000, "time": 10 }
   ]
-}
\ No newline at end of file
+}
diff --git a/modules/hardpoints/mine_launcher.json b/modules/hardpoints/mine_launcher.json
old mode 100644
new mode 100755
index 5047493..39eb0d8
--- a/modules/hardpoints/mine_launcher.json
+++ b/modules/hardpoints/mine_launcher.json
@@ -1,7 +1,7 @@
 {
   "nl": [
-    { "id": "2j", "edID": 128049500, "eddbID": 880, "grp": "nl", "class": 1, "rating": "I", "cost": 24260, "mass": 2, "power": 0.4, "mount": "F", "type": "E", "armourpen": "C", "thermload": 2, "clip": 1, "ammo": 24, "ammocost": 209 },
-    { "id": "2k", "edID": 128049501, "eddbID": 881, "grp": "nl", "class": 2, "rating": "I", "cost": 294080, "mass": 4, "power": 0.4, "mount": "F", "type": "E", "armourpen": "C", "thermload": 3, "clip": 3, "ammo": 24, "ammocost": 209 },
-    { "id": "kp", "edID": 128671448, "eddbID": 1523, "grp": "nl", "name":"Shock Mine Launcher", "class": 1, "rating": "I", "cost": 36400, "mass": 2, "power": 0.4, "mount": "F", "type": "E", "armourpen": "C", "thermload": 2, "clip": 1, "ammo": 24, "ammocost": 209 }
+    { "id": "2j", "edID": 128049500, "eddbID": 880, "grp": "nl", "class": 1, "rating": "I", "cost": 24260, "mass": 2, "integrity": 40, "power": 0.4, "mount": "F", "type": "ET", "armourpen": 60, "breachdps": 0, "breachmin": 0, "breachmax": 0, "dps": 44, "hps": 5, "rof": 1, "clip": 3, "ammo": 36, "reload": 2 },
+    { "id": "2k", "edID": 128049501, "eddbID": 881, "grp": "nl", "class": 2, "rating": "I", "cost": 294080, "mass": 4, "integrity": 51, "power": 0.4, "mount": "F", "type": "ET", "armourpen": 60, "breachdps": 0, "breachmin": 0, "breachmax": 0, "dps": 44, "hps": 7.5, "rof": 1, "clip": 3, "ammo": 36, "reload": 2 },
+    { "id": "kp", "edID": 128671448, "eddbID": 1523, "grp": "nl", "name":"Shock Mine Launcher", "class": 1, "rating": "I", "cost": 36400, "mass": 2, "integrity": 40, "power": 0.4, "mount": "F", "type": "ET", "armourpen": "C", "breachdps": 0, "breachmin": 0, "breachmax": 0, "dps": 32, "hps": 5, "rof": 1, "clip": 3, "ammo": 36, "reload": 2 }
   ]
 }
diff --git a/modules/hardpoints/mining_laser.json b/modules/hardpoints/mining_laser.json
old mode 100644
new mode 100755
index a27320f..06f140d
--- a/modules/hardpoints/mining_laser.json
+++ b/modules/hardpoints/mining_laser.json
@@ -1,7 +1,7 @@
 {
   "ml": [
-    { "id": "2l", "edID": 128049525, "eddbID": 888, "grp": "ml", "class": 1, "rating": "D", "cost": 6800, "mass": 2, "power": 0.5, "mount": "F", "armourpen": "D", "thermload": 3 },
-    { "id": "2m", "edID": 128049526, "eddbID": 889, "grp": "ml", "class": 2, "rating": "D", "cost": 22580, "mass": 2, "power": 0.75, "mount": "F", "armourpen": "D", "thermload": 5 },
-    { "id": "ml", "eddbID": 1479, "grp": "ml", "name": "Mining Lance", "class": 1, "rating": "D", "cost": 13600, "mass": 2, "power": 0.7, "mount": "F", "type": "T", "damage": 3, "dps": 3, "armourpen": "D", "thermload": 3, "pp": "Zemina Torval" }
+    { "id": "2l", "edID": 128049525, "eddbID": 888, "grp": "ml", "class": 1, "rating": "D", "cost": 6800, "mass": 2, "integrity": 40, "power": 0.5, "mount": "F", "armourpen": 18, "breachdps": 0.3, "breachmin": 0.1, "breachmax": 0.2, "dps": 2, "eps": 1.5, "hps": 2 },
+    { "id": "2m", "edID": 128049526, "eddbID": 889, "grp": "ml", "class": 2, "rating": "D", "cost": 22580, "mass": 2, "integrity": 51, "power": 0.75, "mount": "F", "armourpen": 18, "breachdps": 0.6, "breachmin": 0.1, "breachmax": 0.2, "dps": 4, "eps": 3, "hps": 4 },
+    { "id": "ml", "eddbID": 1479, "grp": "ml", "name": "Mining Lance", "class": 1, "rating": "D", "cost": 13600, "mass": 2, "power": 0.7, "mount": "F", "type": "T", "damage": 3, "dps": 3, "armourpen": "D", "thermload": 3 }
   ]
 }
diff --git a/modules/hardpoints/missile_rack.json b/modules/hardpoints/missile_rack.json
old mode 100644
new mode 100755
index dabc7d6..31b93f4
--- a/modules/hardpoints/missile_rack.json
+++ b/modules/hardpoints/missile_rack.json
@@ -1,9 +1,13 @@
 {
   "mr": [
-    { "id": "2f", "edID": 128666725, "eddbID": 1327, "grp": "mr", "class": 2, "rating": "B", "cost": 240400, "mass": 4, "power": 1.2, "mount": "F", "type": "E", "damage": 7, "armourpen": "F", "rof": 2.5, "dps": 8, "thermload": 3, "clip": 12, "ammo": 24, "mjdps": 1.72, "ssdam" : 3.87, "missile": "D", "ammocost": 500 },
-    { "id": "2g", "edID": 128049493, "eddbID": 879, "grp": "mr", "class": 2, "rating": "B", "cost": 512400, "mass": 4, "power": 1.2, "mount": "F", "type": "E", "damage": 6, "armourpen": "F", "rof": 0.3, "dps": 3, "thermload": 3, "clip": 6, "ammo": 18, "mjdps": 0.57, "ssdam" : 2.58, "missile": "S", "ammocost": 666.67 },
-    { "id": "2d", "edID": 128666724, "eddbID": 1326, "grp": "mr", "class": 1, "rating": "B", "cost": 32180, "mass": 2, "power": 0.4, "mount": "F", "type": "E", "damage": 7, "armourpen": "F", "rof": 2.5, "dps": 8, "thermload": 3, "clip": 8, "ammo": 16, "mjdps": 1.63, "ssdam" : 3.87, "missile": "D", "ammocost": 500 },
-    { "id": "2e", "edID": 128049492, "eddbID": 878, "grp": "mr", "class": 1, "rating": "B", "cost": 72600, "mass": 2, "power": 0.6, "mount": "F", "type": "E", "damage": 6, "armourpen": "F", "rof": 0.3, "dps": 3, "thermload": 3, "clip": 6, "ammo": 6, "mjdps": 0.57, "ssdam" : 2.58, "missile": "S", "ammocost": 666.67 },
-    { "id": "Ph", "edID": 128671344, "eddbID": 1480, "grp": "mr", "name": "Pack-Hound", "class": 2, "rating": "B", "cost": 768600, "mass": 4, "power": 1.2, "mount": "F", "type": "E", "damage": 3, "armourpen": "F", "rof": 0.5, "dps": 4, "thermload": 3, "clip": 12, "ammo": 120, "missile": "S", "pp": "Li Yong-Rui" }
+    { "id": "1z", "edID": 0, "eddbID": 0, "grp": "mr", "name": "Rocket Propelled FSD Disruptor", "class": 2, "rating": "B", "cost": 190227, "mass": 4, "power": 1.2, "mount": "F", "type": "?", "damage": 50, "armourpen": "?", "rof": 0.5, "dps": 0, "thermload": 0, "clip": 12, "ammo": 48, "mjdps": 0, "ssdam": 0, "missile": "D", "ammocost": 0 },
+
+    { "id": "2f", "edID": 128666725, "eddbID": 1327, "grp": "mr", "class": 2, "rating": "B", "cost": 240400, "mass": 4, "integrity": 51, "power": 1.2, "mount": "F", "type": "E", "armourpen": 60, "breachdps": 0, "breachmin": 0, "breachmax": 0, "dps": 25, "eps": 0.12, "hps": 1.8, "clip": 12, "ammo": 48, "speed": 750, "reload": 5, "roundspershot": 1, "missile": "D" },
+    { "id": "2g", "edID": 128049493, "eddbID": 879, "grp": "mr", "class": 2, "rating": "B", "cost": 512400, "mass": 4, "integrity": 51, "power": 1.2, "mount": "F", "type": "E", "armourpen": 60, "breachdps": 0, "breachmin": 0, "breachmax": 0, "dps": 13.3, "eps": 0.07, "hps": 1.08, "clip": 6, "ammo": 18, "speed": 625, "reload": 12, "roundspershot": 1, "missile": "S" },
+
+    { "id": "2d", "edID": 128666724, "eddbID": 1326, "grp": "mr", "class": 1, "rating": "B", "cost": 32180, "mass": 2, "integrity": 40, "power": 0.4, "mount": "F", "type": "E", "armourpen": 60, "breachdps": 0, "breachmin": 0, "breachmax": 0, "dps": 25, "eps": 0.12, "hps": 1.8, "rof": 0.5, "clip": 8, "ammo": 16, "speed": 750, "reload": 5, "roundspershot": 1, "missile": "D" },
+    { "id": "2e", "edID": 128049492, "eddbID": 878, "grp": "mr", "class": 1, "rating": "B", "cost": 72600, "mass": 2, "integrity": 40, "power": 0.6, "mount": "F", "type": "E", "armourpen": 60, "breachdps": 0, "breachmin": 0, "breachmax": 0, "dps": 13.3, "eps": 0.07, "hps": 1.08, "rof": 0.3, "clip": 6, "ammo": 6, "speed": 625, "reload": 12, "roundspershot": 1, "missile": "S" },
+
+    { "id": "Ph", "edID": 128671344, "eddbID": 1480, "grp": "mr", "name": "Pack-Hound", "class": 2, "rating": "B", "cost": 768600, "mass": 4, "power": 1.2, "mount": "F", "type": "E", "damage": 3, "armourpen": "F", "rof": 0.5, "dps": 4, "thermload": 3, "clip": 12, "ammo": 120, "missile": "S" }
   ]
 }
diff --git a/modules/hardpoints/multi_cannon.json b/modules/hardpoints/multi_cannon.json
old mode 100644
new mode 100755
index 0521a82..2ecd4be
--- a/modules/hardpoints/multi_cannon.json
+++ b/modules/hardpoints/multi_cannon.json
@@ -1,19 +1,19 @@
 {
   "mc": [
-    { "id": "7n", "edID": 128049458, "eddbID": 1542, "grp": "mc", "class": 4, "rating": "A", "cost": 1177600, "mass": 16, "power": 0.73, "mount": "F", "type": "K", "damage": 4, "armourpen": "A", "rof": 3.0, "dps": 24.5, "mjeps": 0.72, "thermload": 0.4, "clip": 90, "ssdam" : 4.0, "ammo": 2100, "ammocost": 1 },
-    { "id": "7o", "edID": 128681996, "eddbID": 1546, "grp": "mc", "class": 4, "rating": "A", "cost": 6377600, "mass": 16, "power": 1.22, "mount": "G", "type": "K", "damage": 4, "armourpen": "A", "rof": 3.4, "dps": 23.3, "mjeps": 1.258, "thermload": 0.5, "clip": 90, "ssdam" : 3.5 , "ammo": 2100, "ammocost": 1 },
+    { "id": "7n", "edID": 128049458, "eddbID": 0, "grp": "mc", "class": 4, "rating": "A", "cost": 1177600, "mass": 16, "integrity": 80, "power": 0.73, "mount": "F", "type": "K", "armourpen": 68, "breachdps": 25.2, "breachmin": 0.4, "breachmax": 0.8, "dps": 28, "eps": 1.44, "hps": 2.4, "range": 4000, "rof": 3, "clip": 90, "ammo": 2100, "speed": 1600, "reload": 4, "roundspershot": 2 },
+    { "id": "7o", "edID": 128681996, "eddbID": 0, "grp": "mc", "class": 4, "rating": "A", "cost": 6377600, "mass": 16, "integrity": 80, "power": 1.22, "mount": "G", "type": "K", "armourpen": 68, "breachdps": 21.08, "breachmin": 0.4, "breachmax": 0.8, "dps": 23.3, "eps": 2.516, "hps": 3.4, "range": 4000, "rof": 3.4, "clip": 90, "ammo": 2100, "speed": 1600, "reload": 4, "roundspershot": 2 },
 
-    { "id": "7k", "edID": 128049457, "eddbID": 1541, "grp": "mc", "class": 3, "rating": "C", "cost": 140400, "mass": 8, "power": 0.64, "mount": "F", "type": "K", "damage": 3, "armourpen": "A", "rof": 5.9, "dps": 20.8, "mjeps": 1.062, "thermload": 0.3, "clip": 90, "ssdam" : 3.5, "ammo": 2100, "ammocost": 1 },
-    { "id": "7l", "edID": 128049461, "eddbID": 1543, "grp": "mc", "class": 3, "rating": "C", "cost": 578436, "mass": 8, "power": 0.97, "mount": "G", "type": "K", "damage": 3, "armourpen": "A", "rof": 6.7, "dps": 18.9, "mjeps": 1.675, "thermload": 0.3, "clip": 90, "ssdam" : 2.8, "ammo": 2100, "ammocost": 1 },
+    { "id": "7k", "edID": 128049457, "eddbID": 0, "grp": "mc", "class": 3, "rating": "C", "cost": 140400, "mass": 8, "integrity": 64, "power": 0.64, "mount": "F", "type": "K", "armourpen": 54, "breachdps": 20.65, "breachmin": 0.4, "breachmax": 0.8, "dps": 23.1, "eps": 1.062, "hps": 1.77, "range": 4000, "rof": 5.9, "clip": 90, "ammo": 2100, "speed": 1600, "reload": 4, "roundspershot": 1 },
+    { "id": "7l", "edID": 128049461, "eddbID": 0, "grp": "mc", "class": 3, "rating": "C", "cost": 578436, "mass": 8, "integrity": 64, "power": 0.97, "mount": "G", "type": "K", "armourpen": 54, "breachdps": 17.42, "breachmin": 0.4, "breachmax": 0.8, "dps": 18.9, "eps": 1.675, "hps": 2.01, "range": 4000, "rof": 6.7, "clip": 90, "ammo": 2100, "speed": 1600, "reload": 4, "roundspershot": 1 },
 
-    { "id": "26", "edID": 128049456, "eddbID": 868, "grp": "mc", "class": 2, "rating": "E", "cost": 38000, "mass": 4, "power": 0.46, "mount": "F", "type": "K", "damage": 2, "armourpen": "A", "rof": 7, "dps": 4, "thermload": 1, "clip": 90, "mjdps" : 6.02, "ssdam" : 1.20, "ammo": 2100, "ammocost": 1 },
-    { "id": "27", "edID": 128049460, "eddbID": 870, "grp": "mc", "class": 2, "rating": "F", "cost": 57000, "mass": 4, "power": 0.64, "mount": "G", "type": "K", "damage": 2, "armourpen": "A", "rof": 7.5, "dps": 4, "thermload": 1, "clip": 90, "mjdps" : 5.59, "ssdam" : 1.03, "ammo": 2100, "ammocost": 1 },
-    { "id": "28", "edID": 128049463, "eddbID": 872, "grp": "mc", "class": 2, "rating": "F", "cost": 1292800, "mass": 4, "power": 0.5, "mount": "T", "type": "K", "damage": 2, "armourpen": "A", "rof": 5.3, "dps": 3, "thermload": 1, "clip": 90, "mjdps" : 2.15, "ssdam" : 0.52, "ammo": 2100, "ammocost": 1 },
+    { "id": "26", "edID": 128049456, "eddbID": 868, "grp": "mc", "class": 2, "rating": "E", "cost": 38000, "mass": 4, "integrity": 51, "power": 0.46, "mount": "F", "type": "K", "armourpen": 37, "breachdps": 14.2, "breachmin": 0.4, "breachmax": 0.8, "dps": 15.6, "eps": 0.781, "hps": 1.42, "range": 4000, "rof": 7.1, "clip": 90, "ammo": 2100, "speed": 1600, "reload": 4, "roundspershot": 1 },
+    { "id": "27", "edID": 128049460, "eddbID": 870, "grp": "mc", "class": 2, "rating": "F", "cost": 57000, "mass": 4, "integrity": 51, "power": 0.64, "mount": "G", "type": "K", "armourpen": 37, "breachdps": 11.55, "breachmin": 0.4, "breachmax": 0.8, "dps": 12.6, "eps": 1.078, "hps": 1.54, "range": 4000, "rof": 7.7, "clip": 90, "ammo": 2100, "speed": 1600, "reload": 4, "roundspershot": 1 },
+    { "id": "28", "edID": 128049463, "eddbID": 872, "grp": "mc", "class": 2, "rating": "F", "cost": 1292800, "mass": 4, "integrity": 51, "power": 0.5, "mount": "T", "type": "K", "armourpen": 37, "breachdps": 6.82, "breachmin": 0.4, "breachmax": 0.8, "dps": 7.3, "eps": 0.372, "hps": 0.62, "range": 4000, "rof": 6.2, "clip": 90, "ammo": 2100, "speed": 1600, "reload": 4, "roundspershot": 1 },
 
-    { "id": "23", "edID": 128049455, "eddbID": 867, "grp": "mc", "class": 1, "rating": "F", "cost": 9500, "mass": 2, "power": 0.28, "mount": "F", "type": "K", "damage": 2, "armourpen": "A", "rof": 8, "dps": 3, "thermload": 1, "clip": 90, "mjdps" : 3.75, "ssdam" : 0.69, "ammo": 2100, "ammocost": 1 },
-    { "id": "24", "edID": 128049459, "eddbID": 869, "grp": "mc", "class": 1, "rating": "G", "cost": 14250, "mass": 2, "power": 0.37, "mount": "G", "type": "K", "damage": 2, "armourpen": "A", "rof": 8.5, "dps": 3, "thermload": 1, "clip": 90, "mjdps" : 2.03, "ssdam" : 0.34, "ammo": 2100, "ammocost": 1 },
-    { "id": "25", "edID": 128049462, "eddbID": 871, "grp": "mc", "class": 1, "rating": "G", "cost": 81600, "mass": 2, "power": 0.26, "mount": "T", "type": "K", "damage": 0, "armourpen": "A", "rof": 6, "dps": 2, "thermload": 1, "clip": 90, "mjdps" : 1.54, "ssdam" : 0.34, "ammo": 2100, "ammocost": 1 },
+    { "id": "23", "edID": 128049455, "eddbID": 867, "grp": "mc", "class": 1, "rating": "F", "cost": 9500, "mass": 2, "integrity": 40, "power": 0.28, "mount": "F", "type": "K", "armourpen": 22, "breachdps": 7.7, "breachmin": 0.4, "breachmax": 0.8, "dps": 8.6, "eps": 0.462, "hps": 0.77, "range": 4000, "rof": 7.7, "clip": 90, "ammo": 2100, "speed": 1600, "reload": 4, "roundspershot": 1 },
+    { "id": "24", "edID": 128049459, "eddbID": 869, "grp": "mc", "class": 1, "rating": "G", "cost": 14250, "mass": 2, "integrity": 40, "power": 0.37, "mount": "G", "type": "K", "armourpen": 22, "breachdps": 5.8, "breachmin": 0.4, "breachmax": 0.8, "dps": 6.8, "eps": 0.58, "hps": 0.83, "range": 4000, "rof": 8.3, "clip": 90, "ammo": 2100, "speed": 1600, "reload": 4, "roundspershot": 1 },
+    { "id": "25", "edID": 128049462, "eddbID": 871, "grp": "mc", "class": 1, "rating": "G", "cost": 81600, "mass": 2, "integrity": 40, "power": 0.26, "mount": "T", "type": "K", "armourpen": 22, "breachdps": 3.55, "breachmin": 0.4, "breachmax": 0.8, "dps": 4, "eps": 0.213, "hps": 0.00, "range": 4000, "rof": 7.1, "clip": 90, "ammo": 2100, "speed": 1600, "reload": 4, "roundspershot": 1 },
 
-    { "id": "e0", "eddbID": 1481, "grp": "mc", "name": "Enforcer", "class": 1, "rating": "F", "cost": 13980, "mass": 2, "power": 0.28, "mount": "F", "type": "K", "damage": 4, "armourpen": "A", "rof": 4.3, "dps": 4, "thermload": 1, "clip": 60, "ammo": 1000, "pp": "Pranav Antal" }
+    { "id": "e0", "eddbID": 1481, "grp": "mc", "name": "Enforcer", "class": 1, "rating": "F", "cost": 13980, "mass": 2, "power": 0.28, "mount": "F", "type": "K", "damage": 4, "armourpen": "A", "rof": 4.3, "dps": 4, "thermload": 1, "clip": 60, "ammo": 1000 }
   ]
 }
diff --git a/modules/hardpoints/plasma_accelerator.json b/modules/hardpoints/plasma_accelerator.json
old mode 100644
new mode 100755
index e36e5f2..0941073
--- a/modules/hardpoints/plasma_accelerator.json
+++ b/modules/hardpoints/plasma_accelerator.json
@@ -1,8 +1,9 @@
 {
   "pa": [
-    { "id": "1g", "edID": 128049465, "eddbID": 873, "grp": "pa", "class": 2, "rating": "C", "cost": 834200, "mass": 4, "power": 1.43, "mount": "F", "type": "T", "damage": 7, "armourpen": "A", "rof": 0.3, "dps": 4, "thermload": 10, "clip": 5, "mjdps" : 6.89, "ssdam" : 27.85, "ammo": 100, "ammocost": 200 },
-    { "id": "2b", "edID": 128049466, "eddbID": 874, "grp": "pa", "class": 3, "rating": "B", "cost": 3051200, "mass": 8, "power": 1.97, "mount": "F", "type": "TK", "damage": 9, "armourpen": "A", "rof": 0.3, "dps": 4, "thermload": 8, "clip": 5, "mjdps" : 20.98, "ssdam" : 92.82, "ammo": 100, "ammocost": 200 },
-    { "id": "2c", "edID": 128049467, "eddbID": 875, "grp": "pa", "class": 4, "rating": "A", "cost": 13793600, "mass": 16, "power": 2.63, "mount": "F", "type": "TK", "damage": 10, "armourpen": "A", "rof": 0.3, "dps": 5, "thermload": 10, "clip": 5, "mjdps" : 25.55, "ssdam" : 123.76, "ammo": 100, "ammocost": 200 },
-    { "id": "Ap", "edID": 128671339, "eddbID": 1482, "grp": "pa", "name": "Advanced Plasma Accelerator", "class": 3, "rating": "B", "cost": 4119120, "mass": 8, "power": 1.97, "mount": "F", "type": "TK", "damage": 8, "armourpen": "A", "rof": 1.67, "dps": 4, "thermload": 4, "clip": 20, "ammo": 300, "ammocost": 67, "pp": "Denton Patreus" }
+    { "id": "2c", "edID": 128049467, "eddbID": 875, "grp": "pa", "class": 4, "rating": "A", "cost": 13793600, "mass": 16, "integrity": 80, "power": 2.63, "mount": "F", "type": "KT", "armourpen": 85, "breachdps": 30.62, "breachmin": 0.4, "breachmax": 0.8, "dps": 30, "eps": 6.312, "hps": 8.85, "range": 3500, "rof": 0.3, "clip": 5, "ammo": 100, "reload": 8, "speed": 875, "roundspershot": 1 },
+    { "id": "2b", "edID": 128049466, "eddbID": 874, "grp": "pa", "class": 3, "rating": "B", "cost": 3051200, "mass": 8, "integrity": 64, "power": 1.97, "mount": "F", "type": "KT", "armourpen": 70, "breachdps": 20.4, "breachmin": 0.4, "breachmax": 0.8, "dps": 23.2, "eps": 4.08, "hps": 6.54, "range": 3500, "rof": 0.3, "clip": 5, "ammo": 100, "reload": 8, "speed": 875, "roundspershot": 1 },
+    { "id": "1g", "edID": 128049465, "eddbID": 873, "grp": "pa", "class": 2, "rating": "C", "cost": 834200, "mass": 4, "integrity": 51, "power": 1.43, "mount": "F", "type": "KT", "armourpen": 55, "breachdps": 13.26, "breachmin": 0.4, "breachmax": 0.8, "dps": 17.2, "eps": 2.595, "hps": 4.68, "range": 3500, "rof": 0.3, "clip": 5, "ammo": 100, "reload": 8, "speed": 875, "roundspershot": 1 },
+
+    { "id": "Ap", "edID": 128671339, "eddbID": 1482, "grp": "pa", "name": "Advanced Plasma Accelerator", "class": 3, "rating": "B", "cost": 4119120, "mass": 8, "power": 1.97, "mount": "F", "type": "KT", "damage": 8, "armourpen": "A", "rof": 1.67, "dps": 4, "thermload": 4, "clip": 20, "ammo": 300, "ammocost": 67 }
   ]
 }
diff --git a/modules/hardpoints/pulse_laser.json b/modules/hardpoints/pulse_laser.json
old mode 100644
new mode 100755
index 043deb1..357893b
--- a/modules/hardpoints/pulse_laser.json
+++ b/modules/hardpoints/pulse_laser.json
@@ -1,20 +1,20 @@
 {
   "pl": [
-    { "id": "7q", "edID": 128049384, "eddbID": 1539, "grp": "pl", "class": 4, "rating": "A", "cost": 177600, "mass": 16, "power": 1.33, "mount": "F", "type": "T", "damage": 5, "armourpen": "A", "rof": 2.6, "dps": 26.9, "mjeps": 4.264, "ssdam": 10.2 , "thermload": 1.6 },
-    { "id": "7r", "edID": 128681995, "eddbID": 1545, "grp": "pl", "class": 4, "rating": "A", "cost": 877600, "mass": 16, "power": 1.37, "mount": "G", "type": "T", "damage": 5, "armourpen": "A", "rof": 2.8, "dps": 21.7, "mjeps": 4.368, "ssdam" : 7.8, "thermload": 1.6 },
+    { "id": "7q", "edID": 128049384, "eddbID": 1539, "grp": "pl", "class": 4, "rating": "A", "cost": 177600, "mass": 16, "integrity": 80, "power": 1.33, "mount": "F", "type": "T", "armourpen": 65, "breachdps": 22.62, "breachmin": 0.4, "breachmax": 0.8, "dps": 26.9, "eps": 4.264, "hps": 4.16, "range": 3000, "rof": 2.6 },
+    { "id": "7r", "edID": 128681995, "eddbID": 1545, "grp": "pl", "class": 4, "rating": "A", "cost": 877600, "mass": 16, "integrity": 80, "power": 1.37, "mount": "G", "type": "T", "armourpen": 65, "breachdps": 18.48, "breachmin": 0.4, "breachmax": 0.8, "dps": 21.7, "eps": 4.368, "hps": 4.48, "range": 3000, "rof": 2.8 },
 
-    { "id": "1d", "edID": 128049383, "eddbID": 825, "grp": "pl", "class": 3, "rating": "D", "cost": 70400, "mass": 8, "power": 0.9, "mount": "F", "type": "T", "damage": 4, "armourpen": "A", "rof": 3, "dps": 4, "mjdps" : 21.62, "mjeps" : 2.86, "ssdam" : 7.07, "thermload": 1 },
-    { "id": "1e", "edID": 128049387, "eddbID": 828, "grp": "pl", "class": 3, "rating": "E", "cost": 140600, "mass": 8, "power": 0.92, "mount": "G", "type": "T", "damage": 3, "armourpen": "A", "rof": 3.2, "dps": 4, "mjdps" : 18.28, "mjeps" : 2.98, "ssdam" : 5.59, "thermload": 1 },
-    { "id": "1f", "edID": 128049390, "eddbID": 831, "grp": "pl", "class": 3, "rating": "F", "cost": 400400, "mass": 8, "power": 0.89, "mount": "T", "type": "T", "damage": 3, "armourpen": "A", "rof": 2.3, "dps": 3, "mjdps" : 7.05, "mjeps" : 1.24, "ssdam" : 3.15, "thermload": 1 },
+    { "id": "1d", "edID": 128049383, "eddbID": 825, "grp": "pl", "class": 3, "rating": "D", "cost": 70400, "mass": 8, "integrity": 64, "power": 0.9, "mount": "F", "type": "T", "armourpen": 52, "breachdps": 15.3, "breachmin": 0.4, "breachmax": 0.8, "dps": 18.1, "eps": 2.88, "hps": 3, "range": 3000, "rof": 3 },
+    { "id": "1e", "edID": 128049387, "eddbID": 828, "grp": "pl", "class": 3, "rating": "E", "cost": 140600, "mass": 8, "integrity": 64, "power": 0.92, "mount": "G", "type": "T", "armourpen": 52, "breachdps": 12.48, "breachmin": 0.4, "breachmax": 0.8, "dps": 14.8, "eps": 2.944, "hps": 2.88, "range": 3000, "rof": 3.2 },
+    { "id": "1f", "edID": 128049390, "eddbID": 831, "grp": "pl", "class": 3, "rating": "F", "cost": 400400, "mass": 8, "integrity": 64, "power": 0.89, "mount": "T", "type": "T", "armourpen": 52, "breachdps": 8.1, "breachmin": 0.4, "breachmax": 0.8, "dps": 9.5, "eps": 1.512, "hps": 1.62, "range": 3000, "rof": 2.7 },
 
-    { "id": "1a", "edID": 128049382, "eddbID": 824, "grp": "pl", "class": 2, "rating": "E", "cost": 17600, "mass": 4, "power": 0.6, "mount": "F", "type": "T", "damage": 3, "armourpen": "A", "rof": 3.4, "dps": 3, "mjdps" : 14.29, "mjeps" : 1.89, "ssdam" : 4.20, "thermload": 1 },
-    { "id": "1b", "edID": 128049386, "eddbID": 827, "grp": "pl", "class": 2, "rating": "F", "cost": 35400, "mass": 4, "power": 0.6, "mount": "G", "type": "T", "damage": 3, "armourpen": "A", "rof": 3.6, "dps": 3, "mjdps" : 11.62, "mjeps" : 1.89, "ssdam" : 3.24, "thermload": 1 },
-    { "id": "1c", "edID": 128049389, "eddbID": 830, "grp": "pl", "class": 2, "rating": "F", "cost": 132800, "mass": 4, "power": 0.58, "mount": "T", "type": "T", "damage": 2, "armourpen": "A", "rof": 2.5, "dps": 3, "mjdps" : 4.72, "mjeps" : 0.83, "ssdam" : 1.86, "thermload": 1 },
+    { "id": "1a", "edID": 128049382, "eddbID": 824, "grp": "pl", "class": 2, "rating": "F", "cost": 17600, "mass": 4, "integrity": 51, "power": 0.6, "mount": "F", "type": "T", "armourpen": 35, "breachdps": 10.2, "breachmin": 0.4, "breachmax": 0.8, "dps": 12.10, "eps": 1.904, "hps": 2.04, "range": 3000, "rof": 3.4 },
+    { "id": "1b", "edID": 128049386, "eddbID": 827, "grp": "pl", "class": 2, "rating": "F", "cost": 35400, "mass": 4, "integrity": 51, "power": 0.6, "mount": "G", "type": "T", "armourpen": 35, "breachdps": 8.28, "breachmin": 0.4, "breachmax": 0.8, "dps": 9.6, "eps": 1.944, "hps": 1.8, "range": 3000, "rof": 3.6 },
+    { "id": "1c", "edID": 128049389, "eddbID": 830, "grp": "pl", "class": 2, "rating": "F", "cost": 132800, "mass": 4, "integrity": 51, "power": 0.58, "mount": "T", "type": "T", "armourpen": 35, "breachdps": 5.1, "breachmin": 0.4, "breachmax": 0.8, "dps": 6.2, "eps": 1, "hps": 0.9, "range": 3000, "rof": 3.0 },
 
-    { "id": "17", "edID": 128049381, "eddbID": 823, "grp": "pl", "class": 1, "rating": "F", "cost": 2200, "mass": 2, "power": 0.39, "mount": "F", "type": "T", "damage": 2, "armourpen": "A", "rof": 3.8, "dps": 3, "mjdps" : 9.35, "mjeps" : 1.24, "ssdam" : 2.48, "thermload": 1 },
-    { "id": "18", "edID": 128049385, "eddbID": 826, "grp": "pl", "class": 1, "rating": "G", "cost": 6600, "mass": 2, "power": 0.39, "mount": "G", "type": "T", "damage": 2, "armourpen": "A", "rof": 4, "dps": 3, "mjdps" : 7.30, "mjeps" : 1.19, "ssdam" : 1.88, "thermload": 1 },
-    { "id": "19", "edID": 128049388, "eddbID": 829, "grp": "pl", "class": 1, "rating": "G", "cost": 26000, "mass": 2, "power": 0.38, "mount": "T", "type": "T", "damage": 2, "armourpen": "A", "rof": 2.8, "dps": 2, "mjdps" : 2.90, "mjeps" : 0.51, "ssdam" : 1.07, "thermload": 1 },
+    { "id": "17", "edID": 128049381, "eddbID": 823, "grp": "pl", "class": 1, "rating": "F", "cost": 2200, "mass": 2, "integrity": 40, "power": 0.39, "mount": "F", "type": "T", "armourpen": 20, "breachdps": 6.46, "breachmin": 0.4, "breachmax": 0.8, "dps": 7.9, "eps": 1.254, "hps": 1.14, "range": 3000, "rof": 3.8 },
+    { "id": "18", "edID": 128049385, "eddbID": 826, "grp": "pl", "class": 1, "rating": "G", "cost": 6600, "mass": 2, "integrity": 40, "power": 0.39, "mount": "G", "type": "T", "armourpen": 20, "breachdps": 5.2, "breachmin": 0.4, "breachmax": 0.8, "dps": 6.2, "eps": 1.24, "hps": 1.2, "range": 3000, "rof": 4 },
+    { "id": "19", "edID": 128049388, "eddbID": 829, "grp": "pl", "class": 1, "rating": "G", "cost": 26000, "mass": 2, "integrity": 40, "power": 0.38, "mount": "T", "type": "T", "armourpen": 20, "breachdps": 3.3, "breachmin": 0.4, "breachmax": 0.8, "dps": 4, "eps": 0.627, "hps": 6.6, "range": 3000, "rof": 3.3 },
 
-    { "id": "PL", "eddbID": 1483, "grp": "pl", "name": "Disruptor", "class": 2, "rating": "E", "cost": 26400, "mass": 4, "power": 0.7, "mount": "F", "type": "T", "damage": 2, "armourpen": "A", "rof": 1.6, "dps": 2, "thermload": 1, "pp": "Felicia Winters" }
+    { "id": "PL", "eddbID": 1483, "grp": "pl", "name": "Disruptor", "class": 2, "rating": "E", "cost": 26400, "mass": 4, "power": 0.7, "mount": "F", "type": "T", "damage": 2, "armourpen": "A", "rof": 1.6, "dps": 2, "thermload": 1 }
   ]
 }
diff --git a/modules/hardpoints/rail_gun.json b/modules/hardpoints/rail_gun.json
old mode 100644
new mode 100755
index 3581e0f..4d20955
--- a/modules/hardpoints/rail_gun.json
+++ b/modules/hardpoints/rail_gun.json
@@ -1,7 +1,7 @@
 {
   "rg": [
-    { "id": "29", "edID": 128049488, "eddbID": 876, "grp": "rg", "class": 1, "rating": "D", "cost": 51600, "mass": 2, "power": 1.15, "mount": "F", "type": "TK", "damage": 6, "armourpen": "A", "rof": 0.6, "dps": 4, "thermload": 7, "clip": 1, "mjdps" : 13.75, "ssdam" : 24.75, "ammo": 30, "ammocost": 200 },
-    { "id": "2a", "edID": 128049489, "eddbID": 877, "grp": "rg", "class": 2, "rating": "B", "cost": 412800, "mass": 4, "power": 1.63, "mount": "F", "type": "TK", "damage": 7, "armourpen": "A", "rof": 0.5, "dps": 4, "thermload": 10, "clip": 1, "mjdps" : 21.66, "ssdam" : 43.32, "ammo": 30, "ammocost": 200 },
-    { "id": "ih", "edID": 128671341, "eddbID": 1484, "grp": "rg", "name": "Imperial Hammer", "class": 2, "rating": "B", "cost": 619200, "mass": 4, "power": 1.63, "mount": "F", "type": "TK", "damage": 5, "armourpen": "A", "rof": 0.6, "dps": 5, "thermload": 3, "clip": 3, "ammo": 90, "pp": "Arissa Lavigny-Duval" }
+    { "id": "29", "edID": 128049488, "eddbID": 876, "grp": "rg", "class": 1, "rating": "D", "cost": 51600, "mass": 2, "integrity": 40, "power": 1.15, "mount": "F", "type": "KT", "armourpen": 30, "breachdps": 35.2, "breachmin": 0.4, "breachmax": 0.8, "dps": 37, "eps": 4.3, "hps": 28.48, "range": 3000, "rof": 1.6, "clip": 1, "ammo": 30, "reload": 1 },
+    { "id": "2a", "edID": 128049489, "eddbID": 877, "grp": "rg", "class": 2, "rating": "B", "cost": 412800, "mass": 4, "integrity": 51, "power": 1.63, "mount": "F", "type": "KT", "armourpen": 48, "breachdps": 47.4, "breachmin": 0.4, "breachmax": 0.8, "dps": 50, "eps": 6.132, "hps": 36, "range": 3000, "rof": 1.2, "clip": 1, "ammo": 30, "reload": 1 },
+    { "id": "ih", "edID": 128671341, "eddbID": 1484, "grp": "rg", "name": "Imperial Hammer", "class": 2, "rating": "B", "cost": 619200, "mass": 4, "power": 1.63, "mount": "F", "type": "KT", "damage": 5, "armourpen": "A", "rof": 0.6, "dps": 5, "thermload": 3, "clip": 3, "ammo": 90 }
   ]
 }
diff --git a/modules/hardpoints/shield_booster.json b/modules/hardpoints/shield_booster.json
old mode 100644
new mode 100755
diff --git a/modules/hardpoints/torpedo_pylon.json b/modules/hardpoints/torpedo_pylon.json
old mode 100644
new mode 100755
index 151222e..75b0e1b
--- a/modules/hardpoints/torpedo_pylon.json
+++ b/modules/hardpoints/torpedo_pylon.json
@@ -1,7 +1,7 @@
 {
   "tp": [
-    { "id": "2h", "edID": 128049509, "eddbID": 882, "grp": "tp", "class": 1, "rating": "I", "cost": 11200, "mass": 2, "power": 0.4, "mount": "F", "armourpen": "C", "thermload": 10, "clip": 1, "ammo": 0, "ammocost": 15000, "missile": "S" },
-    { "id": "2i", "edID": 128049510, "eddbID": 883, "grp": "tp", "class": 2, "rating": "I", "cost": 44800, "mass": 4, "power": 0.4, "mount": "F", "armourpen": "C", "thermload": 10, "clip": 2, "ammo": 0, "ammocost": 15000, "missile": "S" }
+    { "id": "2h", "edID": 128049509, "eddbID": 882, "grp": "tp", "class": 1, "rating": "I", "cost": 11200, "mass": 2, "integrity": 40, "power": 0.4, "mount": "F", "type": "E", "armourpen": 10000, "breachdps": 60, "breachmin": 0.6, "breachmax": 0.8, "dps": 120, "eps": 0, "hps": 45, "rof": 1, "clip": 1, "ammo": 1, "reload": 5, "speed": 250, "missile": "S" },
+    { "id": "2i", "edID": 128049510, "eddbID": 883, "grp": "tp", "class": 2, "rating": "I", "cost": 44800, "mass": 4, "integrity": 51, "power": 0.4, "mount": "F", "type": "E", "armourpen": 10000, "breachdps": 60, "breachmin": 0.6, "breachmax": 0.8, "dps": 120, "eps": 0, "hps": 50, "rof": 1, "clip": 1, "ammo": 2, "reload": 5, "speed": 250, "missile": "S" }
   ]
 }
 
diff --git a/modules/index.js b/modules/index.js
index 9bc8804..196e637 100644
--- a/modules/index.js
+++ b/modules/index.js
@@ -34,6 +34,7 @@ module.exports = {
     cr: require('./internal/cargo_rack').cr,
     cc: require('./internal/collector_limpet_controllers').cc,
     dc: require('./internal/docking_computer').dc,
+    fh: require('./internal/fighter_hangar').fh,
     fi: require('./internal/frame_shift_drive_interdictor').fi,
     fs: require('./internal/fuel_scoop').fs,
     ft: require('./internal/internal_fuel_tank').ft,
@@ -43,6 +44,10 @@ module.exports = {
     pv: require('./internal/planetary_vehicle_hanger').pv,
     psg: require('./internal/pristmatic_shield_generator').psg,
     pc: require('./internal/prospector_limpet_controllers').pc,
+    pce: require('./internal/economy_passenger_cabin').pce,
+    pci: require('./internal/business_passenger_cabin').pci,
+    pcm: require('./internal/first_passenger_cabin').pcm,
+    pcq: require('./internal/luxury_passenger_cabin').pcq,
     rf: require('./internal/refinery').rf,
     sc: require('./internal/scanner').sc,
     scb: require('./internal/shield_cell_bank').scb,
diff --git a/modules/internal/auto_field_maintenance_unit.json b/modules/internal/auto_field_maintenance_unit.json
old mode 100644
new mode 100755
diff --git a/modules/internal/business_passenger_cabin.json b/modules/internal/business_passenger_cabin.json
new file mode 100644
index 0000000..b8a14fb
--- /dev/null
+++ b/modules/internal/business_passenger_cabin.json
@@ -0,0 +1,8 @@
+{
+  "pci": [
+    { "id": "mf", "edID": -1, "eddbID": -1, "grp": "pci", "class": 3, "rating": "D", "cost": -1, "mass": 5, "passengers": 3 },
+    { "id": "mg", "edID": -1, "eddbID": -1, "grp": "pci", "class": 4, "rating": "D", "cost": -1, "mass": 10, "passengers": 6 },
+    { "id": "mh", "edID": -1, "eddbID": -1, "grp": "pci", "class": 5, "rating": "D", "cost": -1, "mass": 20, "passengers": 10 },
+    { "id": "mi", "edID": -1, "eddbID": -1, "grp": "pci", "class": 6, "rating": "D", "cost": -1, "mass": 40, "passengers": 16 }
+  ]
+}
diff --git a/modules/internal/cargo_rack.json b/modules/internal/cargo_rack.json
old mode 100644
new mode 100755
index 7171ad3..6be7823
--- a/modules/internal/cargo_rack.json
+++ b/modules/internal/cargo_rack.json
@@ -7,8 +7,6 @@
     { "id": "04", "edID": 128064342, "eddbID": 1195, "grp": "cr", "class": 5, "rating": "E", "cost": 111570,   "cargo": 32 },
     { "id": "05", "edID": 128064343, "eddbID": 1196, "grp": "cr", "class": 6, "rating": "E", "cost": 362590,   "cargo": 64 },
     { "id": "06", "edID": 128064344, "eddbID": 1197, "grp": "cr", "class": 7, "rating": "E", "cost": 1178420,  "cargo": 128 },
-    { "id": "07", "edID": 128064345, "eddbID": 1198, "grp": "cr", "class": 8, "rating": "E", "cost": 3829870,  "cargo": 256 },
-    { "id": "c0", "edID": 128681641, "eddbID": 1553, "grp": "cr", "class": 1, "rating": "E", "cost": 6250,     "cargo": 1, "name": "Corrosion Resistant" },
-    { "id": "c1", "edID": 128681992, "eddbID": 1552, "grp": "cr", "class": 1, "rating": "F", "cost": 12563,    "cargo": 2, "name": "Corrosion Resistant" }
+    { "id": "07", "edID": 128064345, "eddbID": 1198, "grp": "cr", "class": 8, "rating": "E", "cost": 3829870,  "cargo": 256 }
   ]
-}
+}
\ No newline at end of file
diff --git a/modules/internal/docking_computer.json b/modules/internal/docking_computer.json
old mode 100644
new mode 100755
diff --git a/modules/internal/economy_passenger_cabin.json b/modules/internal/economy_passenger_cabin.json
new file mode 100644
index 0000000..16030cf
--- /dev/null
+++ b/modules/internal/economy_passenger_cabin.json
@@ -0,0 +1,9 @@
+{
+  "pce": [
+    { "id": "ma", "edID": -1, "eddbID": -1, "grp": "pce", "class": 2, "rating": "E", "cost": -1, "mass": 2.5, "passengers": 2 },
+    { "id": "mb", "edID": -1, "eddbID": -1, "grp": "pce", "class": 3, "rating": "E", "cost": -1, "mass": 5, "passengers": 4 },
+    { "id": "mc", "edID": -1, "eddbID": -1, "grp": "pce", "class": 4, "rating": "E", "cost": -1, "mass": 10, "passengers": 8 },
+    { "id": "md", "edID": -1, "eddbID": -1, "grp": "pce", "class": 5, "rating": "E", "cost": -1, "mass": 20, "passengers": 16 },
+    { "id": "me", "edID": -1, "eddbID": -1, "grp": "pce", "class": 6, "rating": "E", "cost": -1, "mass": 40, "passengers": 32 }
+  ]
+}
diff --git a/modules/internal/fighter_hangar.json b/modules/internal/fighter_hangar.json
new file mode 100644
index 0000000..e3bfeb6
--- /dev/null
+++ b/modules/internal/fighter_hangar.json
@@ -0,0 +1,10 @@
+{
+  "fh": [
+
+    { "id": "fh", "edID": -1, "eddbID": -1, "grp": "fh", "class": 7, "rating": "D", "cost": -1, "power": 0.35, "mass": 60, "bays": 2, "rebuildsperbay": 15 },
+
+    { "id": "fm", "edID": -1, "eddbID": -1, "grp": "fh", "class": 6, "rating": "D", "cost": -1, "power": 0.35, "mass": 40, "bays": 2, "rebuildsperbay": 8 },
+
+    { "id": "fr", "edID": -1, "eddbID": -1, "grp": "fh", "class": 5, "rating": "D", "cost": -1, "power": 0.25, "mass": 20, "bays": 1, "rebuildsperbay": 6 }
+  ]
+}
diff --git a/modules/internal/first_passenger_cabin.json b/modules/internal/first_passenger_cabin.json
new file mode 100644
index 0000000..1443815
--- /dev/null
+++ b/modules/internal/first_passenger_cabin.json
@@ -0,0 +1,7 @@
+{
+  "pcm": [
+    { "id": "mj", "edID": -1, "eddbID": -1, "grp": "pcm", "class": 4, "rating": "C", "cost": -1, "mass": 10, "passengers": 3 },
+    { "id": "mk", "edID": -1, "eddbID": -1, "grp": "pcm", "class": 5, "rating": "C", "cost": -1, "mass": 20, "passengers": 6 },
+    { "id": "ml", "edID": -1, "eddbID": -1, "grp": "pcm", "class": 6, "rating": "C", "cost": -1, "mass": 40, "passengers": 12 }
+  ]
+}
diff --git a/modules/internal/frame_shift_drive_interdictor.json b/modules/internal/frame_shift_drive_interdictor.json
old mode 100644
new mode 100755
diff --git a/modules/internal/fuel_scoop.json b/modules/internal/fuel_scoop.json
old mode 100644
new mode 100755
diff --git a/modules/internal/hatch_breaker_limpet_controller.json b/modules/internal/hatch_breaker_limpet_controller.json
old mode 100644
new mode 100755
diff --git a/modules/internal/hull_reinforcement_package.json b/modules/internal/hull_reinforcement_package.json
old mode 100644
new mode 100755
diff --git a/modules/internal/luxury_passenger_cabin.json b/modules/internal/luxury_passenger_cabin.json
new file mode 100644
index 0000000..ac217f0
--- /dev/null
+++ b/modules/internal/luxury_passenger_cabin.json
@@ -0,0 +1,6 @@
+{
+  "pcq": [
+    { "id": "mm", "edID": -1, "eddbID": -1, "grp": "pcq", "class": 5, "rating": "B", "cost": -1, "mass": 20, "passengers": 4 },
+    { "id": "mn", "edID": -1, "eddbID": -1, "grp": "pcq", "class": 6, "rating": "B", "cost": -1, "mass": 40, "passengers": 8 }
+  ]
+}
diff --git a/modules/internal/pristmatic_shield_generator.json b/modules/internal/pristmatic_shield_generator.json
index c9966ca..33082e9 100644
--- a/modules/internal/pristmatic_shield_generator.json
+++ b/modules/internal/pristmatic_shield_generator.json
@@ -1,12 +1,12 @@
 {
   "psg": [
-    { "id": "p6", "edID": 128671323, "eddbID": 1485, "grp": "psg", "class": 1, "rating": "A", "cost": 132200,    "mass": 2.5, "power": 2.52, "minmass": 13,  "optmass": 25,   "maxmass": 63,   "minmul": 2, "optmul": 1.5, "maxmul": 1, "recover": 1.2,   "pp": "Aisling Duval" },
-    { "id": "p5", "edID": 128671324, "eddbID": 1486, "grp": "psg", "class": 2, "rating": "A", "cost": 240340,    "mass": 5,   "power": 3.15, "minmass": 23,  "optmass": 55,   "maxmass": 138,  "minmul": 2, "optmul": 1.5, "maxmul": 1, "recover": 1.2,   "pp": "Aisling Duval" },
-    { "id": "p4", "edID": 128671325, "eddbID": 1487, "grp": "psg", "class": 3, "rating": "A", "cost": 761870,    "mass": 10,  "power": 3.78, "minmass": 83,  "optmass": 165,  "maxmass": 413,  "minmul": 2, "optmul": 1.5, "maxmul": 1, "recover": 1.2,   "pp": "Aisling Duval" },
-    { "id": "p3", "edID": 128671326, "eddbID": 1488, "grp": "psg", "class": 4, "rating": "A", "cost": 2415120,   "mass": 20,  "power": 4.62, "minmass": 143, "optmass": 285,  "maxmass": 713,  "minmul": 2, "optmul": 1.5, "maxmul": 1, "recover": 1.425, "pp": "Aisling Duval" },
-    { "id": "p2", "edID": 128671327, "eddbID": 1489, "grp": "psg", "class": 5, "rating": "A", "cost": 7655930,   "mass": 40,  "power": 5.46, "minmass": 203, "optmass": 405,  "maxmass": 1013, "minmul": 2, "optmul": 1.5, "maxmul": 1, "recover": 1.875, "pp": "Aisling Duval" },
-    { "id": "p1", "edID": 128671328, "eddbID": 1490, "grp": "psg", "class": 6, "rating": "A", "cost": 24269300,  "mass": 80,  "power": 6.51, "minmass": 270, "optmass": 540,  "maxmass": 1350, "minmul": 2, "optmul": 1.5, "maxmul": 1, "recover": 2.4,   "pp": "Aisling Duval" },
-    { "id": "p0", "edID": 128671329, "eddbID": 1491, "grp": "psg", "class": 7, "rating": "A", "cost": 76933670,  "mass": 160, "power": 7.35, "minmass": 530, "optmass": 1060, "maxmass": 2650, "minmul": 2, "optmul": 1.5, "maxmul": 1, "recover": 3,     "pp": "Aisling Duval" },
-    { "id": "p7", "edID": 128671330, "eddbID": 1492, "grp": "psg", "class": 8, "rating": "A", "cost": 243879730, "mass": 320, "power": 8.4,  "minmass": 900, "optmass": 1800, "maxmass": 4500, "minmul": 2, "optmul": 1.5, "maxmul": 1, "recover": 3.6,   "pp": "Aisling Duval" }
+    { "id": "p6", "edID": 128671323, "eddbID": 1485, "grp": "psg", "class": 1, "rating": "A", "cost": 132200,    "mass": 2.5, "power": 2.52, "minmass": 13,  "optmass": 25,   "maxmass": 63,   "minmul": 2, "optmul": 1.5, "maxmul": 1, "recover": 1.2 },
+    { "id": "p5", "edID": 128671324, "eddbID": 1486, "grp": "psg", "class": 2, "rating": "A", "cost": 240340,    "mass": 5,   "power": 3.15, "minmass": 23,  "optmass": 55,   "maxmass": 138,  "minmul": 2, "optmul": 1.5, "maxmul": 1, "recover": 1.2 },
+    { "id": "p4", "edID": 128671325, "eddbID": 1487, "grp": "psg", "class": 3, "rating": "A", "cost": 761870,    "mass": 10,  "power": 3.78, "minmass": 83,  "optmass": 165,  "maxmass": 413,  "minmul": 2, "optmul": 1.5, "maxmul": 1, "recover": 1.2 },
+    { "id": "p3", "edID": 128671326, "eddbID": 1488, "grp": "psg", "class": 4, "rating": "A", "cost": 2415120,   "mass": 20,  "power": 4.62, "minmass": 143, "optmass": 285,  "maxmass": 713,  "minmul": 2, "optmul": 1.5, "maxmul": 1, "recover": 1.425 },
+    { "id": "p2", "edID": 128671327, "eddbID": 1489, "grp": "psg", "class": 5, "rating": "A", "cost": 7655930,   "mass": 40,  "power": 5.46, "minmass": 203, "optmass": 405,  "maxmass": 1013, "minmul": 2, "optmul": 1.5, "maxmul": 1, "recover": 1.875 },
+    { "id": "p1", "edID": 128671328, "eddbID": 1490, "grp": "psg", "class": 6, "rating": "A", "cost": 24269300,  "mass": 80,  "power": 6.51, "minmass": 270, "optmass": 540,  "maxmass": 1350, "minmul": 2, "optmul": 1.5, "maxmul": 1, "recover": 2.4 },
+    { "id": "p0", "edID": 128671329, "eddbID": 1491, "grp": "psg", "class": 7, "rating": "A", "cost": 76933670,  "mass": 160, "power": 7.35, "minmass": 530, "optmass": 1060, "maxmass": 2650, "minmul": 2, "optmul": 1.5, "maxmul": 1, "recover": 3 },
+    { "id": "p7", "edID": 128671330, "eddbID": 1492, "grp": "psg", "class": 8, "rating": "A", "cost": 243879730, "mass": 320, "power": 8.4,  "minmass": 900, "optmass": 1800, "maxmass": 4500, "minmul": 2, "optmul": 1.5, "maxmul": 1, "recover": 3.6 }
   ]
 }
diff --git a/modules/internal/refinery.json b/modules/internal/refinery.json
old mode 100644
new mode 100755
diff --git a/modules/internal/scanner.json b/modules/internal/scanner.json
old mode 100644
new mode 100755
diff --git a/modules/internal/shield_cell_bank.json b/modules/internal/shield_cell_bank.json
old mode 100644
new mode 100755
diff --git a/modules/internal/shield_generator.json b/modules/internal/shield_generator.json
old mode 100644
new mode 100755
index d7e7a1e..f016773
--- a/modules/internal/shield_generator.json
+++ b/modules/internal/shield_generator.json
@@ -42,6 +42,6 @@
     { "id": "3s", "edID": 128064266, "eddbID": 1119, "grp": "sg", "class": 2, "rating": "B", "cost": 53410,     "mass": 4,   "power": 1.8,  "minmass": 28,  "optmass": 55,   "maxmass": 138,  "minmul": 1.6, "optmul": 1.1, "maxmul": 0.6, "recover": 1.6 },
     { "id": "3r", "edID": 128064267, "eddbID": 1120, "grp": "sg", "class": 2, "rating": "A", "cost": 160220,    "mass": 2.5, "power": 2.1,  "minmass": 28,  "optmass": 55,   "maxmass": 138,  "minmul": 1.7, "optmul": 1.2, "maxmul": 0.7, "recover": 1.6 },
 
-    { "id": "3w", "edID": 128064262, "eddbID": 1551, "grp": "sg", "class": 1, "rating": "A", "cost": 88075,     "mass": 1.3, "power": 1.68,  "minmass": 13,  "optmass": 25,  "maxmass": 63,   "minmul": 1.7, "optmul": 1.2, "maxmul": 0.7, "recover": 1.0 }
+    { "id": "1x", "edID": 128064262, "eddbID": 1551, "grp": "sg", "class": 1, "rating": "A", "cost": 88075,     "mass": 1.3, "power": 1.68,  "minmass": 13,  "optmass": 25,  "maxmass": 63,   "minmul": 1.7, "optmul": 1.2, "maxmul": 0.7, "recover": 1.0 }
   ]
 }
diff --git a/modules/standard/frame_shift_drive.json b/modules/standard/frame_shift_drive.json
old mode 100644
new mode 100755
diff --git a/modules/standard/fuel_tank.json b/modules/standard/fuel_tank.json
old mode 100644
new mode 100755
diff --git a/modules/standard/life_support.json b/modules/standard/life_support.json
old mode 100644
new mode 100755
diff --git a/modules/standard/power_distributor.json b/modules/standard/power_distributor.json
old mode 100644
new mode 100755
diff --git a/modules/standard/power_plant.json b/modules/standard/power_plant.json
old mode 100644
new mode 100755
diff --git a/modules/standard/sensors.json b/modules/standard/sensors.json
old mode 100644
new mode 100755
diff --git a/modules/standard/thrusters.json b/modules/standard/thrusters.json
old mode 100644
new mode 100755
index c6f1e30..d29ce5a
--- a/modules/standard/thrusters.json
+++ b/modules/standard/thrusters.json
@@ -42,7 +42,7 @@
     { "id":"t1", "edID": 128064071, "eddbID": 929, "grp": "t", "class": 2, "rating": "B", "M": 0.07, "P": 1.51, "cost": 53410, "mass": 4, "power": 2.75, "optmass": 66, "maxmass": 99 },
     { "id":"t0", "edID": 128064072, "eddbID": 930, "grp": "t", "class": 2, "rating": "A", "M": 0.04, "P": 2.33, "cost": 160220, "mass": 2.5, "power": 3, "optmass": 72, "maxmass": 108 },
 
-    { "id":"tz", "edID": 128682013, "eddbID": 1548, "grp": "t", "class": 3, "rating": "A", "name": "Enhanced Performance", "M": 0.04, "P": 2.33, "cost": 5103952, "mass": 5, "power": 5, "optmass": 90, "maxmass": 200 },
-    { "id":"u0", "edID": 128682014, "eddbID": 1547, "grp": "t", "class": 2, "rating": "A", "name": "Enhanced Performance", "M": 0.04, "P": 2.33, "cost": 1610080, "mass": 2.5, "power": 4, "optmass": 60, "maxmass": 120 }
+    { "id":"tz", "edID": 128682013, "eddbID": 0, "grp": "t", "class": 3, "rating": "A", "name": "Enhanced Performance", "M": 0.04, "P": 2.33, "cost": 5103952, "mass": 5, "power": 5, "optmass": 90, "maxmass": 200 },
+    { "id":"u0", "edID": 128682014, "eddbID": 0, "grp": "t", "class": 2, "rating": "A", "name": "Enhanced Performance", "M": 0.04, "P": 2.33, "cost": 1610080, "mass": 2.5, "power": 4, "optmass": 60, "maxmass": 120 }
   ]
 }
diff --git a/ships/adder.json b/ships/adder.json
old mode 100644
new mode 100755
index 3a5e6c0..fe8a9bf
--- a/ships/adder.json
+++ b/ships/adder.json
@@ -11,7 +11,7 @@
       "boost": 320,
       "boostEnergy": 9,
       "agility": 8,
-      "baseShieldStrength": 60,
+      "baseShieldStrength": 78,
       "baseArmour": 162,
       "hullMass": 35,
       "masslock": 7,
diff --git a/ships/anaconda.json b/ships/anaconda.json
old mode 100644
new mode 100755
index 93864e8..02c884b
--- a/ships/anaconda.json
+++ b/ships/anaconda.json
@@ -7,15 +7,16 @@
       "manufacturer": "Faulcon DeLacy",
       "class": 3,
       "hullCost": 141889930,
-      "speed": 180,
-      "boost": 240,
+      "speed": 183,
+      "boost": 244,
       "boostEnergy": 29,
       "agility": 2,
-      "baseShieldStrength": 350,
+      "baseShieldStrength": 362,
       "baseArmour": 945,
       "hullMass": 400,
       "masslock": 23,
-      "pipSpeed": 0.13875
+      "pipSpeed": 0.13875,
+      "fighterHangars": true
     },
     "retailCost": 146969450,
     "bulkheads": [
@@ -36,4 +37,4 @@
       "internal": ["05", "04", "4j", 0, "03", 0, 0, 0, 0, "2h", "00"]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/ships/asp.json b/ships/asp.json
old mode 100644
new mode 100755
index ea02f11..06389e5
--- a/ships/asp.json
+++ b/ships/asp.json
@@ -7,11 +7,11 @@
       "manufacturer": "Lakon",
       "class": 2,
       "hullCost": 6135660,
-      "speed": 250,
-      "boost": 340,
+      "speed": 254,
+      "boost": 345,
       "boostEnergy": 14,
       "agility": 6,
-      "baseShieldStrength": 140,
+      "baseShieldStrength": 152,
       "baseArmour": 378,
       "hullMass": 280,
       "masslock": 11,
@@ -36,4 +36,4 @@
       "internal": ["04", "4e", "01", 0, 0, "00", "2h"]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/ships/asp_scout.json b/ships/asp_scout.json
index a19187b..3212324 100644
--- a/ships/asp_scout.json
+++ b/ships/asp_scout.json
@@ -6,11 +6,11 @@
       "manufacturer": "Lakon",
       "class": 2,
       "hullCost": 3818240,
-      "speed": 220,
-      "boost": 300,
+      "speed": 223,
+      "boost": 304,
       "boostEnergy": 13,
       "agility": 8,
-      "baseShieldStrength": 120,
+      "baseShieldStrength": 105,
       "baseArmour": 324,
       "hullMass": 150,
       "masslock": 8,
@@ -35,4 +35,4 @@
       "internal": ["02", "02", "44", 0, 0]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/ships/beluga.json b/ships/beluga.json
new file mode 100755
index 0000000..d842762
--- /dev/null
+++ b/ships/beluga.json
@@ -0,0 +1,48 @@
+{
+  "beluga": {
+    "edID": -1,
+    "eddbID": -1,
+    "properties": {
+      "name": "Beluga Liner",
+      "manufacturer": "Saud Kruger",
+      "class": 3,
+      "hullCost": -1,
+      "speed": 195,
+      "boost": 273,
+      "boostEnergy": 20,
+      "agility": 2,
+      "baseShieldStrength": 92,
+      "baseArmour": 504,
+      "hullMass": 1100,
+      "masslock": 18,
+      "pipSpeed": -1,
+      "luxuryCabins": true,
+      "fighterHangars": true
+    },
+    "retailCost": -1,
+    "bulkheads": [
+      { "id": "cl", "edID": -1, "eddbID": -1, "cost": 0, "mass": 0 },
+      { "id": "cm", "edID": -1, "eddbID": -1, "cost": -1, "mass": 83 },
+      { "id": "cn", "edID": -1, "eddbID": -1, "cost": -1, "mass": 165 },
+      { "id": "co", "edID": -1, "eddbID": -1, "cost": -1, "mass": 165 },
+      { "id": "cp", "edID": -1, "eddbID": -1, "cost": -1, "mass": 165 }
+    ],
+    "slots": {
+      "standard": [6, 7, 7, 8, 6, 5, 7],
+      "hardpoints": [2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 0],
+      "internal": [
+        6, 6,
+        { "class": 6, "eligible": { "cr": 1, "hr": 1, "pce": 1, "pci": 1, "pcm": 1, "pcq": 1 } },
+        { "class": 6, "eligible": { "cr": 1, "hr": 1, "pce": 1, "pci": 1, "pcm": 1, "pcq": 1 } },
+        { "class": 5, "eligible": { "cr": 1, "hr": 1, "pce": 1, "pci": 1, "pcm": 1, "pcq": 1 } },
+        { "class": 5, "eligible": { "cr": 1, "hr": 1, "pce": 1, "pci": 1, "pcm": 1, "pcq": 1 } },
+        4, 3, 3, 3, 3
+      ]
+    },
+    "defaults": {
+      "standard": ["6E", "7E", "7E", "8E", "6E", "5E", "7C"],
+      "hardpoints": [17, 17, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+      "internal": ["4j", "04", "6dbusiness", "6dbusiness", "4dbusiness", "4dbusiness", "02", "01", 0, 0, "2h"]
+    }
+  }
+}
diff --git a/ships/cobra_mk_iii.json b/ships/cobra_mk_iii.json
old mode 100644
new mode 100755
index 5668639..344c318
--- a/ships/cobra_mk_iii.json
+++ b/ships/cobra_mk_iii.json
@@ -7,11 +7,11 @@
       "manufacturer": "Faulcon DeLacy",
       "class": 1,
       "hullCost": 205800,
-      "speed": 280,
-      "boost": 400,
+      "speed": 282,
+      "boost": 402,
       "boostEnergy": 11,
       "agility": 6,
-      "baseShieldStrength": 80,
+      "baseShieldStrength": 92,
       "baseArmour": 216,
       "hullMass": 180,
       "masslock": 8,
@@ -36,4 +36,4 @@
       "internal": ["02", "02", "49", "00", 0, "2h"]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/ships/cobra_mk_iv.json b/ships/cobra_mk_iv.json
index 3c25ac2..ca88335 100644
--- a/ships/cobra_mk_iv.json
+++ b/ships/cobra_mk_iv.json
@@ -8,10 +8,10 @@
       "class": 1,
       "hullCost": 603740,
       "speed": 200,
-      "boost": 300,
+      "boost": 299,
       "boostEnergy": 11,
       "agility": 4,
-      "baseShieldStrength": 120,
+      "baseShieldStrength": 125,
       "baseArmour": 216,
       "hullMass": 210,
       "masslock": 8,
@@ -36,4 +36,4 @@
       "internal": ["02", "02", "49", 0, 0, 0, "00", "2h"]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/ships/diamondback_explorer.json b/ships/diamondback_explorer.json
index debd123..855b9df 100644
--- a/ships/diamondback_explorer.json
+++ b/ships/diamondback_explorer.json
@@ -6,11 +6,11 @@
       "manufacturer": "Lakon",
       "class": 1,
       "hullCost": 1635700,
-      "speed": 260,
-      "boost": 340,
+      "speed": 242,
+      "boost": 316,
       "boostEnergy": 14,
       "agility": 5,
-      "baseShieldStrength": 146,
+      "baseShieldStrength": 115,
       "baseArmour": 270,
       "hullMass": 298,
       "masslock": 10,
@@ -35,4 +35,4 @@
       "internal": ["49", "02", "01", 0, "2h"]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/ships/diamondback_scout.json b/ships/diamondback_scout.json
index 5fbadde..cbbb815 100644
--- a/ships/diamondback_scout.json
+++ b/ships/diamondback_scout.json
@@ -8,10 +8,10 @@
       "class": 1,
       "hullCost": 461340,
       "speed": 283,
-      "boost": 380,
+      "boost": 384,
       "boostEnergy": 11,
       "agility": 8,
-      "baseShieldStrength": 118,
+      "baseShieldStrength": 93,
       "baseArmour": 216,
       "hullMass": 170,
       "masslock": 8,
@@ -36,4 +36,4 @@
       "internal": ["44", 0, 0, "2h"]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/ships/eagle.json b/ships/eagle.json
old mode 100644
new mode 100755
index feb9424..984b228
--- a/ships/eagle.json
+++ b/ships/eagle.json
@@ -7,11 +7,11 @@
       "manufacturer": "Core Dynamics",
       "class": 1,
       "hullCost": 10440,
-      "speed": 240,
-      "boost": 350,
+      "speed": 239,
+      "boost": 349,
       "boostEnergy": 9,
       "agility": 10,
-      "baseShieldStrength": 60,
+      "baseShieldStrength": 89,
       "baseArmour": 72,
       "hullMass": 50,
       "masslock": 6,
diff --git a/ships/federal_assault_ship.json b/ships/federal_assault_ship.json
index 815f33d..b3f4c6a 100644
--- a/ships/federal_assault_ship.json
+++ b/ships/federal_assault_ship.json
@@ -6,11 +6,11 @@
       "manufacturer": "Core Dynamics",
       "class": 2,
       "hullCost": 19072000,
-      "speed": 210,
-      "boost": 350,
+      "speed": 214,
+      "boost": 357,
       "boostEnergy": 21,
       "agility": 6,
-      "baseShieldStrength": 200,
+      "baseShieldStrength": 133,
       "baseArmour": 540,
       "hullMass": 480,
       "masslock": 14,
@@ -35,4 +35,4 @@
       "internal": ["4e", "03", "02", "02", 0, 0]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/ships/federal_corvette.json b/ships/federal_corvette.json
index 8475a92..e844bb4 100644
--- a/ships/federal_corvette.json
+++ b/ships/federal_corvette.json
@@ -7,15 +7,16 @@
       "manufacturer": "Core Dynamics",
       "class": 3,
       "hullCost": 182589570,
-      "speed": 200,
-      "boost": 260,
+      "speed": 198,
+      "boost": 257,
       "boostEnergy": 27,
       "agility": 2,
-      "baseShieldStrength": 555,
+      "baseShieldStrength": 516,
       "baseArmour": 666,
       "hullMass": 900,
       "masslock": 24,
-      "pipSpeed": 0.125
+      "pipSpeed": 0.125,
+      "fighterHangars": true
     },
     "retailCost": 187969450,
     "bulkheads": [
@@ -36,4 +37,4 @@
       "internal": ["4o", "05", 0, 0, 0, 0, 0, "02", "01", "2h"]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/ships/federal_dropship.json b/ships/federal_dropship.json
old mode 100644
new mode 100755
index 7108562..dd36fc9
--- a/ships/federal_dropship.json
+++ b/ships/federal_dropship.json
@@ -7,11 +7,11 @@
       "manufacturer": "Core Dynamics",
       "class": 2,
       "hullCost": 13469990,
-      "speed": 180,
-      "boost": 300,
+      "speed": 182,
+      "boost": 304,
       "boostEnergy": 21,
       "agility": 2,
-      "baseShieldStrength": 200,
+      "baseShieldStrength": 104,
       "baseArmour": 540,
       "hullMass": 580,
       "masslock": 14,
@@ -36,4 +36,4 @@
       "internal": ["04", "03", "4e", "02", 0, 0, "2h"]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/ships/federal_gunship.json b/ships/federal_gunship.json
index 41af475..4b2aeef 100644
--- a/ships/federal_gunship.json
+++ b/ships/federal_gunship.json
@@ -7,15 +7,16 @@
       "manufacturer": "Core Dynamics",
       "class": 2,
       "hullCost": 34774790,
-      "speed": 170,
-      "boost": 280,
+      "speed": 171,
+      "boost": 282,
       "boostEnergy": 21,
       "agility": 2,
-      "baseShieldStrength": 250,
+      "baseShieldStrength": 186,
       "baseArmour": 630,
       "hullMass": 580,
       "masslock": 14,
-      "pipSpeed": 0.1025
+      "pipSpeed": 0.1025,
+      "fighterHangars": true
     },
     "retailCost": 35814210,
     "bulkheads": [
@@ -36,4 +37,4 @@
       "internal": [0, "4j", "03", 0, "2h"]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/ships/fer_de_lance.json b/ships/fer_de_lance.json
old mode 100644
new mode 100755
index 50fc2cd..b9cb728
--- a/ships/fer_de_lance.json
+++ b/ships/fer_de_lance.json
@@ -7,11 +7,11 @@
       "manufacturer": "Zorgon Peterson",
       "class": 2,
       "hullCost": 51232230,
-      "speed": 260,
-      "boost": 350,
+      "speed": 265,
+      "boost": 357,
       "boostEnergy": 21,
       "agility": 6,
-      "baseShieldStrength": 300,
+      "baseShieldStrength": 271,
       "baseArmour": 405,
       "hullMass": 250,
       "masslock": 12,
diff --git a/ships/hauler.json b/ships/hauler.json
old mode 100644
new mode 100755
index 79a4da9..7f9c38c
--- a/ships/hauler.json
+++ b/ships/hauler.json
@@ -7,11 +7,11 @@
       "manufacturer": "Zorgon Peterson",
       "class": 1,
       "hullCost": 29790,
-      "speed": 200,
-      "boost": 300,
+      "speed": 203,
+      "boost": 305,
       "agility": 6,
       "boostEnergy": 7,
-      "baseShieldStrength": 50,
+      "baseShieldStrength": 65,
       "baseArmour": 90,
       "hullMass": 14,
       "masslock": 6,
@@ -36,4 +36,4 @@
       "internal": ["01", "01", "3v", "2h"]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/ships/imperial_clipper.json b/ships/imperial_clipper.json
old mode 100644
new mode 100755
index b7565d2..a4acfac
--- a/ships/imperial_clipper.json
+++ b/ships/imperial_clipper.json
@@ -7,11 +7,11 @@
       "manufacturer": "Gutamaya",
       "class": 3,
       "hullCost": 21077780,
-      "speed": 300,
-      "boost": 380,
+      "speed": 306,
+      "boost": 388,
       "boostEnergy": 21,
       "agility": 2,
-      "baseShieldStrength": 180,
+      "baseShieldStrength": 186,
       "baseArmour": 486,
       "hullMass": 400,
       "masslock": 12,
@@ -36,4 +36,4 @@
       "internal": ["05", "4j", "02", 0, 0, 0, "00", "2h"]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/ships/imperial_courier.json b/ships/imperial_courier.json
index 6f7cd11..dfae0e2 100644
--- a/ships/imperial_courier.json
+++ b/ships/imperial_courier.json
@@ -10,7 +10,7 @@
       "boost": 380,
       "boostEnergy": 11,
       "agility": 6,
-      "baseShieldStrength": 197,
+      "baseShieldStrength": 230,
       "baseArmour": 144,
       "hullMass": 35,
       "masslock": 7,
@@ -35,4 +35,4 @@
       "internal": ["01", "01", "3v", "00", "00", "2h"]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/ships/imperial_cutter.json b/ships/imperial_cutter.json
index fd33ba1..6d47857 100644
--- a/ships/imperial_cutter.json
+++ b/ships/imperial_cutter.json
@@ -6,15 +6,16 @@
       "manufacturer": "Gutamaya",
       "class": 3,
       "hullCost": 199926890,
-      "speed": 200,
-      "boost": 320,
+      "speed": 202,
+      "boost": 323,
       "boostEnergy": 24,
       "agility": 2,
-      "baseShieldStrength": 605,
+      "baseShieldStrength": 703,
       "baseArmour": 720,
       "hullMass": 1100,
       "masslock": 27,
-      "pipSpeed": 0.05
+      "pipSpeed": 0.05,
+       "fighterHangars": true
     },
     "retailCost": 208969450,
     "bulkheads": [
@@ -35,4 +36,4 @@
       "internal": ["4t", "06", "04", 0, 0, 0, 0, "01", "2h"]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/ships/imperial_eagle.json b/ships/imperial_eagle.json
index 861db05..d265345 100644
--- a/ships/imperial_eagle.json
+++ b/ships/imperial_eagle.json
@@ -7,11 +7,11 @@
       "manufacturer": "Core Dynamics",
       "class": 1,
       "hullCost": 72180,
-      "speed": 300,
-      "boost": 400,
+      "speed": 298,
+      "boost": 397,
       "boostEnergy": 9,
       "agility": 6,
-      "baseShieldStrength": 80,
+      "baseShieldStrength": 104,
       "baseArmour": 108,
       "hullMass": 50,
       "masslock": 6,
@@ -36,4 +36,4 @@
       "internal": ["44", "00", "2h", 0]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/ships/index.js b/ships/index.js
index 3eb8232..d813387 100644
--- a/ships/index.js
+++ b/ships/index.js
@@ -3,6 +3,7 @@ module.exports = {
   anaconda: require('./anaconda').anaconda,
   asp: require('./asp').asp,
   asp_scout: require('./asp_scout').asp_scout,
+  beluga: require('./beluga').beluga,
   cobra_mk_iii: require('./cobra_mk_iii').cobra_mk_iii,
   cobra_mk_iv: require('./cobra_mk_iv').cobra_mk_iv,
   diamondback_explorer: require('./diamondback_explorer').diamondback_explorer,
@@ -28,4 +29,4 @@ module.exports = {
   viper: require('./viper').viper,
   viper_mk_iv: require('./viper_mk_iv').viper_mk_iv,
   vulture: require('./vulture').vulture
-};
\ No newline at end of file
+};
diff --git a/ships/keelback.json b/ships/keelback.json
index 9ce999d..67d7186 100644
--- a/ships/keelback.json
+++ b/ships/keelback.json
@@ -7,15 +7,16 @@
       "manufacturer": "Lakon",
       "class": 2,
       "hullCost": 2951180,
-      "speed": 200,
-      "boost": 300,
+      "speed": 202,
+      "boost": 303,
       "boostEnergy": 10,
       "agility": 2,
-      "baseShieldStrength": 110,
-      "baseArmour": 198,
+      "baseShieldStrength": 99,
+      "baseArmour": 243,
       "hullMass": 180,
       "masslock": 8,
-      "pipSpeed": 0.1375
+      "pipSpeed": 0.1375,
+      "fighterHangars": true
     },
     "retailCost": 3126150,
     "bulkheads": [
@@ -28,12 +29,12 @@
     "slots": {
       "standard": [4, 4, 4, 1, 3, 2, 4],
       "hardpoints": [2, 2, 1, 1, 0, 0, 0],
-      "internal": [5, 5, 3, 3, 2, 2]
+      "internal": [5, 5, 4, 3, 2, 2]
     },
     "defaults": {
       "standard": ["4E", "4E", "4E", "1E", "3E", "2E", "4C"],
       "hardpoints": [0, 0, 17, 17, 0, 0, 0],
-      "internal": ["03", "03", "01", "44" ,"00", "2h"]
+      "internal": ["03", "03", "02", "44" ,"00", "2h"]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/ships/orca.json b/ships/orca.json
old mode 100644
new mode 100755
index dd33c8e..6a2ea23
--- a/ships/orca.json
+++ b/ships/orca.json
@@ -7,15 +7,16 @@
       "manufacturer": "Saud Kruger",
       "class": 3,
       "hullCost": 47798080,
-      "speed": 300,
-      "boost": 380,
+      "speed": 303,
+      "boost": 384,
       "boostEnergy": 17,
       "agility": 2,
-      "baseShieldStrength": 220,
+      "baseShieldStrength": 114,
       "baseArmour": 396,
       "hullMass": 580,
       "masslock": 13,
-      "pipSpeed": 0.08375
+      "pipSpeed": 0.08375,
+      "luxuryCabins": true
     },
     "retailCost": 48539890,
     "bulkheads": [
@@ -26,18 +27,18 @@
       { "id": "BQ", "edID": 128049332, "eddbID": 802, "cost": 114408510, "mass": 87 }
     ],
     "slots": {
-      "standard": [5, 6, 5, 6, 5, 4, 4],
+      "standard": [5, 6, 5, 6, 5, 4, 5],
       "hardpoints": [3, 2, 2, 0, 0, 0, 0],
       "internal": [
-        { "class": 6, "eligible": { "cr": 1, "hr": 1 } },
-        { "class": 5, "eligible": { "cr": 1, "hr": 1 } },
+        { "class": 6, "eligible": { "cr": 1, "hr": 1, "pce": 1, "pci": 1, "pcm": 1, "pcq": 1 } },
+        { "class": 5, "eligible": { "cr": 1, "hr": 1, "pce": 1, "pci": 1, "pcm": 1, "pcq": 1 } },
         5, 5, 4, 3, 2, 2
       ]
     },
     "defaults": {
-      "standard": ["5E", "6E", "5E", "6E", "5E", "4E", "4C"],
+      "standard": ["5E", "6E", "5E", "6E", "5E", "4E", "5C"],
       "hardpoints": [0, 17, 17, 0, 0, 0, 0],
-      "internal": ["04", "03", "03", "4e", "02", 0, 0, "2h"]
+      "internal": ["6e economy", "4e economy", "03", "4e", "02", 0, 0, "2h"]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/ships/python.json b/ships/python.json
old mode 100644
new mode 100755
index ecb0bf0..21096cd
--- a/ships/python.json
+++ b/ships/python.json
@@ -7,11 +7,11 @@
       "manufacturer": "Faulcon DeLacy",
       "class": 2,
       "hullCost": 55171380,
-      "speed": 230,
-      "boost": 300,
+      "speed": 234,
+      "boost": 305,
       "boostEnergy": 24,
       "agility": 6,
-      "baseShieldStrength": 260,
+      "baseShieldStrength": 294,
       "baseArmour": 468,
       "hullMass": 350,
       "masslock": 17,
@@ -36,4 +36,4 @@
       "internal": ["04", "04", "4j", "03", 0, 0, 0, "00", "2h"]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/ships/sidewinder.json b/ships/sidewinder.json
old mode 100644
new mode 100755
index ef96ed4..36357f8
--- a/ships/sidewinder.json
+++ b/ships/sidewinder.json
@@ -8,10 +8,10 @@
       "class": 1,
       "hullCost": 12870,
       "speed": 220,
-      "boost": 320,
+      "boost": 321,
       "boostEnergy": 7,
       "agility": 8,
-      "baseShieldStrength": 40,
+      "baseShieldStrength": 52,
       "baseArmour": 108,
       "hullMass": 25,
       "masslock": 6,
diff --git a/ships/type_6_transporter.json b/ships/type_6_transporter.json
old mode 100644
new mode 100755
index 7507298..24fa79e
--- a/ships/type_6_transporter.json
+++ b/ships/type_6_transporter.json
@@ -7,11 +7,11 @@
       "manufacturer": "Lakon",
       "class": 2,
       "hullCost": 865790,
-      "speed": 220,
-      "boost": 350,
+      "speed": 223,
+      "boost": 355,
       "boostEnergy": 11,
       "agility": 3,
-      "baseShieldStrength": 90,
+      "baseShieldStrength": 77,
       "baseArmour": 162,
       "hullMass": 155,
       "masslock": 8,
@@ -36,4 +36,4 @@
       "internal": ["03", "03", "02", "02", "44", "00", "2h"]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/ships/type_7_transport.json b/ships/type_7_transport.json
old mode 100644
new mode 100755
index 7fe14be..e35b280
--- a/ships/type_7_transport.json
+++ b/ships/type_7_transport.json
@@ -7,12 +7,12 @@
       "manufacturer": "Lakon",
       "class": 3,
       "hullCost": 16881510,
-      "speed": 180,
-      "boost": 300,
+      "speed": 181,
+      "boost": 301,
       "boostEnergy": 11,
       "agility": 2,
-      "baseShieldStrength": 120,
-      "baseArmour": 216,
+      "baseShieldStrength": 78,
+      "baseArmour": 306,
       "hullMass": 420,
       "masslock": 10,
       "pipSpeed": 0.16625
@@ -28,12 +28,12 @@
     "slots": {
       "standard": [4, 5, 5, 4, 3, 3, 5],
       "hardpoints": [1, 1, 1, 1, 0, 0, 0, 0],
-      "internal": [6, 6, 5, 5, 4, 4, 2, 2]
+      "internal": [6, 6, 6, 5, 5, 5, 3, 3]
     },
     "defaults": {
       "standard": ["4E", "5E", "5E", "4E", "3E", "3E", "5C"],
       "hardpoints": [17, 17, 0, 0, 0, 0, 0, 0],
-      "internal": ["04", "04", "03", "03", "02", "49", 0, "2h"]
+      "internal": ["04", "04", "04", "03", "03", "49", 0, "2h"]
     }
   }
 }
diff --git a/ships/type_9_heavy.json b/ships/type_9_heavy.json
old mode 100644
new mode 100755
index b909ec9..2316948
--- a/ships/type_9_heavy.json
+++ b/ships/type_9_heavy.json
@@ -7,15 +7,16 @@
       "manufacturer": "Lakon",
       "class": 3,
       "hullCost": 73255150,
-      "speed": 130,
-      "boost": 200,
+      "speed": 131,
+      "boost": 201,
       "boostEnergy": 21,
       "agility": 0,
-      "baseShieldStrength": 240,
+      "baseShieldStrength": 88,
       "baseArmour": 432,
       "hullMass": 1000,
       "masslock": 16,
-      "pipSpeed": 0.17375
+      "pipSpeed": 0.17375,
+      "fighterHangars": true
     },
     "retailCost": 76555840,
     "bulkheads": [
@@ -36,4 +37,4 @@
       "internal": ["06", "05", "4j", "03", "02", 0, "01", 0, "2h"]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/ships/viper.json b/ships/viper.json
old mode 100644
new mode 100755
index c00e87c..49c0c3c
--- a/ships/viper.json
+++ b/ships/viper.json
@@ -7,11 +7,11 @@
       "manufacturer": "Faulcon DeLacy",
       "class": 1,
       "hullCost": 95900,
-      "speed": 320,
-      "boost": 400,
+      "speed": 310,
+      "boost": 388,
       "boostEnergy": 11,
       "agility": 6,
-      "baseShieldStrength": 105,
+      "baseShieldStrength": 137,
       "baseArmour": 126,
       "hullMass": 60,
       "masslock": 7,
@@ -36,4 +36,4 @@
       "internal": ["01", "44", 0, "2h"]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/ships/viper_mk_iv.json b/ships/viper_mk_iv.json
index 9894bc4..e9149e3 100644
--- a/ships/viper_mk_iv.json
+++ b/ships/viper_mk_iv.json
@@ -7,11 +7,11 @@
       "manufacturer": "Faulcon DeLacy",
       "class": 1,
       "hullCost": 310220,
-      "speed": 270,
-      "boost": 340,
+      "speed": 271,
+      "boost": 342,
       "boostEnergy": 10,
       "agility": 4,
-      "baseShieldStrength": 150,
+      "baseShieldStrength": 103,
       "baseArmour": 270,
       "hullMass": 190,
       "masslock": 7,
@@ -36,4 +36,4 @@
       "internal": ["02", "02", "44", "00", 0, "2h"]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/ships/vulture.json b/ships/vulture.json
old mode 100644
new mode 100755
index 85edf8e..16e3848
--- a/ships/vulture.json
+++ b/ships/vulture.json
@@ -7,11 +7,11 @@
       "manufacturer": "Core Dynamics",
       "class": 1,
       "hullCost": 4689640,
-      "speed": 210,
-      "boost": 340,
+      "speed": 215,
+      "boost": 348,
       "boostEnergy": 17,
       "agility": 9,
-      "baseShieldStrength": 240,
+      "baseShieldStrength": 293,
       "baseArmour": 288,
       "hullMass": 230,
       "masslock": 10,
@@ -36,4 +36,4 @@
       "internal": ["4e", "02", 0, 0, "2h"]
     }
   }
-}
\ No newline at end of file
+}