diff --git a/modules/hardpoints/ax_missile_rack_enhanced.json b/modules/hardpoints/ax_missile_rack_enhanced.json
index 1bf1f59..c442777 100644
--- a/modules/hardpoints/ax_missile_rack_enhanced.json
+++ b/modules/hardpoints/ax_missile_rack_enhanced.json
@@ -129,4 +129,4 @@
         "symbol": "Hpt_ATDumbfireMissile_Turret_Large_v2"
       }
     ]
-  }
\ No newline at end of file
+  }
diff --git a/modules/hardpoints/cannon.json b/modules/hardpoints/cannon.json
index 8447c1f..c179e46 100644
--- a/modules/hardpoints/cannon.json
+++ b/modules/hardpoints/cannon.json
@@ -346,6 +346,41 @@
       "shotspeed": 750,
       "thermload": 4.4,
       "symbol": "Hpt_Cannon_Gimbal_Huge"
+    },
+    {
+      "ammo": 300,
+      "breachdmg": 13.9,
+      "breachmax": 0.9,
+      "breachmin": 0.6,
+      "burst": 3,
+      "burstrof": 4,
+      "class": 2,
+      "clip": 9,
+      "cost": 314620,
+      "damage": 14.6,
+      "damagedist": {
+        "K": 1
+      },
+      "distdraw": 0.75,
+      "edID": 129030051,
+      "falloff": 3500,
+      "fireint": 1.1,
+      "eps": 0.688,
+      "grp": "c",
+      "hps": 1.76,
+      "id": "4w",
+      "integrity": 51,
+      "mass": 4,
+      "mount": "G",
+      "name": "Concord Cannon",
+      "piercing": 42,
+      "power": 0.64,
+      "range": 3500,
+      "rating": "D",
+      "reload": 4,
+      "shotspeed": 1300,
+      "thermload": 1.9,
+      "symbol": "Hpt_Cannon_Gimbal_Medium_Burst"
     }
   ]
 }
diff --git a/modules/hardpoints/fragment_cannon.json b/modules/hardpoints/fragment_cannon.json
index bd6cabc..d2d0541 100644
--- a/modules/hardpoints/fragment_cannon.json
+++ b/modules/hardpoints/fragment_cannon.json
@@ -325,6 +325,7 @@
       "piercing": 45,
       "power": 1.02,
       "pp": "Zachary Hudson",
+      "range": 3000,
       "rating": "C",
       "reload": 5,
       "roundspershot": 12,
diff --git a/modules/hardpoints/nanite_torpedo_pylon.json b/modules/hardpoints/nanite_torpedo_pylon.json
index 06a62c6..cd32652 100644
--- a/modules/hardpoints/nanite_torpedo_pylon.json
+++ b/modules/hardpoints/nanite_torpedo_pylon.json
@@ -55,4 +55,4 @@
         "symbol": "Hpt_ATVentDisruptorPylon_Fixed_Large"
       }
     ]
-  }
\ No newline at end of file
+  }
diff --git a/ships/index.js b/ships/index.js
index ed44a03..958436d 100644
--- a/ships/index.js
+++ b/ships/index.js
@@ -28,6 +28,7 @@ module.exports = {
   krait_phantom: require('./krait_phantom').krait_phantom,
   orca: require('./orca').orca,
   mamba: require('./mamba').mamba,
+  mandalay: require('./mandalay').mandalay,
   python: require('./python').python,
   python_nx: require('./python_nx').python_nx,
   sidewinder: require('./sidewinder').sidewinder,
diff --git a/ships/mandalay.json b/ships/mandalay.json
new file mode 100755
index 0000000..0fd8c1a
--- /dev/null
+++ b/ships/mandalay.json
@@ -0,0 +1,167 @@
+{
+  "mandalay": {
+    "edID": 129030680,
+    "properties": {
+      "name": "Mandalay",
+      "manufacturer": "Zorgon Peterson",
+      "class": 2,
+      "hullCost": 14502616,
+      "speed": 280,
+      "heatCapacity": 250,
+      "boost": 350,
+      "boostEnergy": 14,
+      "baseShieldStrength": 220,
+      "baseArmour": 230,
+      "hardness": 55,
+      "hullMass": 230,
+      "masslock": 11,
+      "pipSpeed": 0.16666666666667,
+      "pitch": 35,
+      "roll": 96,
+      "yaw": 28,
+      "crew": 2,
+      "reserveFuelCapacity": 0.52
+    },
+    "retailCost": 17639221,
+    "bulkheads": [
+      {
+        "id": "Bs",
+        "edID": 129030681,
+        "grp": "bh",
+        "cost": 0,
+        "mass": 0,
+        "causres": 0,
+        "explres": -0.4,
+        "kinres": -0.2,
+        "thermres": 0,
+        "hullboost": 0.8
+      },
+      {
+        "id": "Bt",
+        "edID": 129030682,
+        "grp": "bh",
+        "cost": 6191367,
+        "mass": 32,
+        "causres": 0,
+        "explres": -0.4,
+        "kinres": -0.2,
+        "thermres": 0,
+        "hullboost": 1.52
+      },
+      {
+        "id": "Bu",
+        "edID": 129030683,
+        "grp": "bh",
+        "cost": 13930575,
+        "mass": 63,
+        "causres": 0,
+        "explres": -0.4,
+        "kinres": -0.2,
+        "thermres": 0,
+        "hullboost": 2.5
+      },
+      {
+        "id": "Bv",
+        "edID": 129030684,
+        "grp": "bh",
+        "cost": 32922590,
+        "mass": 63,
+        "causres": 0,
+        "explres": -0.5,
+        "kinres": -0.75,
+        "thermres": 0.5,
+        "hullboost": 2.5
+      },
+      {
+        "id": "Bw",
+        "edID": 129030685,
+        "grp": "bh",
+        "cost": 36482626,
+        "mass": 63,
+        "causres": 0,
+        "explres": 0.2,
+        "kinres": 0.25,
+        "thermres": -0.4,
+        "hullboost": 2.5
+      }
+    ],
+    "slots": {
+      "standard": [
+        5,
+        5,
+        5,
+        4,
+        5,
+        5,
+        5
+      ],
+      "hardpoints": [
+        2,
+        2,
+        2,
+        2,
+        1,
+        1,
+        0,
+        0,
+        0,
+        0
+      ],
+      "internal": [
+        6,
+        5,
+        4,
+        4,
+        3,
+        3,
+        2,
+        1,
+        1,
+        1,
+        {
+          "class": 1,
+          "name": "PlanetaryApproachSuite",
+          "eligible": {
+            "pas": 1
+          }
+        }
+      ]
+    },
+    "defaults": {
+      "standard": [
+        "5E",
+        "5E",
+        "FN",
+        "4E",
+        "5E",
+        "5E",
+        "5C"
+      ],
+      "hardpoints": [
+        0,
+        0,
+        0,
+        0,
+        17,
+        17,
+        0,
+        0,
+        0,
+        0
+      ],
+      "internal": [
+        "04",
+        "4e",
+        "02",
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        "3w",
+        "4F"
+      ]
+    }
+  }
+}