diff --git a/eos/effects/armoredcommandmindlink.py b/eos/effects/armoredcommandmindlink.py
new file mode 100644
index 000000000..8c6362ae6
--- /dev/null
+++ b/eos/effects/armoredcommandmindlink.py
@@ -0,0 +1,7 @@
+type = "passive"
+def handler(fit, src, context):
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "warfareBuff2Value", src.getModifiedItemAttr("mindlinkBonus"))
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "warfareBuff1Value", src.getModifiedItemAttr("mindlinkBonus"))
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "warfareBuff4Value", src.getModifiedItemAttr("mindlinkBonus"))
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "warfareBuff3Value", src.getModifiedItemAttr("mindlinkBonus"))
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "buffDuration", src.getModifiedItemAttr("mindlinkBonus"))
diff --git a/eos/effects/informationcommandmindlink.py b/eos/effects/informationcommandmindlink.py
new file mode 100644
index 000000000..f049d4279
--- /dev/null
+++ b/eos/effects/informationcommandmindlink.py
@@ -0,0 +1,7 @@
+type = "passive"
+def handler(fit, src, context):
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Information Command"), "warfareBuff4Value", src.getModifiedItemAttr("mindlinkBonus"))
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Information Command"), "warfareBuff3Value", src.getModifiedItemAttr("mindlinkBonus"))
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Information Command"), "warfareBuff1Value", src.getModifiedItemAttr("mindlinkBonus"))
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Information Command"), "warfareBuff2Value", src.getModifiedItemAttr("mindlinkBonus"))
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command"), "buffDuration", src.getModifiedItemAttr("mindlinkBonus"))
diff --git a/eos/effects/miningforemanmindlink.py b/eos/effects/miningforemanmindlink.py
index 8ae84ef7d..f1b256243 100644
--- a/eos/effects/miningforemanmindlink.py
+++ b/eos/effects/miningforemanmindlink.py
@@ -1,9 +1,7 @@
-# miningForemanMindlink
-#
-# Used by:
-# Implant: Mining Foreman Mindlink
 type = "passive"
-def handler(fit, implant, context):
-    fit.character.getSkill("Mining Foreman").suppress()
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Director"),
-                                  "commandBonus", implant.getModifiedItemAttr("mindlinkBonus"))
\ No newline at end of file
+def handler(fit, src, context):
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff4Value", src.getModifiedItemAttr("mindlinkBonus"))
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff2Value", src.getModifiedItemAttr("mindlinkBonus"))
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff1Value", src.getModifiedItemAttr("mindlinkBonus"))
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff3Value", src.getModifiedItemAttr("mindlinkBonus"))
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "buffDuration", src.getModifiedItemAttr("mindlinkBonus"))
diff --git a/eos/effects/modulebonuswarfarelinkskirmish.py b/eos/effects/modulebonuswarfarelinkskirmish.py
index bdd6fb4a9..4236f0f54 100644
--- a/eos/effects/modulebonuswarfarelinkskirmish.py
+++ b/eos/effects/modulebonuswarfarelinkskirmish.py
@@ -2,5 +2,5 @@
 type = "passive"
 def handler(fit, src, context):
     print "Inside the MODULE"
-    print "1 ID/value", src.getModifiedChargeAttr("warfareBuff1ID"), src.getModifiedChargeAttr("warfareBuff1Value")
+    #print "1 ID/value", src.getModifiedChargeAttr("warfareBuff1ID"), src.getModifiedChargeAttr("warfareBuff1Value")
 
diff --git a/eos/effects/shieldcommandmindlink.py b/eos/effects/shieldcommandmindlink.py
new file mode 100644
index 000000000..89aba0dfc
--- /dev/null
+++ b/eos/effects/shieldcommandmindlink.py
@@ -0,0 +1,7 @@
+type = "passive"
+def handler(fit, src, context):
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff4Value", src.getModifiedItemAttr("mindlinkBonus"))
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff3Value", src.getModifiedItemAttr("mindlinkBonus"))
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff2Value", src.getModifiedItemAttr("mindlinkBonus"))
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff1Value", src.getModifiedItemAttr("mindlinkBonus"))
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "buffDuration", src.getModifiedItemAttr("mindlinkBonus"))
diff --git a/eos/effects/skirmishcommandmindlink.py b/eos/effects/skirmishcommandmindlink.py
new file mode 100644
index 000000000..0eeebb8f4
--- /dev/null
+++ b/eos/effects/skirmishcommandmindlink.py
@@ -0,0 +1,7 @@
+type = "passive"
+def handler(fit, src, context):
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), "warfareBuff3Value", src.getModifiedItemAttr("mindlinkBonus"))
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), "warfareBuff4Value", src.getModifiedItemAttr("mindlinkBonus"))
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), "warfareBuff2Value", src.getModifiedItemAttr("mindlinkBonus"))
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), "warfareBuff1Value", src.getModifiedItemAttr("mindlinkBonus"))
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), "buffDuration", src.getModifiedItemAttr("mindlinkBonus"))