diff --git a/config.py b/config.py
index 92631db4cc..85f79d026d 100644
--- a/config.py
+++ b/config.py
@@ -25,8 +25,8 @@
 # Version data
 version = "1.14.1"
 tag = "git"
-expansionName = "Galatea"
-expansionVersion = "1.2"
+expansionName = "Singularity"
+expansionVersion = "965413"
 evemonMinVersion = "4081"
 
 pyfaPath = None
diff --git a/eos/effects/battlecruiserdronespeed.py b/eos/effects/battlecruiserdronespeed.py
new file mode 100644
index 0000000000..2ce3247eab
--- /dev/null
+++ b/eos/effects/battlecruiserdronespeed.py
@@ -0,0 +1,9 @@
+# battlecruiserDroneSpeed
+#
+# Used by:
+# Ship: Myrmidon
+# Ship: Prophecy
+type = "passive"
+def handler(fit, ship, context):
+    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
+                                 "maxVelocity", ship.getModifiedItemAttr("roleBonusCBC"))
diff --git a/eos/effects/battlecruisermetrange.py b/eos/effects/battlecruisermetrange.py
new file mode 100644
index 0000000000..ca3ec3e7c8
--- /dev/null
+++ b/eos/effects/battlecruisermetrange.py
@@ -0,0 +1,10 @@
+# battlecruiserMETRange
+#
+# Used by:
+# Ships named like: Harbinger (2 of 2)
+type = "passive"
+def handler(fit, ship, context):
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Energy Turret"),
+                                  "maxRange", ship.getModifiedItemAttr("roleBonusCBC"))
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Energy Turret"),
+                                  "falloff", ship.getModifiedItemAttr("roleBonusCBC"))
diff --git a/eos/effects/battlecruisermhtrange.py b/eos/effects/battlecruisermhtrange.py
new file mode 100644
index 0000000000..6501a24053
--- /dev/null
+++ b/eos/effects/battlecruisermhtrange.py
@@ -0,0 +1,11 @@
+# battlecruiserMHTRange
+#
+# Used by:
+# Ships named like: Brutix (2 of 2)
+# Ship: Ferox
+type = "passive"
+def handler(fit, ship, context):
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
+                                  "maxRange", ship.getModifiedItemAttr("roleBonusCBC"))
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
+                                  "falloff", ship.getModifiedItemAttr("roleBonusCBC"))
diff --git a/eos/effects/battlecruisermissilerange.py b/eos/effects/battlecruisermissilerange.py
new file mode 100644
index 0000000000..153f1bf2dd
--- /dev/null
+++ b/eos/effects/battlecruisermissilerange.py
@@ -0,0 +1,9 @@
+# battlecruiserMissileRange
+#
+# Used by:
+# Ships named like: Drake (2 of 2)
+# Ship: Cyclone
+type = "passive"
+def handler(fit, skill, context):
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
+                                    "maxVelocity", skill.getModifiedItemAttr("roleBonusCBC"))
diff --git a/eos/effects/battlecruisermptrange.py b/eos/effects/battlecruisermptrange.py
new file mode 100644
index 0000000000..45c16ccd93
--- /dev/null
+++ b/eos/effects/battlecruisermptrange.py
@@ -0,0 +1,10 @@
+# battlecruiserMPTRange
+#
+# Used by:
+# Ships named like: Hurricane (2 of 2)
+type = "passive"
+def handler(fit, ship, context):
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"),
+                                  "maxRange", ship.getModifiedItemAttr("roleBonusCBC"))
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"),
+                                  "falloff", ship.getModifiedItemAttr("roleBonusCBC"))
diff --git a/eos/effects/boosterarmorhppenalty.py b/eos/effects/boosterarmorhppenalty.py
index 0d3a3ea05c..e7ccfb79c1 100644
--- a/eos/effects/boosterarmorhppenalty.py
+++ b/eos/effects/boosterarmorhppenalty.py
@@ -1,7 +1,7 @@
 # boosterArmorHpPenalty
 #
 # Used by:
-# Implants from group: Booster (12 of 37)
+# Implants from group: Booster (12 of 39)
 type = "boosterSideEffect"
 def handler(fit, booster, context):
     fit.ship.boostItemAttr("armorHP", booster.getModifiedItemAttr("boosterArmorHPPenalty"))
