diff --git a/gui/builtinViewColumns/display.py b/gui/builtinViewColumns/display.py
index 3a76dd9da..835d65d27 100644
--- a/gui/builtinViewColumns/display.py
+++ b/gui/builtinViewColumns/display.py
@@ -23,9 +23,9 @@ from gui.builtinViewColumns import *
 import sys
 
 class Display(wx.ListCtrl):
-    def __init__(self, parent):
+    def __init__(self, parent, style = 0):
 
-        wx.ListCtrl.__init__(self, parent, style=wx.LC_REPORT | wx.BORDER_NONE)
+        wx.ListCtrl.__init__(self, parent, style=wx.LC_REPORT | wx.BORDER_NONE | style)
 
         self.imageList = wx.ImageList(16, 16)
         self.SetImageList(self.imageList, wx.IMAGE_LIST_SMALL)
@@ -149,6 +149,10 @@ class Display(wx.ListCtrl):
             self.Select(sel)
         self.Thaw()
 
+    def update(self, stuff):
+        self.populate(stuff)
+        self.refresh(stuff)
+
     def getColumn(self, point):
         x = point[0]
         total = 0
diff --git a/gui/characterEditor.py b/gui/characterEditor.py
index 558089509..592472401 100644
--- a/gui/characterEditor.py
+++ b/gui/characterEditor.py
@@ -24,9 +24,11 @@ import wx.lib.newevent
 import wx.gizmos
 from gui import bitmapLoader
 import service
+import gui.builtinViewColumns.display as d
 import sys
 
 CharListUpdated, CHAR_LIST_UPDATED = wx.lib.newevent.NewEvent()
+CharChanged, CHAR_CHANGED = wx.lib.newevent.NewEvent()
 
 class CharacterEditor(wx.Dialog):
     def __init__(self, parent):
@@ -150,6 +152,8 @@ class CharacterEditor(wx.Dialog):
         else:
             self.unrestrict()
 
+        wx.PostEvent(self, CharChanged())
+
     def getActiveCharacter(self):
         selection = self.skillTreeChoice.GetCurrentSelection()
         return self.skillTreeChoice.GetClientData(selection) if selection is not None else None
@@ -360,10 +364,7 @@ class ImplantsTreeView (wx.Panel):
         self.btnRemove = wx.BitmapButton(self, wx.ID_REMOVE, wx.ArtProvider_GetBitmap(wx.ART_DELETE))
         buttonSizer.Add(self.btnRemove, 0)
 
-        self.pluggedImplantsTree = wx.TreeCtrl(self, wx.ID_ANY, style=wx.TR_DEFAULT_STYLE | wx.TR_HIDE_ROOT)
-        self.pluggedImplantsImageList = wx.ImageList(16, 16)
-        self.pluggedRoot = self.pluggedImplantsTree.AddRoot("Plugged")
-        self.pluggedImplantsTree.SetImageList(self.pluggedImplantsImageList)
+        self.pluggedImplantsTree = AvailableImplantsView(self, style=wx.LC_SINGLE_SEL)
 
         pmainSizer.Add(self.pluggedImplantsTree, 1, wx.ALL | wx.EXPAND, 5)
 
@@ -377,11 +378,37 @@ class ImplantsTreeView (wx.Panel):
                 if more:
                     self.availableImplantsTree.AppendItem(childId, "dummy")
 
+        self.availableImplantsTree.SortChildren(self.availableRoot)
+
         #Bind the event to replace dummies by real data
         self.availableImplantsTree.Bind(wx.EVT_TREE_ITEM_EXPANDING, self.expandLookup)
-        self.availableImplantsTree.SortChildren(self.availableRoot)
+
+        #Bind add & remove buttons
+        self.btnAdd.Bind(wx.EVT_BUTTON, self.addImplant)
+        self.btnRemove.Bind(wx.EVT_BUTTON, self.removeImplant)
+
+        #Bind the change of a character*
+        self.Parent.Parent.Bind(CHAR_CHANGED, self.charChanged)
+        self.Enable(False)
         self.Layout()
 
+    def update(self, implants):
+        self.implants = implants[:]
+        self.implants.sort(key=lambda i: int(i.getModifiedItemAttr("implantness")))
+        self.pluggedImplantsTree.update(self.implants)
+
+    def charChanged(self, event):
+        cChar = service.Character.getInstance()
+        charID = self.Parent.Parent.getActiveCharacter()
+        name = cChar.getCharName(charID)
+        if name == "All 0" or name == "All 5":
+            self.Enable(False)
+        else:
+            self.Enable(True)
+
+        self.update(cChar.getImplants(charID))
+        event.Skip()
+
     def expandLookup(self, event):
         tree = self.availableImplantsTree
         root = event.Item
@@ -410,6 +437,30 @@ class ImplantsTreeView (wx.Panel):
                 tree.AppendItem(root, name, iconId, data=wx.TreeItemData(id))
 
         tree.SortChildren(root)
+
+    def addImplant(self, event):
+        root = self.availableImplantsTree.GetSelection()
+        cChar = service.Character.getInstance()
+        charID = self.Parent.Parent.getActiveCharacter()
+        itemID = self.availableImplantsTree.GetPyData(root)
+        cChar.addImplant(charID, itemID)
+        self.update(cChar.getImplants(charID))
+
+    def removeImplant(self, event):
+        pos = self.pluggedImplantsTree.GetFirstSelected()
+        if pos != -1:
+            cChar = service.Character.getInstance()
+            charID = self.Parent.Parent.getActiveCharacter()
+            cChar.removeImplant(charID, self.implants[pos].slot)
+            self.update(cChar.getImplants(charID))
+
+class AvailableImplantsView(d.Display):
+    DEFAULT_COLS = ["Name",
+                    "attr:implantness"]
+
+    def __init__(self, parent, style):
+        d.Display.__init__(self, parent, style)
+
 class APIView (wx.Panel):
     def __init__(self, parent):
         wx.Panel.__init__ (self, parent, id=wx.ID_ANY, pos=wx.DefaultPosition, size=wx.Size(500, 300), style=wx.TAB_TRAVERSAL)
diff --git a/service/character.py b/service/character.py
index ad982c7f0..fbce164e0 100644
--- a/service/character.py
+++ b/service/character.py
@@ -109,3 +109,17 @@ class Character():
             skill.level = level
 
         eos.db.commit()
+
+    def addImplant(self, charID, itemID):
+        char = eos.db.getCharacter(charID)
+        implant = eos.types.Implant(eos.db.getItem(itemID))
+        char.implants.freeSlot(implant.slot)
+        char.implants.append(implant)
+
+    def removeImplant(self, charID, slot):
+        char = eos.db.getCharacter(charID)
+        char.implants.freeSlot(slot)
+
+    def getImplants(self, charID):
+        char = eos.db.getCharacter(charID)
+        return char.implants