diff --git a/eos/effects/modeagilitypostdiv.py b/eos/effects/modeagilitypostdiv.py
index 022951098..5faa5728e 100644
--- a/eos/effects/modeagilitypostdiv.py
+++ b/eos/effects/modeagilitypostdiv.py
@@ -1,7 +1,7 @@
 # modeAgilityPostDiv
 #
 # Used by:
-# Module: Amarr Tactical Destroyer Propulsion Mode
+# Modules named like: Propulsion Mode (2 of 2)
 type = "passive"
 def handler(fit, module, context):
     fit.ship.multiplyItemAttr("agility", 1/module.getModifiedItemAttr("modeAgilityPostDiv"),
diff --git a/eos/effects/modearmorresonancepostdiv.py b/eos/effects/modearmorresonancepostdiv.py
index af767b63b..676bdb0fa 100644
--- a/eos/effects/modearmorresonancepostdiv.py
+++ b/eos/effects/modearmorresonancepostdiv.py
@@ -1,7 +1,7 @@
 # modeArmorResonancePostDiv
 #
 # Used by:
-# Module: Amarr Tactical Destroyer Defense Mode
+# Modules named like: Defense Mode (2 of 2)
 type = "passive"
 def handler(fit, module, context):
     for resType in ("Em", "Explosive", "Kinetic"):
diff --git a/eos/effects/modemwdsigradiuspostdiv.py b/eos/effects/modemwdsigradiuspostdiv.py
new file mode 100644
index 000000000..7ebdf6ce1
--- /dev/null
+++ b/eos/effects/modemwdsigradiuspostdiv.py
@@ -0,0 +1,9 @@
+# modeMWDSigRadiusPostDiv
+#
+# Used by:
+# Module: Svipul Defense Mode
+type = "passive"
+def handler(fit, module, context):
+    fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("High Speed Maneuvering"),
+                                  "signatureRadiusBonus", 1/module.getModifiedItemAttr("modeMWDSigPenaltyPostDiv"),
+                                  stackingPenalties = True, penaltyGroup="postDiv")
\ No newline at end of file
diff --git a/eos/effects/modeshieldresonancepostdiv.py b/eos/effects/modeshieldresonancepostdiv.py
new file mode 100644
index 000000000..5186ac28a
--- /dev/null
+++ b/eos/effects/modeshieldresonancepostdiv.py
@@ -0,0 +1,15 @@
+# modeShieldResonancePostDiv
+#
+# Used by:
+# Module: Svipul Defense Mode
+type = "passive"
+def handler(fit, module, context):
+    for resType in ("Em", "Explosive", "Kinetic"):
+        fit.ship.multiplyItemAttr("shield{0}DamageResonance".format(resType),
+                            1/module.getModifiedItemAttr("mode{0}ResistancePostDiv".format(resType)),
+                            stackingPenalties = True, penaltyGroup="postDiv")
+
+    # Thermal != Thermic
+    fit.ship.multiplyItemAttr("shieldThermalDamageResonance",
+                            1/module.getModifiedItemAttr("modeThermicResistancePostDiv"),
+                            stackingPenalties = True, penaltyGroup="postDiv")
diff --git a/eos/effects/modesigradiuspostdiv.py b/eos/effects/modesigradiuspostdiv.py
index 72e955f73..c404686fb 100644
--- a/eos/effects/modesigradiuspostdiv.py
+++ b/eos/effects/modesigradiuspostdiv.py
@@ -1,7 +1,7 @@
 # modeSigRadiusPostDiv
 #
 # Used by:
-# Module: Amarr Tactical Destroyer Defense Mode
+# Module: Confessor Defense Mode
 type = "passive"
 def handler(fit, module, context):
     level = fit.character.getSkill("Minmatar Destroyer").level
diff --git a/eos/effects/modevelocitypostdiv.py b/eos/effects/modevelocitypostdiv.py
index a38c9ddb8..33b4d53f0 100644
--- a/eos/effects/modevelocitypostdiv.py
+++ b/eos/effects/modevelocitypostdiv.py
@@ -1,7 +1,7 @@
 # modeVelocityPostDiv
 #
 # Used by:
-# Module: Amarr Tactical Destroyer Propulsion Mode
+# Modules named like: Propulsion Mode (2 of 2)
 type = "passive"
 def handler(fit, module, context):
     fit.ship.multiplyItemAttr("maxVelocity", 1/module.getModifiedItemAttr("modeVelocityPostDiv"),
diff --git a/eos/effects/probelaunchercpupercentbonustacticaldestroyer.py b/eos/effects/probelaunchercpupercentbonustacticaldestroyer.py
index 1efb4913c..808c13098 100644
--- a/eos/effects/probelaunchercpupercentbonustacticaldestroyer.py
+++ b/eos/effects/probelaunchercpupercentbonustacticaldestroyer.py
@@ -1,7 +1,7 @@
 # probeLauncherCPUPercentBonusTacticalDestroyer
 #
 # Used by:
-# Ship: Confessor
+# Ships from group: Tactical Destroyer (2 of 2)
 type = "passive"
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Astrometrics"),
diff --git a/eos/effects/energytransferpowerneedbonuseffect.py b/eos/effects/remotecapacitortransmitterpowerneedbonuseffect.py
similarity index 86%
rename from eos/effects/energytransferpowerneedbonuseffect.py
rename to eos/effects/remotecapacitortransmitterpowerneedbonuseffect.py
index e40ba2002..b55a1c8b1 100644
--- a/eos/effects/energytransferpowerneedbonuseffect.py
+++ b/eos/effects/remotecapacitortransmitterpowerneedbonuseffect.py
@@ -1,4 +1,4 @@
-# energyTransferPowerNeedBonusEffect
+# remoteCapacitorTransmitterPowerNeedBonusEffect
 #
 # Used by:
 # Ships from group: Logistics (3 of 5)
diff --git a/eos/effects/shipheatdamageminmatartacticaldestroyer3.py b/eos/effects/shipheatdamageminmatartacticaldestroyer3.py
new file mode 100644
index 000000000..13607c1fa
--- /dev/null
+++ b/eos/effects/shipheatdamageminmatartacticaldestroyer3.py
@@ -0,0 +1,9 @@
+# shipHeatDamageMinmatarTacticalDestroyer3
+#
+# Used by:
+# Ship: Svipul
+type = "passive"
+def handler(fit, ship, context):
+    level = fit.character.getSkill("Minmatar Tactical Destroyer").level
+    fit.modules.filteredItemBoost(lambda mod: True, "heatDamage",
+                                  ship.getModifiedItemAttr("shipBonusTacticalDestroyerMinmatar3") * level)
diff --git a/eos/effects/shipmodemaxtargetrangepostdiv.py b/eos/effects/shipmodemaxtargetrangepostdiv.py
index d9cb50254..dc270213c 100644
--- a/eos/effects/shipmodemaxtargetrangepostdiv.py
+++ b/eos/effects/shipmodemaxtargetrangepostdiv.py
@@ -1,7 +1,7 @@
 # shipModeMaxTargetRangePostDiv
 #
 # Used by:
-# Module: Amarr Tactical Destroyer Sharpshooter Mode
+# Modules named like: Sharpshooter Mode (2 of 2)
 type = "passive"
 def handler(fit, module, context):
     fit.ship.multiplyItemAttr("maxTargetRange", 1/module.getModifiedItemAttr("modeMaxTargetRangePostDiv"),
diff --git a/eos/effects/shipmodescanrespostdiv.py b/eos/effects/shipmodescanrespostdiv.py
index 07db84ad5..b786e14c5 100644
--- a/eos/effects/shipmodescanrespostdiv.py
+++ b/eos/effects/shipmodescanrespostdiv.py
@@ -1,7 +1,7 @@
 # shipModeScanResPostDiv
 #
 # Used by:
-# Module: Amarr Tactical Destroyer Sharpshooter Mode
+# Modules named like: Sharpshooter Mode (2 of 2)
 type = "passive"
 def handler(fit, module, context):
     fit.ship.multiplyItemAttr("scanResolution", 1/module.getModifiedItemAttr("modeScanResPostDiv"),
diff --git a/eos/effects/shipmodescanstrengthpostdiv.py b/eos/effects/shipmodescanstrengthpostdiv.py
index cdf2b20f3..a8a4a3750 100644
--- a/eos/effects/shipmodescanstrengthpostdiv.py
+++ b/eos/effects/shipmodescanstrengthpostdiv.py
@@ -1,7 +1,7 @@
 # shipModeScanStrengthPostDiv
 #
 # Used by:
-# Module: Amarr Tactical Destroyer Sharpshooter Mode
+# Modules named like: Sharpshooter Mode (2 of 2)
 type = "passive"
 def handler(fit, module, context):
     fit.ship.multiplyItemAttr("scanRadarStrength", 1/module.getModifiedItemAttr("modeRadarStrengthPostDiv"),
diff --git a/eos/effects/shipmodesetoptimalrangepostdiv.py b/eos/effects/shipmodesetoptimalrangepostdiv.py
index bafceea86..2913a7a73 100644
--- a/eos/effects/shipmodesetoptimalrangepostdiv.py
+++ b/eos/effects/shipmodesetoptimalrangepostdiv.py
@@ -1,7 +1,7 @@
 # shipModeSETOptimalRangePostDiv
 #
 # Used by:
-# Module: Amarr Tactical Destroyer Sharpshooter Mode
+# Module: Confessor Sharpshooter Mode
 type = "passive"
 def handler(fit, module, context):
     fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Small Energy Turret"),
diff --git a/eos/effects/shipmodespttrackingpostdiv.py b/eos/effects/shipmodespttrackingpostdiv.py
new file mode 100644
index 000000000..125d94990
--- /dev/null
+++ b/eos/effects/shipmodespttrackingpostdiv.py
@@ -0,0 +1,9 @@
+# shipModeSPTTrackingPostDiv
+#
+# Used by:
+# Module: Svipul Sharpshooter Mode
+type = "passive"
+def handler(fit, module, context):
+    fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Small Projectile Turret"),
+                            "trackingSpeed", 1/module.getModifiedItemAttr("modeTrackingPostDiv"),
+                            stackingPenalties=True, penaltyGroup="postDiv")
diff --git a/eos/effects/shipsptdamageminmatartacticaldestroyer1.py b/eos/effects/shipsptdamageminmatartacticaldestroyer1.py
new file mode 100644
index 000000000..349767adf
--- /dev/null
+++ b/eos/effects/shipsptdamageminmatartacticaldestroyer1.py
@@ -0,0 +1,9 @@
+# shipSPTDamageMinmatarTacticalDestroyer1
+#
+# Used by:
+# Ship: Svipul
+type = "passive"
+def handler(fit, ship, context):
+    level = fit.character.getSkill("Minmatar Tactical Destroyer").level
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"),
+                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusTacticalDestroyerMinmatar1") * level)
diff --git a/eos/effects/shipsptoptimalminmatartacticaldestroyer2.py b/eos/effects/shipsptoptimalminmatartacticaldestroyer2.py
new file mode 100644
index 000000000..da0ff3d12
--- /dev/null
+++ b/eos/effects/shipsptoptimalminmatartacticaldestroyer2.py
@@ -0,0 +1,9 @@
+# shipSPTOptimalMinmatarTacticalDestroyer2
+#
+# Used by:
+# Ship: Svipul
+type = "passive"
+def handler(fit, ship, context):
+    level = fit.character.getSkill("Minmatar Tactical Destroyer").level
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"),
+                                  "maxRange", ship.getModifiedItemAttr("shipBonusTacticalDestroyerMinmatar2") * level)
diff --git a/service/conversions/releaseTiamat.py b/service/conversions/releaseTiamat.py
new file mode 100644
index 000000000..5aed8669b
--- /dev/null
+++ b/service/conversions/releaseTiamat.py
@@ -0,0 +1,17 @@
+"""
+Conversion pack for Tiamat Module Tiericide
+"""
+
+CONVERSIONS = {
+    "Enduring Cargo Scanner": "Type-E Enduring Cargo Scanner",
+    "Scoped Cargo Scanner": "PL-0 Scoped Cargo Scanner",
+    "Compact Ship Scanner": "Ta3 Compact Ship Scanner",
+    "Scoped Survey Scanner": "ML-3 Scoped Survey Scanner",
+    "Compact Light Missile Launcher": "Arbalest Compact Light Missile Launcher",
+    "Ample Light Missile Launcher": "TE-2100 Ample Light Missile Launcher",
+    "Compact Capacitor Flux Coil": "Mark I Compact Capacitor Flux Coil",
+    "Restrained Capacitor Flux Coil": "Type-D Restrained Capacitor Flux Coil",
+    "Compact Reactor Control Unit": "Mark I Compact Reactor Control Unit",
+    "Upgraded Co-Processor": "Photonic Upgraded Co-Processor",
+    "Compact Micro Auxiliary Power Core": "Vigor Compact Micro Auxiliary Power Core"
+}
diff --git a/service/market.py b/service/market.py
index f7b4b2666..3df36aec7 100644
--- a/service/market.py
+++ b/service/market.py
@@ -227,6 +227,7 @@ class Market():
             u"\u6bd2\u8725\u7ea7YC117\u5e74\u7279\u522b\u7248": False,
             u"\u4f0a\u4ec0\u5854\u7ea7YC117\u5e74\u7279\u522b\u7248": False,
             u"\u94f6\u9e70\u7ea7YC117\u5e74\u7279\u522b\u7248": False,
+            "Council Diplomatic Shuttle": False,  # Not sure yet
         }
 
         # do not publish ships that we convert
diff --git a/staticdata/icons/ships/34562.png b/staticdata/icons/ships/34562.png
new file mode 100644
index 000000000..56b777b71
Binary files /dev/null and b/staticdata/icons/ships/34562.png differ