diff --git a/eos/effects/boosterarmorrepairamountpenalty.py b/eos/effects/boosterarmorrepairamountpenalty.py
index 4e3bb07387..6ecd643f62 100644
--- a/eos/effects/boosterarmorrepairamountpenalty.py
+++ b/eos/effects/boosterarmorrepairamountpenalty.py
@@ -1,7 +1,7 @@
 # boosterArmorRepairAmountPenalty
 #
 # Used by:
-# Implants from group: Booster (9 of 37)
+# Implants from group: Booster (9 of 39)
 type = "boosterSideEffect"
 def handler(fit, booster, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Armor Repair Unit",
diff --git a/eos/effects/boostermaxvelocitypenalty.py b/eos/effects/boostermaxvelocitypenalty.py
index 6a2be21a32..7c93397962 100644
--- a/eos/effects/boostermaxvelocitypenalty.py
+++ b/eos/effects/boostermaxvelocitypenalty.py
@@ -1,7 +1,7 @@
 # boosterMaxVelocityPenalty
 #
 # Used by:
-# Implants from group: Booster (12 of 37)
+# Implants from group: Booster (12 of 39)
 type = "boosterSideEffect"
 def handler(fit, booster, context):
     fit.ship.boostItemAttr("maxVelocity", booster.getModifiedItemAttr("boosterMaxVelocityPenalty"))
diff --git a/eos/effects/boostershieldcapacitypenalty.py b/eos/effects/boostershieldcapacitypenalty.py
index 642036e3de..a6b8f0b286 100644
--- a/eos/effects/boostershieldcapacitypenalty.py
+++ b/eos/effects/boostershieldcapacitypenalty.py
@@ -1,7 +1,7 @@
 # boosterShieldCapacityPenalty
 #
 # Used by:
-# Implants from group: Booster (12 of 37)
+# Implants from group: Booster (12 of 39)
 type = "boosterSideEffect"
 def handler(fit, booster, context):
     fit.ship.boostItemAttr("shieldCapacity", booster.getModifiedItemAttr("boosterShieldCapacityPenalty"))
diff --git a/eos/effects/boosterturretoptimalrangepenalty.py b/eos/effects/boosterturretoptimalrangepenalty.py
index 9881cf5019..2d556a4ddd 100644
--- a/eos/effects/boosterturretoptimalrangepenalty.py
+++ b/eos/effects/boosterturretoptimalrangepenalty.py
@@ -1,7 +1,7 @@
 # boosterTurretOptimalRangePenalty
 #
 # Used by:
-# Implants from group: Booster (9 of 37)
+# Implants from group: Booster (9 of 39)
 type = "boosterSideEffect"
 def handler(fit, booster, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
diff --git a/eos/effects/entosiscpuaddition.py b/eos/effects/entosiscpuaddition.py
new file mode 100644
index 0000000000..03f0405ae9
--- /dev/null
+++ b/eos/effects/entosiscpuaddition.py
@@ -0,0 +1,8 @@
+# entosisCPUAddition
+#
+# Used by:
+# Modules from group: Entosis Link (2 of 2)
+type = "passive"
+def handler(fit, module, context):
+    module.increaseItemAttr("cpu", module.getModifiedItemAttr("entosisCPUAdd"))
+
diff --git a/eos/effects/entosiscpupenalty.py b/eos/effects/entosiscpupenalty.py
new file mode 100644
index 0000000000..61a6175b97
--- /dev/null
+++ b/eos/effects/entosiscpupenalty.py
@@ -0,0 +1,8 @@
+# entosisCPUPenalty
+#
+# Used by:
+# Ships from group: Interceptor (10 of 10)
+type = "passive"
+def handler(fit, ship, context):
+    fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill("Infomorph Psychology"),
+                                     "entosisCPUAdd", ship.getModifiedItemAttr("entosisCPUPenalty"))
diff --git a/eos/effects/missileskillrapidlauncherrof.py b/eos/effects/missileskillrapidlauncherrof.py
index dc200dde2c..c0ac8e3bec 100644
--- a/eos/effects/missileskillrapidlauncherrof.py
+++ b/eos/effects/missileskillrapidlauncherrof.py
@@ -1,7 +1,7 @@
 # missileSkillRapidLauncherRoF
 #
 # Used by:
-# Implants named like: Cerebral Accelerator (3 of 3)
+# Implants named like: Cerebral Accelerator (3 of 5)
 # Implants named like: Zainou 'Deadeye' Rapid Launch RL (6 of 6)
 # Implant: Whelan Machorin's Ballistic Smartlink
 # Skill: Missile Launcher Operation
diff --git a/eos/effects/shipbonusprojectiletrackingmbc2.py b/eos/effects/shipbonusprojectiletrackingmbc2.py
new file mode 100644
index 0000000000..8add40a2bc
--- /dev/null
+++ b/eos/effects/shipbonusprojectiletrackingmbc2.py
@@ -0,0 +1,8 @@
+# shipBonusProjectileTrackingMBC2
+#
+# Used by:
+# Ship: Hurricane Fleet Issue
+type = "passive"
+def handler(fit, ship, context):
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"),
+                                  "trackingSpeed", ship.getModifiedItemAttr("shipBonusMBC2"), skill="Minmatar Battlecruiser")
diff --git a/eos/effects/shipbonuswdfgnullspeedeffects.py b/eos/effects/shipbonuswdfgnullpenalties.py
similarity index 95%
rename from eos/effects/shipbonuswdfgnullspeedeffects.py
rename to eos/effects/shipbonuswdfgnullpenalties.py
index 448c54db5b..da395b9b63 100644
--- a/eos/effects/shipbonuswdfgnullspeedeffects.py
+++ b/eos/effects/shipbonuswdfgnullpenalties.py
@@ -1,4 +1,4 @@
-# shipBonusWDFGnullSpeedEffects
+# shipBonusWDFGnullPenalties
 #
 # Used by:
 # Ship: Fiend
diff --git a/eos/effects/shipheavyassaultmissilevelocitycbc2.py b/eos/effects/shipheavyassaultmissilevelocitycbc2.py
deleted file mode 100644
index 9c93a602da..0000000000
--- a/eos/effects/shipheavyassaultmissilevelocitycbc2.py
+++ /dev/null
@@ -1,8 +0,0 @@
-# shipHeavyAssaultMissileVelocityCBC2
-#
-# Used by:
-# Ship: Drake Navy Issue
-type = "passive"
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"),
-                                    "maxVelocity", ship.getModifiedItemAttr("shipBonusCBC2"), skill="Caldari Battlecruiser")
diff --git a/eos/effects/shipheavymissilevelocitycbc2.py b/eos/effects/shipheavymissilevelocitycbc2.py
deleted file mode 100644
index 04e5963b61..0000000000
--- a/eos/effects/shipheavymissilevelocitycbc2.py
+++ /dev/null
@@ -1,8 +0,0 @@
-# shipHeavyMissileVelocityCBC2
-#
-# Used by:
-# Ship: Drake Navy Issue
-type = "passive"
-def handler(fit, ship, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
-                                    "maxVelocity", ship.getModifiedItemAttr("shipBonusCBC2"), skill="Caldari Battlecruiser")
diff --git a/eos/effects/shiphybriddmg1cbc2.py b/eos/effects/shiphybriddmg1cbc2.py
new file mode 100644
index 0000000000..82b916baa6
--- /dev/null
+++ b/eos/effects/shiphybriddmg1cbc2.py
@@ -0,0 +1,8 @@
+# shipHybridDmg1CBC2
+#
+# Used by:
+# Ship: Ferox
+type = "passive"
+def handler(fit, ship, context):
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
+                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusCBC2"), skill="Caldari Battlecruiser")
diff --git a/eos/effects/shipprojectilerof1mbc2.py b/eos/effects/shipprojectilerof1mbc2.py
index 77a329adb8..691116b52a 100644
--- a/eos/effects/shipprojectilerof1mbc2.py
+++ b/eos/effects/shipprojectilerof1mbc2.py
@@ -1,7 +1,7 @@
 # shipProjectileRof1MBC2
 #
 # Used by:
-# Ships named like: Hurricane (2 of 2)
+# Ship: Hurricane
 type = "passive"
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"),
diff --git a/eos/effects/shipshieldemresistance1cbc2.py b/eos/effects/shipshieldemresistance1cbc2.py
index 7bd2ae888d..596be5ef55 100644
--- a/eos/effects/shipshieldemresistance1cbc2.py
+++ b/eos/effects/shipshieldemresistance1cbc2.py
@@ -1,9 +1,8 @@
 # shipShieldEmResistance1CBC2
 #
 # Used by:
-# Variations of ship: Ferox (2 of 2)
-# Ship: Drake
-# Ship: Nighthawk
+# Variations of ship: Drake (3 of 3)
+# Ship: Vulture
 type = "passive"
 def handler(fit, ship, context):
     fit.ship.boostItemAttr("shieldEmDamageResonance", ship.getModifiedItemAttr("shipBonusCBC2"), skill="Caldari Battlecruiser")
diff --git a/eos/effects/shipshieldexplosiveresistance1cbc2.py b/eos/effects/shipshieldexplosiveresistance1cbc2.py
index 59ce3938b8..b682971f36 100644
--- a/eos/effects/shipshieldexplosiveresistance1cbc2.py
+++ b/eos/effects/shipshieldexplosiveresistance1cbc2.py
@@ -1,9 +1,8 @@
 # shipShieldExplosiveResistance1CBC2
 #
 # Used by:
-# Variations of ship: Ferox (2 of 2)
-# Ship: Drake
-# Ship: Nighthawk
+# Variations of ship: Drake (3 of 3)
+# Ship: Vulture
 type = "passive"
 def handler(fit, ship, context):
     fit.ship.boostItemAttr("shieldExplosiveDamageResonance", ship.getModifiedItemAttr("shipBonusCBC2"), skill="Caldari Battlecruiser")
diff --git a/eos/effects/shipshieldkineticresistance1cbc2.py b/eos/effects/shipshieldkineticresistance1cbc2.py
index 68572bf639..e6e90197e8 100644
--- a/eos/effects/shipshieldkineticresistance1cbc2.py
+++ b/eos/effects/shipshieldkineticresistance1cbc2.py
@@ -1,9 +1,8 @@
 # shipShieldKineticResistance1CBC2
 #
 # Used by:
-# Variations of ship: Ferox (2 of 2)
-# Ship: Drake
-# Ship: Nighthawk
+# Variations of ship: Drake (3 of 3)
+# Ship: Vulture
 type = "passive"
 def handler(fit, ship, context):
     fit.ship.boostItemAttr("shieldKineticDamageResonance", ship.getModifiedItemAttr("shipBonusCBC2"), skill="Caldari Battlecruiser")
diff --git a/eos/effects/shipshieldthermalresistance1cbc2.py b/eos/effects/shipshieldthermalresistance1cbc2.py
index 417b3aeacb..db0da414a3 100644
--- a/eos/effects/shipshieldthermalresistance1cbc2.py
+++ b/eos/effects/shipshieldthermalresistance1cbc2.py
@@ -1,9 +1,8 @@
 # shipShieldThermalResistance1CBC2
 #
 # Used by:
-# Variations of ship: Ferox (2 of 2)
-# Ship: Drake
-# Ship: Nighthawk
+# Variations of ship: Drake (3 of 3)
+# Ship: Vulture
 type = "passive"
 def handler(fit, ship, context):
     fit.ship.boostItemAttr("shieldThermalDamageResonance", ship.getModifiedItemAttr("shipBonusCBC2"), skill="Caldari Battlecruiser")
diff --git a/eos/effects/surgicalstrikedamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringgunnery.py b/eos/effects/surgicalstrikedamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringgunnery.py
index eb111421b9..3ede43e1fa 100644
--- a/eos/effects/surgicalstrikedamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringgunnery.py
+++ b/eos/effects/surgicalstrikedamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringgunnery.py
@@ -1,7 +1,7 @@
 # surgicalStrikeDamageMultiplierBonusPostPercentDamageMultiplierLocationShipModulesRequiringGunnery
 #
 # Used by:
-# Implants named like: Cerebral Accelerator (3 of 3)
+# Implants named like: Cerebral Accelerator (3 of 5)
 # Implants named like: Eifyr and Co. 'Gunslinger' Surgical Strike SS (6 of 6)
 type = "passive"
 def handler(fit, implant, context):
diff --git a/staticdata/eve.db b/staticdata/eve.db
index 785349e3fb..eb74112aa5 100644
Binary files a/staticdata/eve.db and b/staticdata/eve.db differ