diff --git a/README.md b/README.md
index 2e09ca7f0..2b3170fc9 100644
--- a/README.md
+++ b/README.md
@@ -15,12 +15,8 @@ The latest version along with release notes can always be found on the project's
 Windows and OS X users are supplied self-contained builds of pyfa on the [latest releases](https://github.com/pyfa-org/Pyfa/releases/latest) page. An `.exe` installer is also available for Windows builds. Linux users can run pyfa using their distribution's Python interpreter. There is no official self-contained package for Linux, however, there are a number of third-party packages available through distribution-specific repositories.
 
 #### OS X
-There are two different distributives for OS X: `-mac` and `-mac-deprecated`. 
 
-* `-mac`: based on wxPython 3.0.2.0 and has updated libraries. This is the recommended build.
-* `-mac-deprecated`: utilizes older binaries running on wxPython 2.8; because of this, some features are not available (currently CREST support and Attribute Overrides). Additionally, as development happens primarily on wxPython 3.0, a few GUI bugs may pop up as `-mac-deprecated` is not actively tested. However, due to some general issues with wxPython 3.0, especially on some newer OS X versions, `-mac-deprecated` is still offered for those that need it.
-
-There is also a [Homebrew](http://brew.sh) option for installing pyfa on OS X. Please note this is maintained by a third-party and is not tested by pyfa developers. Simply fire up in terminal:
+Apart from the official release, there is also a [Homebrew](http://brew.sh) option for installing pyfa on OS X. Please note this is maintained by a third-party and is not tested by pyfa developers. Simply fire up in terminal:
 ```
 $ brew install Caskroom/cask/pyfa
 ```
diff --git a/config.py b/config.py
index 07eb94e37..818c25b9f 100644
--- a/config.py
+++ b/config.py
@@ -24,8 +24,8 @@ saveInRoot = False
 
 # Version data
 
-version = "2.0.0b5"
-tag = "git"
+version = "2.0.2"
+tag = "Stable"
 expansionName = "YC120.3"
 expansionVersion = "1.8"
 evemonMinVersion = "4081"
@@ -42,7 +42,6 @@ logging_setup = None
 cipher = None
 clientHash = None
 
-ESI_AUTH_PROXY = "https://www.pyfa.io" # "http://localhost:5015"
 ESI_CACHE = 'esi_cache'
 
 LOGLEVEL_MAP = {
@@ -141,7 +140,7 @@ def defPaths(customSavePath=None):
     #    os.environ["SSL_CERT_FILE"] = os.path.join(pyfaPath, "cacert.pem")
 
     # The database where we store all the fits etc
-    saveDB = os.path.join(savePath, "saveddata-py3-dev.db")
+    saveDB = os.path.join(savePath, "saveddata.db")
 
     # The database where the static EVE data from the datadump is kept.
     # This is not the standard sqlite datadump but a modified version created by eos
diff --git a/dist_assets/mac/pyfa.spec b/dist_assets/mac/pyfa.spec
index a3214b3d3..da72e4681 100644
--- a/dist_assets/mac/pyfa.spec
+++ b/dist_assets/mac/pyfa.spec
@@ -30,6 +30,8 @@ added_files = [
 
 import_these = []
 
+icon = os.path.join(os.getcwd(), "dist_assets", "mac", "pyfa.icns")
+
 # Walk directories that do dynamic importing
 paths = ('eos/effects', 'eos/db/migrations', 'service/conversions')
 for root, folders, files in chain.from_iterable(os.walk(path) for path in paths):
@@ -65,10 +67,10 @@ exe = EXE(pyz,
           upx=True,
           runtime_tmpdir=None,
           console=False ,
-          icon='dist_assets/mac/pyfa.icns',
+          icon=icon,
           )
 
 app = BUNDLE(exe,
              name='pyfa.app',
-             icon=None,
+             icon=icon,
              bundle_identifier=None)
\ No newline at end of file
diff --git a/dist_assets/win/dist.py b/dist_assets/win/dist.py
new file mode 100644
index 000000000..a34ed3140
--- /dev/null
+++ b/dist_assets/win/dist.py
@@ -0,0 +1,46 @@
+# helper script to zip up pyinstaller distribution and create installer file
+
+import os.path
+from subprocess import call
+import zipfile
+
+
+def zipdir(path, zip):
+    for root, dirs, files in os.walk(path):
+        for file in files:
+            zip.write(os.path.join(root, file))
+
+config = {}
+
+exec(compile(open("config.py").read(), "config.py", 'exec'), config)
+
+iscc =  "C:\Program Files (x86)\Inno Setup 5\ISCC.exe" # inno script location via wine
+
+print("Creating archive")
+
+source = os.path.join(os.getcwd(), "dist", "pyfa")
+
+fileName = "pyfa-{}-{}-{}-win".format(
+    config['version'],
+    config['expansionName'].lower(),
+    config['expansionVersion']
+)
+
+archive = zipfile.ZipFile(os.path.join(os.getcwd(), "dist", fileName + ".zip"), 'w', compression=zipfile.ZIP_DEFLATED)
+zipdir(source, archive)
+archive.close()
+
+print("Compiling EXE")
+
+expansion = "%s %s" % (config['expansionName'], config['expansionVersion']),
+
+call([
+    iscc,
+    os.path.join(os.getcwd(), "dist_assets", "win", "pyfa-setup.iss"),
+    "/dMyAppVersion=%s" % (config['version']),
+    "/dMyAppExpansion=%s" % (expansion),
+    "/dMyAppDir=%s" % source,
+    "/dMyOutputDir=%s" % os.path.join(os.getcwd(), "dist"),
+    "/dMyOutputFile=%s" % fileName])  # stdout=devnull, stderr=devnull
+
+print("Done")
diff --git a/scripts/pyfa-setup.iss b/dist_assets/win/pyfa-setup.iss
similarity index 91%
rename from scripts/pyfa-setup.iss
rename to dist_assets/win/pyfa-setup.iss
index 9c25f11f2..3d3e3df2d 100644
--- a/scripts/pyfa-setup.iss
+++ b/dist_assets/win/pyfa-setup.iss
@@ -19,7 +19,8 @@
 #define MyAppExeName "pyfa.exe"
 
 ; What version starts with the new structure (1.x.0). This is used to determine if we run directory structure cleanup
-#define VersionFlag 16
+#define MajorVersionFlag 2
+#define MinorVersionFlag 0
 
 #ifndef MyOutputFile
     #define MyOutputFile LowerCase(StringChange(MyAppName+'-'+MyAppVersion+'-'+MyAppExpansion+'-win-wx3', " ", "-"))
@@ -138,15 +139,19 @@ var
   V: Integer;
   iResultCode: Integer;
   sUnInstallString: string;
-  iOldVersion: Cardinal;
+  iOldVersionMajor: Cardinal;
+  iOldVersionMinor: Cardinal;
 begin
   Result := True; // in case when no previous version is found
   if RegValueExists(HKEY_LOCAL_MACHINE,'Software\Microsoft\Windows\CurrentVersion\Uninstall\{3DA39096-C08D-49CD-90E0-1D177F32C8AA}_is1', 'UninstallString') then  //Your App GUID/ID
   begin
     RegQueryDWordValue(HKEY_LOCAL_MACHINE,
       'Software\Microsoft\Windows\CurrentVersion\Uninstall\{3DA39096-C08D-49CD-90E0-1D177F32C8AA}_is1',
-      'MinorVersion', iOldVersion);
-    if iOldVersion < {#VersionFlag} then // If old version with old structure is installed.
+      'MajorVersion', iOldVersionMajor);
+    RegQueryDWordValue(HKEY_LOCAL_MACHINE,
+      'Software\Microsoft\Windows\CurrentVersion\Uninstall\{3DA39096-C08D-49CD-90E0-1D177F32C8AA}_is1',
+      'MinorVersion', iOldVersionMinor);
+    if (iOldVersionMajor < {#MajorVersionFlag}) or ((iOldVersionMajor = {#MajorVersionFlag}) and (iOldVersionMinor < {#MinorVersionFlag})) then // If old version with old structure is installed.
     begin
       V := MsgBox(ExpandConstant('An old version of pyfa was detected. Due to recent changes in the application structure, you must uninstall the previous version first. This will not affect your user data (saved fittings, characters, etc.). Do you want to uninstall now?'), mbInformation, MB_YESNO); //Custom Message if App installed
       if V = IDYES then
diff --git a/dist_assets/win/pyfa.spec b/dist_assets/win/pyfa.spec
index 70eb4673d..445f94824 100644
--- a/dist_assets/win/pyfa.spec
+++ b/dist_assets/win/pyfa.spec
@@ -79,4 +79,5 @@ coll = COLLECT(
                upx=True,
                name='pyfa',
                icon='dist_assets/win/pyfa.ico',
-               )
\ No newline at end of file
+               )
+
diff --git a/eos/db/saveddata/character.py b/eos/db/saveddata/character.py
index 739a34a98..850c41c6e 100644
--- a/eos/db/saveddata/character.py
+++ b/eos/db/saveddata/character.py
@@ -29,9 +29,6 @@ from eos.saveddata.user import User
 from eos.saveddata.character import Character, Skill
 from eos.saveddata.ssocharacter import SsoCharacter
 
-
-
-
 characters_table = Table("characters", saveddata_meta,
                          Column("ID", Integer, primary_key=True),
                          Column("name", String, nullable=False),
diff --git a/eos/effects/structurerigaoevelocitybonussingletargetmissiles.py b/eos/effects/structurerigaoevelocitybonussingletargetmissiles.py
index 6d4503ec7..2bf5f4af0 100644
--- a/eos/effects/structurerigaoevelocitybonussingletargetmissiles.py
+++ b/eos/effects/structurerigaoevelocitybonussingletargetmissiles.py
@@ -5,6 +5,6 @@ type = "passive"
 def handler(fit, src, context):
     groups = ("Structure Anti-Subcapital Missile", "Structure Anti-Capital Missile")
 
-    fit.modules.filteredItemBoost(lambda mod: mod.charge.group.name in groups,
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.group.name in groups,
                                   "aoeVelocity", src.getModifiedItemAttr("structureRigMissileExploVeloBonus"),
                                   stackingPenalties=True)
diff --git a/eos/effects/structurerigvelocitybonussingletargetmissiles.py b/eos/effects/structurerigvelocitybonussingletargetmissiles.py
index 1af82afd0..929cc7a3e 100644
--- a/eos/effects/structurerigvelocitybonussingletargetmissiles.py
+++ b/eos/effects/structurerigvelocitybonussingletargetmissiles.py
@@ -4,6 +4,6 @@ type = "passive"
 
 def handler(fit, src, context):
     groups = ("Structure Anti-Subcapital Missile", "Structure Anti-Capital Missile")
-    fit.modules.filteredItemBoost(lambda mod: mod.charge.group.name in groups,
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.group.name in groups,
                                   "maxVelocity", src.getModifiedItemAttr("structureRigMissileVelocityBonus"),
                                   stackingPenalties=True)
diff --git a/eos/effects/warpscrambleblockmwdwithnpceffect.py b/eos/effects/warpscrambleblockmwdwithnpceffect.py
index 89c97117e..27a82548a 100644
--- a/eos/effects/warpscrambleblockmwdwithnpceffect.py
+++ b/eos/effects/warpscrambleblockmwdwithnpceffect.py
@@ -17,8 +17,8 @@ def handler(fit, module, context):
     # this is such a dirty hack
     for mod in fit.modules:
         if not mod.isEmpty and mod.state > State.ONLINE and (
-                mod.item.requiresSkill("Micro Jump Drive Operation")
-                or mod.item.requiresSkill("High Speed Maneuvering")
+                mod.item.requiresSkill("Micro Jump Drive Operation") or
+                mod.item.requiresSkill("High Speed Maneuvering")
         ):
             mod.state = State.ONLINE
         if not mod.isEmpty and mod.item.requiresSkill("Micro Jump Drive Operation") and mod.state > State.ONLINE:
diff --git a/eos/saveddata/character.py b/eos/saveddata/character.py
index 05ff456fa..9edb866e8 100644
--- a/eos/saveddata/character.py
+++ b/eos/saveddata/character.py
@@ -52,7 +52,6 @@ class Character(object):
                 self.addSkill(Skill(self, item.ID, self.defaultLevel))
 
         self.__implants = HandledImplantBoosterList()
-        self.apiKey = None
 
     @reconstructor
     def init(self):
@@ -171,7 +170,6 @@ class Character(object):
                 if x.client == clientHash:
                     self.__ssoCharacters.remove(x)
 
-
     def getSsoCharacter(self, clientHash):
         return next((x for x in self.__ssoCharacters if x.client == clientHash), None)
 
@@ -274,20 +272,17 @@ class Character(object):
 
     def __deepcopy__(self, memo):
         copy = Character("%s copy" % self.name, initSkills=False)
-        copy.apiKey = self.apiKey
-        copy.apiID = self.apiID
 
         for skill in self.skills:
             copy.addSkill(Skill(copy, skill.itemID, skill.level, False, skill.learned))
 
         return copy
 
-    @validates("ID", "name", "apiKey", "ownerID")
+    @validates("ID", "name", "ownerID")
     def validator(self, key, val):
         map = {
             "ID"     : lambda _val: isinstance(_val, int),
             "name"   : lambda _val: True,
-            "apiKey" : lambda _val: _val is None or (isinstance(_val, str) and len(_val) > 0),
             "ownerID": lambda _val: isinstance(_val, int) or _val is None
         }
 
diff --git a/eos/saveddata/fit.py b/eos/saveddata/fit.py
index 45ad6171d..cb5bedcf9 100644
--- a/eos/saveddata/fit.py
+++ b/eos/saveddata/fit.py
@@ -1143,14 +1143,16 @@ class Fit(object):
                                 except AttributeError:
                                     usesCap = False
 
-                                cycleTime = mod.rawCycleTime
-                                amount = mod.getModifiedItemAttr(groupAttrMap[mod.item.group.name])
                                 # Normal Repairers
                                 if usesCap and not mod.charge:
+                                    cycleTime = mod.rawCycleTime
+                                    amount = mod.getModifiedItemAttr(groupAttrMap[mod.item.group.name])
                                     sustainable[attr] -= amount / (cycleTime / 1000.0)
                                     repairers.append(mod)
                                 # Ancillary Armor reps etc
                                 elif usesCap and mod.charge:
+                                    cycleTime = mod.rawCycleTime
+                                    amount = mod.getModifiedItemAttr(groupAttrMap[mod.item.group.name])
                                     if mod.charge.name == "Nanite Repair Paste":
                                         multiplier = mod.getModifiedItemAttr("chargedArmorDamageMultiplier") or 1
                                     else:
@@ -1158,7 +1160,9 @@ class Fit(object):
                                     sustainable[attr] -= amount * multiplier / (cycleTime / 1000.0)
                                     repairers.append(mod)
                                 # Ancillary Shield boosters etc
-                                elif not usesCap:
+                                elif not usesCap and mod.item.group.name in ("Ancillary Shield Booster", "Ancillary Remote Shield Booster"):
+                                    cycleTime = mod.rawCycleTime
+                                    amount = mod.getModifiedItemAttr(groupAttrMap[mod.item.group.name])
                                     if self.factorReload and mod.charge:
                                         reloadtime = mod.reloadTime
                                     else:
diff --git a/eos/saveddata/module.py b/eos/saveddata/module.py
index 054828dae..4547f49de 100644
--- a/eos/saveddata/module.py
+++ b/eos/saveddata/module.py
@@ -144,10 +144,11 @@ class Module(HandledItem, HandledCharge, ItemAttrShortcut, ChargeAttrShortcut):
         return empty
 
     @classmethod
-    def buildRack(cls, slot):
+    def buildRack(cls, slot, num=None):
         empty = Rack(None)
         empty.__slot = slot
         empty.dummySlot = slot
+        empty.num = num
         return empty
 
     @property
@@ -799,6 +800,7 @@ class Module(HandledItem, HandledCharge, ItemAttrShortcut, ChargeAttrShortcut):
 class Rack(Module):
     """
     This is simply the Module class named something else to differentiate
-    it for app logic. This class does not do anything special
+    it for app logic. The only thing interesting about it is the num property,
+    which is the number of slots for this rack
     """
-    pass
+    num = None
diff --git a/eos/saveddata/ssocharacter.py b/eos/saveddata/ssocharacter.py
index 9ffed8d46..04b57bdc9 100644
--- a/eos/saveddata/ssocharacter.py
+++ b/eos/saveddata/ssocharacter.py
@@ -32,24 +32,15 @@ class SsoCharacter(object):
         self.accessToken = accessToken
         self.refreshToken = refreshToken
         self.accessTokenExpires = None
-        self.esi_client = None
-
 
     @reconstructor
     def init(self):
-        self.esi_client = None
-
-    def get_sso_data(self):
-        """ Little "helper" function to get formated data for esipy security
-        """
-        return {
-            'access_token': self.accessToken,
-            'refresh_token': self.refreshToken,
-            'expires_in': (
-                self.accessTokenExpires - datetime.datetime.utcnow()
-            ).total_seconds()
-        }
+        pass
 
+    def is_token_expired(self):
+        if self.accessTokenExpires is None:
+            return True
+        return datetime.datetime.now() >= self.accessTokenExpires
 
     def __repr__(self):
         return "SsoCharacter(ID={}, name={}, client={}) at {}".format(
diff --git a/gui/builtinContextMenus/moduleAmmoPicker.py b/gui/builtinContextMenus/moduleAmmoPicker.py
index 47a6fc87d..69b5e43b8 100644
--- a/gui/builtinContextMenus/moduleAmmoPicker.py
+++ b/gui/builtinContextMenus/moduleAmmoPicker.py
@@ -58,9 +58,9 @@ class ModuleAmmoPicker(ContextMenu):
 
     def turretSorter(self, charge):
         damage = 0
-        range_ = (self.module.getModifiedItemAttr("maxRange")) * \
+        range_ = (self.module.item.getAttribute("maxRange")) * \
                  (charge.getAttribute("weaponRangeMultiplier") or 1)
-        falloff = (self.module.getModifiedItemAttr("falloff")) * \
+        falloff = (self.module.item.getAttribute("falloff")) * \
                   (charge.getAttribute("fallofMultiplier") or 1)
         for type_ in self.DAMAGE_TYPES:
             d = charge.getAttribute("%sDamage" % type_)
diff --git a/gui/builtinPreferenceViews/pyfaEsiPreferences.py b/gui/builtinPreferenceViews/pyfaEsiPreferences.py
index 029003a83..7eaf31a4e 100644
--- a/gui/builtinPreferenceViews/pyfaEsiPreferences.py
+++ b/gui/builtinPreferenceViews/pyfaEsiPreferences.py
@@ -43,23 +43,65 @@ class PFEsiPref(PreferenceView):
         rbSizer = wx.BoxSizer(wx.HORIZONTAL)
         self.rbMode = wx.RadioBox(panel, -1, "Login Authentication Method", wx.DefaultPosition, wx.DefaultSize,
                                   ['Local Server', 'Manual'], 1, wx.RA_SPECIFY_COLS)
-        self.rbMode.SetItemToolTip(0, "This options starts a local webserver that the web application will call back to with information about the character login.")
-        self.rbMode.SetItemToolTip(1, "This option prompts users to copy and paste information from the web application to allow for character login. Use this if having issues with the local server.")
-        # self.rbServer = wx.RadioBox(panel, -1, "Server", wx.DefaultPosition, wx.DefaultSize,
-        #                             ['Tranquility', 'Singularity'], 1, wx.RA_SPECIFY_COLS)
+        self.rbMode.SetItemToolTip(0, "This options starts a local webserver that the web application will call back to"
+                                      " with information about the character login.")
+        self.rbMode.SetItemToolTip(1, "This option prompts users to copy and paste information from the web application "
+                                      "to allow for character login. Use this if having issues with the local server.")
+
+        self.rbSsoMode = wx.RadioBox(panel, -1, "SSO Mode", wx.DefaultPosition, wx.DefaultSize,
+                                     ['pyfa.io', 'Custom application'], 1, wx.RA_SPECIFY_COLS)
+        self.rbSsoMode.SetItemToolTip(0, "This options routes SSO Logins through pyfa.io, allowing you to easily login "
+                                         "without any configuration. When in doubt, use this option.")
+        self.rbSsoMode.SetItemToolTip(1, "This option goes through EVE SSO directly, but requires more configuration. Use "
+                                         "this is pyfa.io is blocked for some reason, or if you do not wish to route data throguh pyfa.io.")
 
         self.rbMode.SetSelection(self.settings.get('loginMode'))
-        # self.rbServer.SetSelection(self.settings.get('server'))
+        self.rbSsoMode.SetSelection(self.settings.get('ssoMode'))
 
+        rbSizer.Add(self.rbSsoMode, 1, wx.ALL, 5)
         rbSizer.Add(self.rbMode, 1, wx.TOP | wx.RIGHT, 5)
-        # rbSizer.Add(self.rbServer, 1, wx.ALL, 5)
 
         self.rbMode.Bind(wx.EVT_RADIOBOX, self.OnModeChange)
-        # self.rbServer.Bind(wx.EVT_RADIOBOX, self.OnServerChange)
+        self.rbSsoMode.Bind(wx.EVT_RADIOBOX, self.OnSSOChange)
 
         mainSizer.Add(rbSizer, 1, wx.ALL | wx.EXPAND, 0)
 
-        timeoutSizer = wx.BoxSizer(wx.HORIZONTAL)
+        detailsTitle = wx.StaticText(panel, wx.ID_ANY, "Custom Application", wx.DefaultPosition, wx.DefaultSize, 0)
+        detailsTitle.Wrap(-1)
+        detailsTitle.SetFont(wx.Font(12, 70, 90, 90, False, wx.EmptyString))
+
+        mainSizer.Add(detailsTitle, 0, wx.ALL, 5)
+        mainSizer.Add(wx.StaticLine(panel, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.LI_HORIZONTAL), 0,
+                      wx.EXPAND, 5)
+
+        fgAddrSizer = wx.FlexGridSizer(2, 2, 0, 0)
+        fgAddrSizer.AddGrowableCol(1)
+        fgAddrSizer.SetFlexibleDirection(wx.BOTH)
+        fgAddrSizer.SetNonFlexibleGrowMode(wx.FLEX_GROWMODE_SPECIFIED)
+
+        self.stSetID = wx.StaticText(panel, wx.ID_ANY, u"Client ID:", wx.DefaultPosition, wx.DefaultSize, 0)
+        self.stSetID.Wrap(-1)
+        fgAddrSizer.Add(self.stSetID, 0, wx.ALL | wx.ALIGN_CENTER_VERTICAL, 5)
+
+        self.inputClientID = wx.TextCtrl(panel, wx.ID_ANY, self.settings.get('clientID'), wx.DefaultPosition,
+                                         wx.DefaultSize, 0)
+
+        fgAddrSizer.Add(self.inputClientID, 0, wx.ALL | wx.ALIGN_CENTER_VERTICAL | wx.EXPAND, 5)
+
+        self.stSetSecret = wx.StaticText(panel, wx.ID_ANY, u"Client Secret:", wx.DefaultPosition, wx.DefaultSize, 0)
+        self.stSetSecret.Wrap(-1)
+
+        fgAddrSizer.Add(self.stSetSecret, 0, wx.ALL | wx.ALIGN_CENTER_VERTICAL, 5)
+
+        self.inputClientSecret = wx.TextCtrl(panel, wx.ID_ANY, self.settings.get('clientSecret'), wx.DefaultPosition,
+                                             wx.DefaultSize, 0)
+
+        fgAddrSizer.Add(self.inputClientSecret, 0, wx.ALL | wx.ALIGN_CENTER_VERTICAL | wx.EXPAND, 5)
+
+        self.inputClientID.Bind(wx.EVT_TEXT, self.OnClientDetailChange)
+        self.inputClientSecret.Bind(wx.EVT_TEXT, self.OnClientDetailChange)
+
+        mainSizer.Add(fgAddrSizer, 0, wx.EXPAND, 5)
 
         # self.stTimout = wx.StaticText(panel, wx.ID_ANY, "Timeout (seconds):", wx.DefaultPosition, wx.DefaultSize, 0)
         # self.stTimout.Wrap(-1)
@@ -112,6 +154,7 @@ class PFEsiPref(PreferenceView):
 
         # self.ToggleProxySettings(self.settings.get('loginMode'))
 
+        self.ToggleSSOMode(self.settings.get('ssoMode'))
         panel.SetSizer(mainSizer)
         panel.Layout()
 
@@ -121,14 +164,31 @@ class PFEsiPref(PreferenceView):
     def OnModeChange(self, event):
         self.settings.set('loginMode', event.GetInt())
 
-    def OnServerChange(self, event):
-        self.settings.set('server', event.GetInt())
+    def OnSSOChange(self, event):
+        self.settings.set('ssoMode', event.GetInt())
+        self.ToggleSSOMode(event.GetInt())
 
-    def OnBtnApply(self, event):
+    def ToggleSSOMode(self, mode):
+        if mode:
+            self.stSetID.Enable()
+            self.inputClientID.Enable()
+            self.stSetSecret.Enable()
+            self.inputClientSecret.Enable()
+            self.rbMode.Disable()
+        else:
+            self.stSetID.Disable()
+            self.inputClientID.Disable()
+            self.stSetSecret.Disable()
+            self.inputClientSecret.Disable()
+            self.rbMode.Enable()
+
+    def OnClientDetailChange(self, evt):
         self.settings.set('clientID', self.inputClientID.GetValue().strip())
         self.settings.set('clientSecret', self.inputClientSecret.GetValue().strip())
-        sEsi = Esi.getInstance()
-        sEsi.delAllCharacters()
+
+        # sEsi = Esi.getInstance()
+        # sEsi.delAllCharacters()
+        #
 
     def getImage(self):
         return BitmapLoader.getBitmap("eve", "gui")
diff --git a/gui/builtinPreferenceViews/pyfaNetworkPreferences.py b/gui/builtinPreferenceViews/pyfaNetworkPreferences.py
index 4f9887f8a..526dc0930 100644
--- a/gui/builtinPreferenceViews/pyfaNetworkPreferences.py
+++ b/gui/builtinPreferenceViews/pyfaNetworkPreferences.py
@@ -150,10 +150,10 @@ class PFNetworkPref(PreferenceView):
         proxy = self.settings.autodetect()
 
         if proxy is not None:
-             addr, port = proxy
-             txt = addr + ":" + str(port)
+            addr, port = proxy
+            txt = addr + ":" + str(port)
         else:
-             txt = "None"
+            txt = "None"
 
         self.stPSAutoDetected.SetLabel("Auto-detected: " + txt)
         self.stPSAutoDetected.Disable()
diff --git a/gui/builtinStatsViews/firepowerViewFull.py b/gui/builtinStatsViews/firepowerViewFull.py
index 98d54d714..29ce7a482 100644
--- a/gui/builtinStatsViews/firepowerViewFull.py
+++ b/gui/builtinStatsViews/firepowerViewFull.py
@@ -129,7 +129,7 @@ class FirepowerViewFull(StatsView):
         # Remove effective label
         hsizer = self.headerPanel.GetSizer()
         hsizer.Hide(self.stEff)
-        #self.stEff.Destroy()
+        # self.stEff.Destroy()
 
         # Get the new view
         view = StatsView.getView("miningyieldViewFull")(self.parent)
diff --git a/gui/builtinViewColumns/baseName.py b/gui/builtinViewColumns/baseName.py
index 8ed1466ac..0628eb2ad 100644
--- a/gui/builtinViewColumns/baseName.py
+++ b/gui/builtinViewColumns/baseName.py
@@ -73,7 +73,7 @@ class BaseName(ViewColumn):
                 if stuff.slot == Slot.MODE:
                     return '─ Tactical Mode ─'
                 else:
-                    return '─ {} Slots ─'.format(Slot.getName(stuff.slot).capitalize())
+                    return '─ {} {} Slot{}─'.format(stuff.num, Slot.getName(stuff.slot).capitalize(), '' if stuff.num == 1 else 's')
             else:
                 return ""
         elif isinstance(stuff, Module):
diff --git a/gui/builtinViews/fittingView.py b/gui/builtinViews/fittingView.py
index 362de074b..4db377ddb 100644
--- a/gui/builtinViews/fittingView.py
+++ b/gui/builtinViews/fittingView.py
@@ -88,7 +88,7 @@ class FitSpawner(gui.multiSwitch.TabSpawner):
 
     def handleDrag(self, type, fitID):
         if type == "fit":
-            for page in self.multiSwitch.pages:
+            for page in self.multiSwitch._pages:
                 if isinstance(page, FittingView) and page.activeFitID == fitID:
                     index = self.multiSwitch.GetPageIndex(page)
                     self.multiSwitch.SetSelection(index)
@@ -222,12 +222,15 @@ class FittingView(d.Display):
             wx.PostEvent(self.mainFrame, FitSelected(fitID=fitID))
 
     def Destroy(self):
+        # @todo: when wxPython 4.0.2 is release, https://github.com/pyfa-org/Pyfa/issues/1586#issuecomment-390074915
+        # Make sure to remove the shitty checks that I have to put in place for these handlers to ignore when self is None
         print("+++++ Destroy " + repr(self))
-        print(self.parent.Unbind(EVT_NOTEBOOK_PAGE_CHANGED))
-        print(self.mainFrame.Unbind(GE.FIT_CHANGED))
-        print(self.mainFrame.Unbind(EVT_FIT_RENAMED))
-        print(self.mainFrame.Unbind(EVT_FIT_REMOVED))
-        print(self.mainFrame.Unbind(ITEM_SELECTED))
+
+        # print(self.parent.Unbind(EVT_NOTEBOOK_PAGE_CHANGED))
+        # print(self.mainFrame.Unbind(GE.FIT_CHANGED, handler=self.fitChanged))
+        # print(self.mainFrame.Unbind(EVT_FIT_RENAMED, handler=self.fitRenamed ))
+        # print(self.mainFrame.Unbind(EVT_FIT_REMOVED, handler=self.fitRemoved))
+        # print(self.mainFrame.Unbind(ITEM_SELECTED, handler=self.appendItem))
 
         d.Display.Destroy(self)
 
@@ -291,6 +294,9 @@ class FittingView(d.Display):
         """
         print('_+_+_+_+_+_ Fit Removed: {} {} activeFitID: {}, eventFitID: {}'.format(repr(self), str(bool(self)), self.activeFitID, event.fitID))
         pyfalog.debug("FittingView::fitRemoved")
+        if not self:
+            event.Skip()
+            return
         if event.fitID == self.getActiveFit():
             pyfalog.debug("    Deleted fit is currently active")
             self.parent.DeletePage(self.parent.GetPageIndex(self))
@@ -298,8 +304,12 @@ class FittingView(d.Display):
             try:
                 # Sometimes there is no active page after deletion, hence the try block
                 sFit = Fit.getInstance()
-                sFit.refreshFit(self.getActiveFit())
-                wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=self.activeFitID))
+
+                # stopgap for #1384
+                fit = sFit.getFit(self.getActiveFit())
+                if fit:
+                    sFit.refreshFit(self.getActiveFit())
+                    wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=self.activeFitID))
             except RuntimeError:
                 pyfalog.warning("Caught dead object")
                 pass
@@ -307,6 +317,9 @@ class FittingView(d.Display):
         event.Skip()
 
     def fitRenamed(self, event):
+        if not self:
+            event.Skip()
+            return
         fitID = event.fitID
         if fitID == self.getActiveFit():
             self.updateTab()
@@ -343,6 +356,9 @@ class FittingView(d.Display):
             self.parent.SetPageTextIcon(pageIndex, text, bitmap)
 
     def appendItem(self, event):
+        if not self:
+            event.Skip()
+            return
         if self.parent.IsActive(self):
             itemID = event.itemID
             fitID = self.activeFitID
@@ -504,7 +520,7 @@ class FittingView(d.Display):
                 # second loop modifies self.mods, rewrites self.blanks to represent actual index of blanks
                 for i, (x, slot) in enumerate(self.blanks):
                     self.blanks[i] = x + i  # modify blanks with actual index
-                    self.mods.insert(x + i, Rack.buildRack(slot))
+                    self.mods.insert(x + i, Rack.buildRack(slot, sum(m.slot == slot for m in self.mods)))
 
             if fit.mode:
                 # Modes are special snowflakes and need a little manual loving
@@ -512,7 +528,7 @@ class FittingView(d.Display):
                 # while also marking the mode header position in the Blanks list
                 if sFit.serviceFittingOptions["rackSlots"]:
                     self.blanks.append(len(self.mods))
-                    self.mods.append(Rack.buildRack(Slot.MODE))
+                    self.mods.append(Rack.buildRack(Slot.MODE, None))
 
                 self.mods.append(fit.mode)
         else:
@@ -524,7 +540,9 @@ class FittingView(d.Display):
 
     def fitChanged(self, event):
         print('====== Fit Changed: {} {} activeFitID: {}, eventFitID: {}'.format(repr(self), str(bool(self)), self.activeFitID, event.fitID))
-
+        if not self:
+            event.Skip()
+            return
         try:
             if self.activeFitID is not None and self.activeFitID == event.fitID:
                 self.generateMods()
diff --git a/gui/characterEditor.py b/gui/characterEditor.py
index c7a2fef8c..3fc43daa9 100644
--- a/gui/characterEditor.py
+++ b/gui/characterEditor.py
@@ -734,17 +734,14 @@ class APIView(wx.Panel):
         self.stDisabledTip.Wrap(-1)
         hintSizer.Add(self.stDisabledTip, 0, wx.TOP | wx.BOTTOM, 10)
 
-        self.noCharactersTip = wx.StaticText(self, wx.ID_ANY,
-                                           "You haven't logging into EVE SSO with any characters yet. Please use the "
-                                           "button below to log into EVE.", style=wx.ALIGN_CENTER)
-        self.noCharactersTip.Wrap(-1)
-        hintSizer.Add(self.noCharactersTip, 0, wx.TOP | wx.BOTTOM, 10)
+
+
 
         self.stDisabledTip.Hide()
         hintSizer.AddStretchSpacer()
         pmainSizer.Add(hintSizer, 0, wx.EXPAND, 5)
 
-        fgSizerInput = wx.FlexGridSizer(3, 2, 0, 0)
+        fgSizerInput = wx.FlexGridSizer(1, 3, 0, 0)
         fgSizerInput.AddGrowableCol(1)
         fgSizerInput.SetFlexibleDirection(wx.BOTH)
         fgSizerInput.SetNonFlexibleGrowMode(wx.FLEX_GROWMODE_SPECIFIED)
@@ -754,15 +751,28 @@ class APIView(wx.Panel):
         fgSizerInput.Add(self.m_staticCharText, 0, wx.ALL | wx.ALIGN_RIGHT | wx.ALIGN_CENTER_VERTICAL, 10)
 
         self.charChoice = wx.Choice(self, wx.ID_ANY, style=0)
-        fgSizerInput.Add(self.charChoice, 1, wx.ALL | wx.EXPAND, 10)
+        fgSizerInput.Add(self.charChoice, 1, wx.TOP | wx.BOTTOM | wx.EXPAND, 10)
+
+        self.fetchButton = wx.Button(self, wx.ID_ANY, "Get Skills", wx.DefaultPosition, wx.DefaultSize, 0)
+        self.fetchButton.Bind(wx.EVT_BUTTON, self.fetchSkills)
+        fgSizerInput.Add(self.fetchButton, 0, wx.ALL | wx.ALIGN_RIGHT | wx.ALIGN_CENTER_VERTICAL, 10)
 
         pmainSizer.Add(fgSizerInput, 0, wx.EXPAND, 5)
 
+        pmainSizer.AddStretchSpacer()
+
+        self.m_staticline1 = wx.StaticLine(self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.LI_HORIZONTAL)
+        pmainSizer.Add(self.m_staticline1, 0, wx.EXPAND | wx.ALL, 10)
+
+        self.noCharactersTip = wx.StaticText(self, wx.ID_ANY, "Don't see your EVE character in the list?", style=wx.ALIGN_CENTER)
+
+        self.noCharactersTip.Wrap(-1)
+        pmainSizer.Add(self.noCharactersTip, 0, wx.CENTER | wx.TOP | wx.BOTTOM, 0)
+
         self.addButton = wx.Button(self, wx.ID_ANY, "Log In with EVE SSO", wx.DefaultPosition, wx.DefaultSize, 0)
         self.addButton.Bind(wx.EVT_BUTTON, self.addCharacter)
-        pmainSizer.Add(self.addButton, 0, wx.ALL | wx.ALIGN_CENTER, 5)
-        self.stStatus = wx.StaticText(self, wx.ID_ANY, wx.EmptyString)
-        pmainSizer.Add(self.stStatus, 0, wx.ALL, 5)
+        pmainSizer.Add(self.addButton, 0, wx.ALL | wx.ALIGN_CENTER, 10)
+
         self.charEditor.mainFrame.Bind(GE.EVT_SSO_LOGOUT, self.ssoListChanged)
         self.charEditor.mainFrame.Bind(GE.EVT_SSO_LOGIN, self.ssoListChanged)
         self.charEditor.entityEditor.Bind(wx.EVT_CHOICE, self.charChanged)
@@ -776,9 +786,18 @@ class APIView(wx.Panel):
     def ssoCharChanged(self, event):
         sChar = Character.getInstance()
         activeChar = self.charEditor.entityEditor.getActiveEntity()
-        sChar.setSsoCharacter(activeChar.ID, self.getActiveCharacter())
+        ssoChar = self.getActiveCharacter()
+        sChar.setSsoCharacter(activeChar.ID, ssoChar)
+
+        self.fetchButton.Enable(ssoChar is not None)
+
         event.Skip()
 
+    def fetchSkills(self, evt):
+        sChar = Character.getInstance()
+        char = self.charEditor.entityEditor.getActiveEntity()
+        sChar.apiFetch(char.ID, self.__fetchCallback)
+
     def addCharacter(self, event):
         sEsi = Esi.getInstance()
         sEsi.login()
@@ -788,17 +807,8 @@ class APIView(wx.Panel):
         return self.charChoice.GetClientData(selection) if selection is not -1 else None
 
     def ssoListChanged(self, event):
-        sEsi = Esi.getInstance()
-        ssoChars = sEsi.getSsoCharacters()
-
-        if len(ssoChars) == 0:
-            self.charChoice.Hide()
-            self.m_staticCharText.Hide()
-            self.noCharactersTip.Show()
-        else:
-            self.noCharactersTip.Hide()
-            self.m_staticCharText.Show()
-            self.charChoice.Show()
+        if not self:  # todo: fix event not unbinding properly
+            return
 
         self.charChanged(event)
 
@@ -814,6 +824,8 @@ class APIView(wx.Panel):
 
         sso = sChar.getSsoCharacter(activeChar.ID)
 
+        self.fetchButton.Enable(sso is not None)
+
         ssoChars = sEsi.getSsoCharacters()
 
         self.charChoice.Clear()
@@ -825,9 +837,9 @@ class APIView(wx.Panel):
 
             if sso is not None and char.ID == sso.ID:
                 self.charChoice.SetSelection(currId)
-            if sso is None:
-                self.charChoice.SetSelection(noneID)
 
+        if sso is None:
+            self.charChoice.SetSelection(noneID)
 
         #
         # if chars:
@@ -851,13 +863,17 @@ class APIView(wx.Panel):
             event.Skip()
 
     def __fetchCallback(self, e=None):
-        charName = self.charChoice.GetString(self.charChoice.GetSelection())
-        if e is None:
-            self.stStatus.SetLabel("Successfully fetched {}\'s skills from EVE API.".format(charName))
-        else:
+        if e:
             exc_type, exc_obj, exc_trace = e
-            pyfalog.error("Unable to retrieve {0}\'s skills. Error message:\n{1}".format(charName, exc_obj))
-            self.stStatus.SetLabel("Unable to retrieve {}\'s skills. Error message:\n{}".format(charName, exc_obj))
+            pyfalog.warn("Error fetching skill information for character")
+            pyfalog.warn(exc_obj)
+
+            wx.MessageBox(
+                "Error fetching skill information",
+                "Error", wx.ICON_ERROR | wx.STAY_ON_TOP)
+        else:
+            wx.MessageBox(
+                "Successfully fetched skills", "Success", wx.ICON_INFORMATION | wx.STAY_ON_TOP)
 
 
 class SecStatusDialog(wx.Dialog):
diff --git a/gui/characterSelection.py b/gui/characterSelection.py
index cc63a1f82..051ce69b4 100644
--- a/gui/characterSelection.py
+++ b/gui/characterSelection.py
@@ -170,7 +170,6 @@ class CharacterSelection(wx.Panel):
     def charChanged(self, event):
         fitID = self.mainFrame.getActiveFit()
         charID = self.getActiveCharacter()
-        sChar = Character.getInstance()
 
         if charID == -1:
             # revert to previous character
diff --git a/gui/chrome_tabs.py b/gui/chrome_tabs.py
index c03edacab..10354b9be 100644
--- a/gui/chrome_tabs.py
+++ b/gui/chrome_tabs.py
@@ -1,4 +1,4 @@
-#===============================================================================
+# ===============================================================================
 #
 # ToDo: Bug - when selecting close on a tab, sometimes the tab to the right is
 #       selected, most likely due to determination of mouse position
@@ -11,7 +11,7 @@
 #       tab index?). This will also help with finding close buttons.
 # ToDo: Fix page preview code (PFNotebookPagePreview)
 #
-#= ==============================================================================
+# ===============================================================================
 
 import wx
 import wx.lib.newevent
@@ -413,7 +413,7 @@ class _TabRenderer:
         mdc.SelectObject(ebmp)
         mdc.SetFont(self.font)
         textSizeX, textSizeY = mdc.GetTextExtent(self.text)
-        totalSize = self.left_width + self.right_width + textSizeX + self.close_btn_width / 2 + 16 + self.padding* 2
+        totalSize = self.left_width + self.right_width + textSizeX + self.close_btn_width / 2 + 16 + self.padding * 2
         mdc.SelectObject(wx.NullBitmap)
         return totalSize, self.tab_height
 
@@ -1478,4 +1478,3 @@ if __name__ == "__main__":
     top = Frame("Test Chrome Tabs")
     top.Show()
     app.MainLoop()
-
diff --git a/gui/esiFittings.py b/gui/esiFittings.py
index 31fdd5a71..ca04387e5 100644
--- a/gui/esiFittings.py
+++ b/gui/esiFittings.py
@@ -1,5 +1,3 @@
-import time
-import webbrowser
 import json
 # noinspection PyPackageRequirements
 import wx
@@ -15,9 +13,8 @@ from gui.display import Display
 import gui.globalEvents as GE
 
 from logbook import Logger
-import calendar
 from service.esi import Esi
-from esipy.exceptions import APIException
+from service.esiAccess import APIException
 from service.port import ESIExportException
 
 pyfalog = Logger(__name__)
@@ -32,7 +29,6 @@ class EveFittings(wx.Frame):
 
         self.mainFrame = parent
         mainSizer = wx.BoxSizer(wx.VERTICAL)
-        sEsi = Esi.getInstance()
 
         characterSelectSizer = wx.BoxSizer(wx.HORIZONTAL)
 
@@ -72,8 +68,6 @@ class EveFittings(wx.Frame):
         self.importBtn.Bind(wx.EVT_BUTTON, self.importFitting)
         self.deleteBtn.Bind(wx.EVT_BUTTON, self.deleteFitting)
 
-        self.mainFrame.Bind(GE.EVT_SSO_LOGOUT, self.ssoLogout)
-        self.mainFrame.Bind(GE.EVT_SSO_LOGIN, self.ssoLogin)
         self.Bind(wx.EVT_CLOSE, self.OnClose)
 
         self.statusbar = wx.StatusBar(self)
@@ -85,10 +79,6 @@ class EveFittings(wx.Frame):
 
         self.Centre(wx.BOTH)
 
-    def ssoLogin(self, event):
-        self.updateCharList()
-        event.Skip()
-
     def updateCharList(self):
         sEsi = Esi.getInstance()
         chars = sEsi.getSsoCharacters()
@@ -102,10 +92,6 @@ class EveFittings(wx.Frame):
 
         self.charChoice.SetSelection(0)
 
-    def ssoLogout(self, event):
-        self.updateCharList()
-        event.Skip()  # continue event
-
     def OnClose(self, event):
         self.mainFrame.Unbind(GE.EVT_SSO_LOGOUT)
         self.mainFrame.Unbind(GE.EVT_SSO_LOGIN)
@@ -121,21 +107,23 @@ class EveFittings(wx.Frame):
         waitDialog = wx.BusyInfo("Fetching fits, please wait...", parent=self)
 
         try:
-            fittings = sEsi.getFittings(self.getActiveCharacter())
+            self.fittings = sEsi.getFittings(self.getActiveCharacter())
             # self.cacheTime = fittings.get('cached_until')
             # self.updateCacheStatus(None)
             # self.cacheTimer.Start(1000)
-            self.fitTree.populateSkillTree(fittings)
+            self.fitTree.populateSkillTree(self.fittings)
             del waitDialog
         except requests.exceptions.ConnectionError:
             msg = "Connection error, please check your internet connection"
             pyfalog.error(msg)
             self.statusbar.SetStatusText(msg)
         except APIException as ex:
-            del waitDialog  # Can't do this in a finally because then it obscures the message dialog
+            #  Can't do this in a finally because then it obscures the message dialog
+            del waitDialog  # noqa: F821
             ESIExceptionHandler(self, ex)
         except Exception as ex:
-            del waitDialog
+            del waitDialog  # noqa: F821
+            raise ex
 
     def importFitting(self, event):
         selection = self.fitView.fitSelection
@@ -160,6 +148,9 @@ class EveFittings(wx.Frame):
         if dlg.ShowModal() == wx.ID_YES:
             try:
                 sEsi.delFitting(self.getActiveCharacter(), data['fitting_id'])
+                # repopulate the fitting list
+                self.fitTree.populateSkillTree(self.fittings)
+                self.fitView.update([])
             except requests.exceptions.ConnectionError:
                 msg = "Connection error, please check your internet connection"
                 pyfalog.error(msg)
@@ -167,8 +158,9 @@ class EveFittings(wx.Frame):
 
 
 class ESIExceptionHandler(object):
+    # todo: make this a generate excetpion handler for all calls
     def __init__(self, parentWindow, ex):
-        if ex.response['error'] == "invalid_token":
+        if ex.response['error'].startswith('Token is not valid') or ex.response['error'] == 'invalid_token':  # todo: this seems messy, figure out a better response
             dlg = wx.MessageDialog(parentWindow,
                                    "There was an error validating characters' SSO token. Please try "
                                    "logging into the character again to reset the token.", "Invalid Token",
@@ -188,7 +180,6 @@ class ExportToEve(wx.Frame):
         self.mainFrame = parent
         self.SetBackgroundColour(wx.SystemSettings.GetColour(wx.SYS_COLOUR_BTNFACE))
 
-        sEsi = Esi.getInstance()
         mainSizer = wx.BoxSizer(wx.VERTICAL)
         hSizer = wx.BoxSizer(wx.HORIZONTAL)
 
@@ -208,8 +199,6 @@ class ExportToEve(wx.Frame):
         self.statusbar.SetFieldsCount(2)
         self.statusbar.SetStatusWidths([100, -1])
 
-        self.mainFrame.Bind(GE.EVT_SSO_LOGOUT, self.ssoLogout)
-        self.mainFrame.Bind(GE.EVT_SSO_LOGIN, self.ssoLogin)
         self.Bind(wx.EVT_CLOSE, self.OnClose)
 
         self.SetSizer(mainSizer)
@@ -231,14 +220,6 @@ class ExportToEve(wx.Frame):
 
         self.charChoice.SetSelection(0)
 
-    def ssoLogin(self, event):
-        self.updateCharList()
-        event.Skip()
-
-    def ssoLogout(self, event):
-        self.updateCharList()
-        event.Skip()  # continue event
-
     def OnClose(self, event):
         self.mainFrame.Unbind(GE.EVT_SSO_LOGOUT)
         self.mainFrame.Unbind(GE.EVT_SSO_LOGIN)
@@ -250,7 +231,6 @@ class ExportToEve(wx.Frame):
         return self.charChoice.GetClientData(selection) if selection is not None else None
 
     def exportFitting(self, event):
-        sPort = Port.getInstance()
         fitID = self.mainFrame.getActiveFit()
 
         self.statusbar.SetStatusText("", 0)
@@ -260,12 +240,8 @@ class ExportToEve(wx.Frame):
             return
 
         self.statusbar.SetStatusText("Sending request and awaiting response", 1)
-        sEsi = Esi.getInstance()
 
         try:
-            sFit = Fit.getInstance()
-            data = sPort.exportESI(sFit.getFit(fitID))
-            res = sEsi.postFitting(self.getActiveCharacter(), data)
 
             self.statusbar.SetStatusText("", 0)
             self.statusbar.SetStatusText("", 1)
@@ -324,8 +300,10 @@ class SsoCharacterMgmt(wx.Dialog):
         self.Centre(wx.BOTH)
 
     def ssoLogin(self, event):
-        self.popCharList()
-        event.Skip()
+        if (self):
+            # todo: these events don't unbind properly when window is closed (?), hence the `if`. Figure out better way of doing this.
+            self.popCharList()
+            event.Skip()
 
     def popCharList(self):
         sEsi = Esi.getInstance()
@@ -380,10 +358,17 @@ class FittingsTreeView(wx.Panel):
         tree = self.fittingsTreeCtrl
         tree.DeleteChildren(root)
 
+        sEsi = Esi.getInstance()
+
         dict = {}
         fits = data
         for fit in fits:
+            if (fit['fitting_id'] in sEsi.fittings_deleted):
+                continue
             ship = getItem(fit['ship_type_id'])
+            if ship is None:
+                pyfalog.debug('Cannot find ship type id: {}'.format(fit['ship_type_id']))
+                continue
             if ship.name not in dict:
                 dict[ship.name] = []
             dict[ship.name].append(fit)
diff --git a/gui/mainFrame.py b/gui/mainFrame.py
index 58ab3c962..4dbcc6f8e 100644
--- a/gui/mainFrame.py
+++ b/gui/mainFrame.py
@@ -69,6 +69,7 @@ from service.settings import SettingsProvider
 from service.fit import Fit
 from service.character import Character
 from service.update import Update
+from service.esiAccess import SsoMode
 
 # import this to access override setting
 from eos.modifiedAttributeDict import ModifiedAttributeDict
@@ -243,12 +244,12 @@ class MainFrame(wx.Frame):
         self.Bind(GE.EVT_SSO_LOGGING_IN, self.ShowSsoLogin)
 
     def ShowSsoLogin(self, event):
-        if getattr(event, "login_mode", LoginMethod.SERVER) == LoginMethod.MANUAL:
+        if getattr(event, "login_mode", LoginMethod.SERVER) == LoginMethod.MANUAL and getattr(event, "sso_mode", SsoMode.AUTO) == SsoMode.AUTO:
             dlg = SsoLogin(self)
             if dlg.ShowModal() == wx.ID_OK:
                 sEsi = Esi.getInstance()
                 # todo: verify that this is a correct SSO Info block
-                sEsi.handleLogin(dlg.ssoInfoCtrl.Value.strip())
+                sEsi.handleLogin({'SSOInfo': [dlg.ssoInfoCtrl.Value.strip()]})
 
     def ShowUpdateBox(self, release, version):
         dlg = UpdateDialog(self, release, version)
diff --git a/gui/ssoLogin.py b/gui/ssoLogin.py
index 2ff364752..4a8f1197b 100644
--- a/gui/ssoLogin.py
+++ b/gui/ssoLogin.py
@@ -1,5 +1,6 @@
 import wx
 
+
 class SsoLogin(wx.Dialog):
     def __init__(self, parent):
         wx.Dialog.__init__(self, parent, id=wx.ID_ANY, title="SSO Login", size=wx.Size(400, 240))
diff --git a/gui/updateDialog.py b/gui/updateDialog.py
index c575eeaf3..c596d553e 100644
--- a/gui/updateDialog.py
+++ b/gui/updateDialog.py
@@ -62,7 +62,6 @@ class UpdateDialog(wx.Dialog):
         self.browser.Bind(wx.html2.EVT_WEBVIEW_NEWWINDOW, self.OnNewWindow)
 
         link_patterns = [
-            (re.compile("([0-9a-f]{6,40})", re.I), r"https://github.com/pyfa-org/Pyfa/commit/\1"),
             (re.compile("#(\d+)", re.I), r"https://github.com/pyfa-org/Pyfa/issues/\1"),
             (re.compile("@(\w+)", re.I), r"https://github.com/\1")
         ]
@@ -71,12 +70,27 @@ class UpdateDialog(wx.Dialog):
             extras=['cuddled-lists', 'fenced-code-blocks', 'target-blank-links', 'toc', 'link-patterns'],
             link_patterns=link_patterns)
 
+        release_markup = markdowner.convert(self.releaseInfo['body'])
+
+        # run the text through markup again, this time with the hashing pattern. This is required due to bugs in markdown2:
+        # https://github.com/trentm/python-markdown2/issues/287
+        link_patterns = [
+            (re.compile("([0-9a-f]{6,40})", re.I), r"https://github.com/pyfa-org/Pyfa/commit/\1"),
+        ]
+
+        markdowner = markdown2.Markdown(
+            extras=['cuddled-lists', 'fenced-code-blocks', 'target-blank-links', 'toc', 'link-patterns'],
+            link_patterns=link_patterns)
+
+        # The space here is required, again, due to bug. Again, see https://github.com/trentm/python-markdown2/issues/287
+        release_markup = markdowner.convert(' ' + release_markup)
+
         self.browser.SetPage(html_tmpl.format(
             self.releaseInfo['tag_name'],
             releaseDate.strftime('%B %d, %Y'),
             "<p class='text-danger'><b>This is a pre-release, be prepared for unstable features</b></p>" if version.is_prerelease else "",
-            markdowner.convert(self.releaseInfo['body'])
-        ),"")
+            release_markup
+        ), "")
 
         notesSizer.Add(self.browser, 1, wx.EXPAND | wx.LEFT | wx.RIGHT | wx.TOP, 5)
         mainSizer.Add(notesSizer, 1, wx.EXPAND, 5)
diff --git a/gui/utils/exportHtml.py b/gui/utils/exportHtml.py
index 612df367e..0d5456dd0 100644
--- a/gui/utils/exportHtml.py
+++ b/gui/utils/exportHtml.py
@@ -86,7 +86,7 @@ class exportHtmlThread(threading.Thread):
   <head>
   <title>Pyfa Fittings</title>
   <meta name="viewport" content="width=device-width, initial-scale=1">
-  <meta charset="utf-8" /> 
+  <meta charset="utf-8" />
   <link rel="stylesheet" href="https://code.jquery.com/mobile/1.4.2/jquery.mobile-1.4.2.min.css" />
   <script src="https://code.jquery.com/jquery-1.11.0.min.js"></script>
   <script>
diff --git a/pyfa.py b/pyfa.py
index bbd801e33..b60be70e8 100755
--- a/pyfa.py
+++ b/pyfa.py
@@ -26,23 +26,23 @@ from optparse import AmbiguousOptionError, BadOptionError, OptionParser
 from service.prereqsCheck import PreCheckException, PreCheckMessage, version_precheck, version_block
 import config
 
-ascii_text = '''
-++++++++++++++++++++++++++++++++++++++++++++++++++
-
-                            / _|
-              _ __   _   _ | |
-             | '_ \ | | | ||  _|/ _` |
-             | |_) || |_| || | | (_| |
-             | .__/  \__, ||_|  \__,_|
-             | |      __/ |
-             |_|     |___/
-
-You are running a alpha/beta version of pyfa.
-
-++++++++++++++++++++++++++++++++++++++++++++++++++
-'''
-
-print(ascii_text)
+# ascii_text = '''
+# ++++++++++++++++++++++++++++++++++++++++++++++++++
+#
+#                             / _|
+#               _ __   _   _ | |
+#              | '_ \ | | | ||  _|/ _` |
+#              | |_) || |_| || | | (_| |
+#              | .__/  \__, ||_|  \__,_|
+#              | |      __/ |
+#              |_|     |___/
+#
+# You are running a alpha/beta version of pyfa.
+#
+# ++++++++++++++++++++++++++++++++++++++++++++++++++
+# '''
+#
+# print(ascii_text)
 
 
 class PassThroughOptionParser(OptionParser):
diff --git a/requirements.txt b/requirements.txt
index fa4aa54bc..a938d0217 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,7 +4,6 @@ matplotlib >= 2.0.0
 python-dateutil
 requests >= 2.0.0
 sqlalchemy >= 1.0.5
-esipy == 0.3.3
 cryptography
 diskcache
 markdown2
diff --git a/scripts/compile_data.py b/scripts/compile_data.py
new file mode 100644
index 000000000..9de7c5562
--- /dev/null
+++ b/scripts/compile_data.py
@@ -0,0 +1,63 @@
+#!/usr/bin/env python
+"""
+This script bootstraps Phobos from a supplied path and feeds it
+information regarding EVE data paths and where to dump data. It then imports
+some other scripts and uses them to convert the json data into a SQLite
+database and then compare the new database to the existing one, producing a
+diff which can then be used to assist in the updating.
+"""
+
+import sys
+import os
+
+import argparse
+
+parser = argparse.ArgumentParser()
+parser.add_argument("-d", "--dump", dest="dump_path", help="Location of Phobos JSON dump directory", required=True)
+
+args = parser.parse_args()
+dump_path = os.path.expanduser(args.dump_path)
+script_path = os.path.dirname(__file__)
+
+def header(text, subtext=None):
+    print()
+    print("* "*30)
+    print(text.center(60))
+    if subtext:
+        print(subtext.center(60))
+    print("* "*30)
+    print()
+
+### SQL Convert
+import jsonToSql
+
+db_file = os.path.join(dump_path, "eve.db")
+header("Converting Data to SQL", db_file)
+
+if os.path.isfile(db_file):
+    os.remove(db_file)
+
+jsonToSql.main("sqlite:///" + db_file, dump_path)
+
+### Diff generation
+import itemDiff
+
+diff_file = os.path.join(dump_path, "diff.txt")
+old_db = os.path.join(script_path, "..", "eve.db")
+
+header("Generating DIFF", diff_file)
+old_stdout = sys.stdout
+sys.stdout = open(diff_file, 'w')
+itemDiff.main(old=old_db, new=db_file)
+sys.stdout = old_stdout
+
+header("Commiting changes for ", diff_file)
+
+from subprocess import call
+
+os.chdir(dump_path)
+
+call(["git.exe", "add", "."])
+call(["git.exe", "commit", "-m", "Commit"])
+
+print("\nAll done.")
\ No newline at end of file
diff --git a/scripts/dist.py b/scripts/dist.py
deleted file mode 100755
index 07b4ec473..000000000
--- a/scripts/dist.py
+++ /dev/null
@@ -1,257 +0,0 @@
-#!/usr/bin/env python
-"""
-Script for generating distributables based on platform skeletons.
-
-User supplies path for pyfa code base, root skeleton directory, and where the
-builds go. The builds are automatically named depending on the pyfa config
-values of `version` and `tag`. If it's a Stable release, the naming
-convention is:
-
-    pyfa-pyfaversion-expansion-expversion-platform
-
-If it is not Stable (tag=git), we determine if the pyfa code base includes
-the git repo to use as an ID. If not, uses randomly generated 6-character ID.
-The unstable naming convention:
-
-    pyfa-YYYMMDD-id-platform
-
-dist.py can also build the Windows installer provided that it has a path to
-Inno Setup (and, for generating on non-Windows platforms, that WINE is
-installed). To build the EXE file, `win` must be included in the platforms to
-be built.
-"""
-
-#@todo: ensure build directory can be written to
-# todo: default build and dist directories
-
-from optparse import OptionParser
-import os.path
-import shutil
-import sys
-import tarfile
-import datetime
-import random
-import string
-import zipfile
-import errno
-from subprocess import call
-
-class FileStub():
-    def write(self, *args):
-        pass
-
-    def flush(self, *args):
-        pass
-
-i = 0
-def loginfo(path, names):
-    # Print out a "progress" and return directories / files to ignore
-    global i
-    i += 1
-    if i % 10 == 0:
-        sys.stdout.write(".")
-        sys.stdout.flush()
-    return ()
-
-def copyanything(src, dst):
-    try:
-        shutil.copytree(src, dst, ignore=loginfo)
-    except: # python >2.5
-        try:
-            shutil.copy(src, dst)
-        except:
-            raise
-
-def id_generator(size=6, chars=string.ascii_uppercase + string.digits):
-    return ''.join(random.choice(chars) for x in range(size))
-
-def zipdir(path, zip):
-    for root, dirs, files in os.walk(path):
-        for file in files:
-            zip.write(os.path.join(root, file))
-
-skels = ['win', 'src', 'mac', 'mac-deprecated']
-iscc =  "C:\Program Files (x86)\Inno Setup 5\ISCC.exe" # inno script location via wine
-
-if __name__ == "__main__":
-    oldstd = sys.stdout
-    parser = OptionParser()
-    parser.add_option("-s", "--skeleton", dest="skeleton", help="Location of Pyfa-skel directory")
-    parser.add_option("-b", "--base", dest="base", help="Location of cleaned read-only base directory")
-    parser.add_option("-d", "--destination", dest="destination", help="Where to copy our distributable")
-    parser.add_option("-p", "--platforms", dest="platforms", help="Comma-separated list of platforms to build", default=','.join(skels))
-    parser.add_option("-q", "--quiet", dest="silent", action="store_true")
-    parser.add_option("-w", "--winexe", dest="winexe", action="store_true", help="Build the Windows installer file (needs Inno Setup). Must include 'win' in platform options")
-    parser.add_option("-z", "--zip", dest="zip", action="store_true", help="zip archive instead of tar")
-
-    options, args = parser.parse_args()
-
-    if options.skeleton is None or options.base is None or options.destination is None:
-        print("Need --skeleton argument as well as --base and --destination argument")
-        parser.print_help()
-        sys.exit()
-
-    if options.silent:
-        sys.stdout = FileStub()
-
-    options.platforms = options.platforms.split(",")
-
-    for skel in skels:
-        if skel not in options.platforms:
-            continue
-
-        print("\n======== %s ========"%skel)
-
-        info = {}
-        config = {}
-        setup = {}
-        skeleton = os.path.expanduser(os.path.join(options.skeleton, skel))
-
-        exec(compile(open(os.path.join(options.base, "config.py")).read(), os.path.join(options.base, "config.py"), 'exec'), config)
-        exec(compile(open(os.path.join(skeleton, "info.py")).read(), os.path.join(skeleton, "info.py"), 'exec'), info)
-        exec(compile(open(os.path.join(options.base, "setup.py")).read(), os.path.join(options.base, "setup.py"), 'exec'), setup)
-
-        destination = os.path.expanduser(options.destination)
-        if not os.path.isdir(destination) or not os.access(destination, os.W_OK | os.X_OK):
-            print("Destination directory does not exist or is not writable: {}".format(destination))
-            sys.exit()
-
-        dirName = info["arcname"]
-
-        nowdt = datetime.datetime.now()
-        now = "%04d%02d%02d" % (nowdt.year, nowdt.month, nowdt.day)
-
-        git = False
-        if config['tag'].lower() == "git":
-            try: # if there is a git repo associated with base, use master commit
-                with open(os.path.join(options.base, ".git", "refs", "heads", "master"), 'r') as f:
-                    id = f.readline()[0:6]
-                    git = True
-            except: # else, use custom ID
-                id = id_generator()
-            fileName = "pyfa-{}-{}-{}".format(now, id, info["os"])
-        else:
-            fileName = "pyfa-{}-{}-{}-{}".format(
-                config['version'],
-                config['expansionName'].lower(),
-                config['expansionVersion'],
-                info["os"]
-            )
-
-        archiveName = "{}.{}".format(fileName, "zip" if options.zip else "tar.bz2")
-        tmpDir = os.path.join(os.getcwd(), dirName) # tmp directory where files are copied
-        tmpFile = os.path.join(os.getcwd(), archiveName)
-
-        try:
-            print("Copying skeleton to ", tmpDir)
-            shutil.copytree(skeleton, tmpDir, ignore=loginfo)
-            print()
-            source = os.path.expanduser(options.base)
-            root = os.path.join(tmpDir, info["base"])
-
-            # it is easier to work from the source directory
-            oldcwd = os.getcwd()
-            os.chdir(source)
-
-            if info["library"]:
-                print("Injecting files into", info["library"])
-                libraryFile = os.path.join(root, info["library"])
-
-                with zipfile.ZipFile(libraryFile, 'a') as library:
-                    for dir in setup['packages']:
-                        zipdir(dir, library)
-                    library.write('pyfa.py', 'pyfa__main__.py')
-                    library.write('config.py')
-            else: # platforms where we don't have a packaged library
-                print("Copying modules into", root)
-                for dir in setup['packages']:
-                    copyanything(dir, os.path.join(root, dir))
-
-            # add some additional files to root dir for these platforms
-            # (hopefully can figure out a way later for OS X to use the one in
-            # it's library)
-            if skel == 'mac':
-                setup['include_files'] += ['pyfa.py']
-            if skel in ('src', 'mac-deprecated'):
-                setup['include_files'] += ['pyfa.py', 'config.py']
-
-            print()
-            print("Copying included files:", end=' ')
-
-            for file in setup['include_files']:
-                if isinstance(file, str):
-                    print(file, end=' ')
-                    copyanything(file, os.path.join(root, file))
-
-            print()
-            print("Creating images zipfile:", end=' ')
-            os.chdir('imgs')
-            imagesFile = os.path.join(root, "imgs.zip")
-
-            with zipfile.ZipFile(imagesFile, 'w') as images:
-                for dir in setup['icon_dirs']:
-                    print(dir, end=' ')
-                    zipdir(dir, images)
-            os.chdir(oldcwd)
-
-            print()
-            print("Creating archive")
-            if options.zip:
-                archive = zipfile.ZipFile(tmpFile, 'w', compression=zipfile.ZIP_DEFLATED)
-                zipdir(dirName, archive)
-                archive.close()
-            else:
-                archive = tarfile.open(tmpFile, "w:bz2")
-                archive.add(tmpDir, arcname=info["arcname"])
-                archive.close()
-
-            print("Moving archive to ", destination)
-            shutil.move(tmpFile, destination)
-
-            if "win" in skel and options.winexe:
-                print("Compiling EXE")
-
-                if config['tag'].lower() == "git":
-                    if git:   # if git repo info available, use git commit
-                        expansion = "git-%s"%(id)
-                    else: # if there is no git repo, use timestamp
-                        expansion = now
-                else: # if code is Stable, use expansion name
-                   expansion = "%s %s"%(config['expansionName'], config['expansionVersion']),
-
-                calllist = ["wine"] if 'win' not in sys.platform else []
-
-                call(calllist + [
-                    iscc,
-                    "pyfa-setup.iss",
-                    "/dMyAppVersion=%s"%(config['version']),
-                    "/dMyAppExpansion=%s"%(expansion),
-                    "/dMyAppDir=pyfa",
-                    "/dMyOutputDir=%s"%destination,
-                    "/dMyOutputFile=%s"%fileName]) #stdout=devnull, stderr=devnull
-
-                print("EXE completed")
-
-        except Exception as e:
-            print("Encountered an error: \n\t", e)
-            raise
-        finally:
-            print("Deleting tmp files\n")
-            try:
-                shutil.rmtree("dist") # Inno dir
-            except:
-                pass
-            try:
-                shutil.rmtree(tmpDir)
-            except:
-                pass
-            try:
-                os.unlink(tmpFile)
-            except:
-                pass
-
-        sys.stdout = oldstd
-        if os.path.isdir(destination):
-            print(os.path.join(destination, os.path.split(tmpFile)[1]))
-        else:
-            print(destination)
diff --git a/scripts/dump_data.py b/scripts/dump_data.py
new file mode 100644
index 000000000..2393fb8c4
--- /dev/null
+++ b/scripts/dump_data.py
@@ -0,0 +1,81 @@
+#!/usr/bin/env python
+"""
+This script bootstraps Phobos from a supplied path and feeds it
+information regarding EVE data paths and where to dump data. It then imports
+some other scripts and uses them to convert the json data into a SQLite
+database and then compare the new database to the existing one, producing a
+diff which can then be used to assist in the updating.
+"""
+
+import sys
+import os
+
+# Phobos location
+phb_path = os.path.expanduser("path/to/phobos")
+
+import argparse
+
+parser = argparse.ArgumentParser()
+parser.add_argument("-e", "--eve", dest="eve_path", help="Location of EVE directory", required=True)
+parser.add_argument("-c", "--cache", dest="cache_path", help="Location of EVE cache directory. If not specified, an attempt will be make to automatically determine path.")
+parser.add_argument("-r", "--res", dest="res_path", help="Location of EVE shared resource cache. If not specified, an attempt will be make to automatically determine path.")
+parser.add_argument("-d", "--dump", dest="dump_path", help="Location of Phobos JSON dump directory", required=True)
+parser.add_argument("-p", "--phobos", dest="phb_path", help="Location of Phobos, defaults to path noted in script", default=phb_path)
+parser.add_argument("-s", "--singularity", action="store_true", help="Singularity build")
+
+args = parser.parse_args()
+eve_path = os.path.expanduser(args.eve_path)
+cache_path = os.path.expanduser(args.cache_path) if args.cache_path else None
+res_path = os.path.expanduser(args.res_path) if args.res_path else None
+dump_path = os.path.expanduser(args.dump_path)
+script_path = os.path.dirname(__file__)
+
+### Append Phobos to path
+sys.path.append(os.path.expanduser(args.phb_path))
+
+def header(text, subtext=None):
+    print()
+    print("* "*30)
+    print(text.center(60))
+    if subtext:
+        print(subtext.center(60))
+    print("* "*30)
+    print()
+
+header("Dumping Phobos Data", dump_path)
+
+import reverence
+from flow import FlowManager
+from miner import *
+from translator import Translator
+from writer import *
+
+rvr = reverence.blue.EVE(eve_path, cachepath=args.cache_path, sharedcachepath=res_path, server="singularity" if args.singularity else "tranquility")
+print("EVE Directory: {}".format(rvr.paths.root))
+print("Cache Directory: {}".format(rvr.paths.cache))
+print("Shared Resource Directory: {}".format(rvr.paths.sharedcache))
+
+pickle_miner = ResourcePickleMiner(rvr)
+trans = Translator(pickle_miner)
+bulkdata_miner = BulkdataMiner(rvr, trans)
+staticcache_miner = ResourceStaticCacheMiner(rvr, trans)
+miners = (
+    MetadataMiner(eve_path),
+    bulkdata_miner,
+    staticcache_miner,
+    TraitMiner(staticcache_miner, bulkdata_miner, trans),
+    SqliteMiner(rvr.paths.root, trans),
+    CachedCallsMiner(rvr, trans),
+    pickle_miner
+)
+
+writers = (
+    JsonWriter(dump_path, indent=2),
+)
+
+list = "dgmexpressions,dgmattribs,dgmeffects,dgmtypeattribs,dgmtypeeffects,"\
+       "dgmunits,invcategories,invgroups,invmetagroups,invmetatypes,"\
+       "invtypes,mapbulk_marketGroups,phbmetadata,phbtraits,fsdTypeOverrides,"\
+       "evegroups,evetypes,evecategories,mapbulk_marketGroups,clonegrades"
+
+FlowManager(miners, writers).run(list, "en-us")
diff --git a/scripts/itemDiff.py b/scripts/itemDiff.py
index 70dadca4e..5c46fa7dd 100755
--- a/scripts/itemDiff.py
+++ b/scripts/itemDiff.py
@@ -216,7 +216,7 @@ def main(old, new, groups=True, effects=True, attributes=True, renames=True):
                 # Initialize container for the data for each item with empty stuff besides groupID
                 dictionary[itemid] = [groupID, set(), {}]
             # Add items filtered by group
-            query = 'SELECT it.typeID, it.groupID FROM invtypes AS it INNER JOIN invgroups AS ig ON it.groupID = ig.groupID WHERE it.published = 1 AND ig.groupName IN ("Effect Beacon", "Ship Modifiers")'
+            query = 'SELECT it.typeID, it.groupID FROM invtypes AS it INNER JOIN invgroups AS ig ON it.groupID = ig.groupID WHERE it.published = 1 AND ig.groupName IN ("Effect Beacon", "Ship Modifiers", "Mutaplasmids")'
             cursor.execute(query)
             for row in cursor:
                 itemid = row[0]
diff --git a/scripts/jsonToSql.py b/scripts/jsonToSql.py
index 6629c62b2..717713e64 100755
--- a/scripts/jsonToSql.py
+++ b/scripts/jsonToSql.py
@@ -20,16 +20,19 @@
 
 import os
 import sys
+import functools
 import re
 
 # Add eos root path to sys.path so we can import ourselves
-path = os.path.dirname(str(__file__, sys.getfilesystemencoding()))
+path = os.path.dirname(__file__)
 sys.path.append(os.path.realpath(os.path.join(path, "..")))
 
 import json
 import argparse
 
 def main(db, json_path):
+    if os.path.isfile(db):
+        os.remove(db)
 
     jsonPath = os.path.expanduser(json_path)
 
@@ -130,7 +133,7 @@ def main(db, json_path):
                     check[ID] = {}
                 check[ID][int(skill["typeID"])] = int(skill["level"])
 
-        if not reduce(lambda a, b: a if a == b else False, [v for _, v in check.iteritems()]):
+        if not functools.reduce(lambda a, b: a if a == b else False, [v for _, v in check.items()]):
             raise Exception("Alpha Clones not all equal")
 
         newData = [x for x in newData if x['alphaCloneID'] == 1]
@@ -188,7 +191,7 @@ def main(db, json_path):
 
     # Dump all data to memory so we can easely cross check ignored rows
     for jsonName, cls in tables.items():
-        with open(os.path.join(jsonPath, "{}.json".format(jsonName))) as f:
+        with open(os.path.join(jsonPath, "{}.json".format(jsonName)), encoding="utf-8") as f:
             tableData = json.load(f)
         if jsonName in rowsInValues:
             tableData = list(tableData.values())
diff --git a/scripts/prep_data.py b/scripts/prep_data.py
deleted file mode 100644
index d8907aa58..000000000
--- a/scripts/prep_data.py
+++ /dev/null
@@ -1,109 +0,0 @@
-#!/usr/bin/env python
-"""
-This script bootstraps Phobos from a supplied path and feeds it
-information regarding EVE data paths and where to dump data. It then imports
-some other scripts and uses them to convert the json data into a SQLite
-database and then compare the new database to the existing one, producing a
-diff which can then be used to assist in the updating.
-"""
-
-import sys
-import os
-
-# Phobos location
-phb_path = os.path.expanduser("path/to/phobos")
-
-import argparse
-
-parser = argparse.ArgumentParser()
-parser.add_argument("-e", "--eve", dest="eve_path", help="Location of EVE directory", required=True)
-parser.add_argument("-c", "--cache", dest="cache_path", help="Location of EVE cache directory. If not specified, an attempt will be make to automatically determine path.")
-parser.add_argument("-r", "--res", dest="res_path", help="Location of EVE shared resource cache. If not specified, an attempt will be make to automatically determine path.")
-parser.add_argument("-d", "--dump", dest="dump_path", help="Location of Phobos JSON dump directory", required=True)
-parser.add_argument("-p", "--phobos", dest="phb_path", help="Location of Phobos, defaults to path noted in script", default=phb_path)
-parser.add_argument("-s", "--singularity", action="store_true", help="Singularity build")
-parser.add_argument("-j", "--nojson", dest="nojson", action="store_true", help="Skip Phobos JSON data dump.")
-
-args = parser.parse_args()
-eve_path = os.path.expanduser(str(args.eve_path, sys.getfilesystemencoding()))
-cache_path = os.path.expanduser(str(args.cache_path, sys.getfilesystemencoding())) if args.cache_path else None
-res_path = os.path.expanduser(str(args.res_path,  sys.getfilesystemencoding())) if args.res_path else None
-dump_path = os.path.expanduser(str(args.dump_path, sys.getfilesystemencoding()))
-script_path = os.path.dirname(str(__file__, sys.getfilesystemencoding()))
-
-### Append Phobos to path
-sys.path.append(os.path.expanduser(str(args.phb_path, sys.getfilesystemencoding())))
-
-def header(text, subtext=None):
-    print()
-    print("* "*30)
-    print(text.center(60))
-    if subtext:
-        print(subtext.center(60))
-    print("* "*30)
-    print()
-
-### Data dump
-if not args.nojson:
-    header("Dumping Phobos Data", dump_path)
-
-    import reverence
-    from flow import FlowManager
-    from miner import *
-    from translator import Translator
-    from writer import *
-
-    rvr = reverence.blue.EVE(eve_path, cachepath=args.cache_path, sharedcachepath=res_path, server="singularity" if args.singularity else "tranquility")
-    print("EVE Directory: {}".format(rvr.paths.root))
-    print("Cache Directory: {}".format(rvr.paths.cache))
-    print("Shared Resource Directory: {}".format(rvr.paths.sharedcache))
-    print()
-
-    pickle_miner = ResourcePickleMiner(rvr)
-    trans = Translator(pickle_miner)
-    bulkdata_miner = BulkdataMiner(rvr, trans)
-    staticcache_miner = ResourceStaticCacheMiner(rvr, trans)
-    miners = (
-        MetadataMiner(eve_path),
-        bulkdata_miner,
-        staticcache_miner,
-        TraitMiner(staticcache_miner, bulkdata_miner, trans),
-        SqliteMiner(rvr.paths.root, trans),
-        CachedCallsMiner(rvr, trans),
-        pickle_miner
-    )
-
-    writers = (
-        JsonWriter(dump_path, indent=2),
-    )
-
-    list = "dgmexpressions,dgmattribs,dgmeffects,dgmtypeattribs,dgmtypeeffects,"\
-           "dgmunits,invcategories,invgroups,invmetagroups,invmetatypes,"\
-           "invtypes,mapbulk_marketGroups,phbmetadata,phbtraits,fsdTypeOverrides,"\
-           "evegroups,evetypes,evecategories,mapbulk_marketGroups,clonegrades"
-
-    FlowManager(miners, writers).run(list, "en-us")
-
-### SQL Convert
-import jsonToSql
-
-db_file = os.path.join(dump_path, "eve.db")
-header("Converting Data to SQL", db_file)
-
-if os.path.isfile(db_file):
-    os.remove(db_file)
-
-jsonToSql.main("sqlite:///"+db_file, dump_path)
-
-### Diff generation
-import itemDiff
-diff_file = os.path.join(dump_path, "diff.txt")
-old_db = os.path.join(script_path, "..", "eve.db")
-
-header("Generating DIFF", diff_file)
-old_stdout = sys.stdout
-sys.stdout = open(diff_file, 'w')
-itemDiff.main(old=old_db, new=db_file)
-sys.stdout = old_stdout
-
-print("\nAll done.")
diff --git a/service/character.py b/service/character.py
index 9a3727620..f5e771872 100644
--- a/service/character.py
+++ b/service/character.py
@@ -123,6 +123,7 @@ class SkillBackupThread(threading.Thread):
 
         wx.CallAfter(self.callback)
 
+
 class Character(object):
     instance = None
     skillReqsDict = {}
diff --git a/service/esi.py b/service/esi.py
index add64537b..2ccd460b0 100644
--- a/service/esi.py
+++ b/service/esi.py
@@ -2,75 +2,34 @@
 import wx
 from logbook import Logger
 import threading
-import uuid
 import time
-import config
 import base64
 import json
-import os
 import config
 import webbrowser
 
 import eos.db
-import datetime
 from eos.enum import Enum
 from eos.saveddata.ssocharacter import SsoCharacter
+from service.esiAccess import APIException, SsoMode
 import gui.globalEvents as GE
 from service.server import StoppableHTTPServer, AuthHandler
 from service.settings import EsiSettings
+from service.esiAccess import EsiAccess
 
-from .esi_security_proxy import EsiSecurityProxy
-from esipy import EsiClient, EsiApp
-from esipy.cache import FileCache
+from requests import Session
 
 pyfalog = Logger(__name__)
 
-cache_path = os.path.join(config.savePath, config.ESI_CACHE)
-
-from esipy.events import AFTER_TOKEN_REFRESH
-
-if not os.path.exists(cache_path):
-    os.mkdir(cache_path)
-
-file_cache = FileCache(cache_path)
-
-
-class Servers(Enum):
-    TQ = 0
-    SISI = 1
-
 
 class LoginMethod(Enum):
     SERVER = 0
     MANUAL = 1
 
 
-class Esi(object):
-    esiapp = None
-    esi_v1 = None
-    esi_v4 = None
-
-    _initializing = None
-
+class Esi(EsiAccess):
     _instance = None
 
-    @classmethod
-    def initEsiApp(cls):
-        if cls._initializing is None:
-            cls._initializing = True
-            cls.esiapp = EsiApp(cache=file_cache, cache_time=None, cache_prefix='pyfa{0}-esipy-'.format(config.version))
-            cls.esi_v1 = cls.esiapp.get_v1_swagger
-            cls.esi_v4 = cls.esiapp.get_v4_swagger
-            cls._initializing = False
-
-    @classmethod
-    def genEsiClient(cls, security=None):
-        return EsiClient(
-            security=EsiSecurityProxy(sso_url=config.ESI_AUTH_PROXY) if security is None else security,
-            cache=file_cache,
-            headers={'User-Agent': 'pyfa esipy'}
-        )
-
     @classmethod
     def getInstance(cls):
         if cls._instance is None:
@@ -79,11 +38,9 @@ class Esi(object):
         return cls._instance
 
     def __init__(self):
-        Esi.initEsiApp()
-
         self.settings = EsiSettings.getInstance()
 
-        AFTER_TOKEN_REFRESH.add_receiver(self.tokenUpdate)
+        super().__init__()
 
         # these will be set when needed
         self.httpd = None
@@ -92,18 +49,14 @@ class Esi(object):
 
         self.implicitCharacter = None
 
-        # The database cache does not seem to be working for some reason. Use
-        # this as a temporary measure
-        self.charCache = {}
+        # until I can get around to making proper caching and modifications to said cache, storee deleted fittings here
+        # so that we can easily hide them in the fitting browser
+        self.fittings_deleted = set()
 
         # need these here to post events
         import gui.mainFrame  # put this here to avoid loop
         self.mainFrame = gui.mainFrame.MainFrame.getInstance()
 
-    def tokenUpdate(self, **kwargs):
-        print(kwargs)
-        pass
-
     def delSsoCharacter(self, id):
         char = eos.db.getSsoCharacter(id, config.getClientSecret())
 
@@ -120,103 +73,52 @@ class Esi(object):
         return chars
 
     def getSsoCharacter(self, id):
-        """
-        Get character, and modify to include the eve connection
-        """
         char = eos.db.getSsoCharacter(id, config.getClientSecret())
-        if char is not None and char.esi_client is None:
-            char.esi_client = Esi.genEsiClient()
-            Esi.update_token(char, Esi.get_sso_data(char)) # don't use update_token on security directly, se still need to apply the values here
-
         eos.db.commit()
         return char
 
     def getSkills(self, id):
         char = self.getSsoCharacter(id)
-        op = Esi.esi_v4.op['get_characters_character_id_skills'](character_id=char.characterID)
-        resp = char.esi_client.request(op)
-        return resp.data
+        resp = super().getSkills(char)
+        return resp.json()
 
     def getSecStatus(self, id):
         char = self.getSsoCharacter(id)
-        op = Esi.esi_v4.op['get_characters_character_id'](character_id=char.characterID)
-        resp = char.esi_client.request(op)
-        return resp.data
+        resp = super().getSecStatus(char)
+        return resp.json()
 
     def getFittings(self, id):
         char = self.getSsoCharacter(id)
-        op = Esi.esi_v1.op['get_characters_character_id_fittings'](character_id=char.characterID)
-        resp = char.esi_client.request(op)
-        return resp.data
+        resp = super().getFittings(char)
+        return resp.json()
 
     def postFitting(self, id, json_str):
         # @todo: new fitting ID can be recovered from resp.data,
         char = self.getSsoCharacter(id)
-        op = Esi.esi_v1.op['post_characters_character_id_fittings'](
-            character_id=char.characterID,
-            fitting=json.loads(json_str)
-        )
-        resp = char.esi_client.request(op)
-        return resp.data
+        resp = super().postFitting(char, json_str)
+        return resp.json()
 
     def delFitting(self, id, fittingID):
         char = self.getSsoCharacter(id)
-        op = Esi.esi_v1.op['delete_characters_character_id_fittings_fitting_id'](
-            character_id=char.characterID,
-            fitting_id=fittingID
-        )
-        resp = char.esi_client.request(op)
-        return resp.data
-
-    @staticmethod
-    def get_sso_data(char):
-        """ Little "helper" function to get formated data for esipy security
-        """
-        return {
-            'access_token': char.accessToken,
-            'refresh_token': config.cipher.decrypt(char.refreshToken).decode(),
-            'expires_in': (char.accessTokenExpires - datetime.datetime.utcnow()).total_seconds()
-        }
-
-    @staticmethod
-    def update_token(char, tokenResponse):
-        """ helper function to update token data from SSO response """
-        char.accessToken = tokenResponse['access_token']
-        char.accessTokenExpires = datetime.datetime.fromtimestamp(time.time() + tokenResponse['expires_in'])
-        if 'refresh_token' in tokenResponse:
-            char.refreshToken = config.cipher.encrypt(tokenResponse['refresh_token'].encode())
-        if char.esi_client is not None:
-            char.esi_client.security.update_token(tokenResponse)
+        super().delFitting(char, fittingID)
+        self.fittings_deleted.add(fittingID)
 
     def login(self):
         serverAddr = None
-        if self.settings.get('loginMode') == LoginMethod.SERVER:
-            serverAddr = self.startServer()
+        # always start the local server if user is using client details. Otherwise, start only if they choose to do so.
+        if self.settings.get('ssoMode') == SsoMode.CUSTOM or self.settings.get('loginMode') == LoginMethod.SERVER:
+            # random port, or if it's custom application, use a defined port
+            serverAddr = self.startServer(6461 if self.settings.get('ssoMode') == SsoMode.CUSTOM else 0)
         uri = self.getLoginURI(serverAddr)
         webbrowser.open(uri)
-        wx.PostEvent(self.mainFrame, GE.SsoLoggingIn(login_mode=self.settings.get('loginMode')))
+        wx.PostEvent(self.mainFrame, GE.SsoLoggingIn(sso_mode=self.settings.get('ssoMode'), login_mode=self.settings.get('loginMode')))
 
     def stopServer(self):
         pyfalog.debug("Stopping Server")
         self.httpd.stop()
         self.httpd = None
 
-    def getLoginURI(self, redirect=None):
-        self.state = str(uuid.uuid4())
-        esisecurity = EsiSecurityProxy(sso_url=config.ESI_AUTH_PROXY)
-
-        args = {
-            'state': self.state,
-            'pyfa_version': config.version,
-            'login_method': self.settings.get('loginMode')
-        }
-
-        if redirect is not None:
-            args['redirect'] = redirect
-
-        return esisecurity.get_auth_uri(**args)
-
-    def startServer(self):  # todo: break this out into two functions: starting the server, and getting the URI
+    def startServer(self, port):  # todo: break this out into two functions: starting the server, and getting the URI
         pyfalog.debug("Starting server")
 
         # we need this to ensure that the previous get_request finishes, and then the socket will close
@@ -224,7 +126,7 @@ class Esi(object):
             self.stopServer()
             time.sleep(1)
 
-        self.httpd = StoppableHTTPServer(('localhost', 0), AuthHandler)
+        self.httpd = StoppableHTTPServer(('localhost', port), AuthHandler)
         port = self.httpd.socket.getsockname()[1]
         self.serverThread = threading.Thread(target=self.httpd.serve, args=(self.handleServerLogin,))
         self.serverThread.name = "SsoCallbackServer"
@@ -233,31 +135,41 @@ class Esi(object):
 
         return 'http://localhost:{}'.format(port)
 
-    def handleLogin(self, ssoInfo):
-        auth_response = json.loads(base64.b64decode(ssoInfo))
+    def handleLogin(self, message):
 
-        # We need to preload the ESI Security object beforehand with the auth response so that we can use verify to
-        # get character information
-        # init the security object
-        esisecurity = EsiSecurityProxy(sso_url=config.ESI_AUTH_PROXY)
+        # we already have authenticated stuff for the auto mode
+        if (self.settings.get('ssoMode') == SsoMode.AUTO):
+            ssoInfo = message['SSOInfo'][0]
+            auth_response = json.loads(base64.b64decode(ssoInfo))
+        else:
+            # otherwise, we need to fetch the information
+            auth_response = self.auth(message['code'][0])
 
-        esisecurity.update_token(auth_response)
-
-        # we get the character information
-        cdata = esisecurity.verify()
+        res = self._session.get(
+            self.oauth_verify,
+            headers=self.get_oauth_header(auth_response['access_token'])
+        )
+        if res.status_code != 200:
+            raise APIException(
+                self.oauth_verify,
+                res.status_code,
+                res.json()
+            )
+        cdata = res.json()
         print(cdata)
 
         currentCharacter = self.getSsoCharacter(cdata['CharacterName'])
 
         if currentCharacter is None:
             currentCharacter = SsoCharacter(cdata['CharacterID'], cdata['CharacterName'], config.getClientSecret())
-            currentCharacter.esi_client = Esi.genEsiClient(esisecurity)
 
-        Esi.update_token(currentCharacter, auth_response)  # this also sets the esi security token
+        Esi.update_token(currentCharacter, auth_response)
 
         eos.db.save(currentCharacter)
         wx.PostEvent(self.mainFrame, GE.SsoLogin(character=currentCharacter))
 
+    # get (endpoint, char, data?)
+
     def handleServerLogin(self, message):
         if not message:
             raise Exception("Could not parse out querystring parameters.")
@@ -268,4 +180,4 @@ class Esi(object):
 
         pyfalog.debug("Handling SSO login with: {0}", message)
 
-        self.handleLogin(message['SSOInfo'][0])
+        self.handleLogin(message)
diff --git a/service/esiAccess.py b/service/esiAccess.py
new file mode 100644
index 000000000..bbddc6384
--- /dev/null
+++ b/service/esiAccess.py
@@ -0,0 +1,284 @@
+'''
+
+A lot of the inspiration (and straight up code copying!) for this class comes from EsiPy <https://github.com/Kyria/EsiPy>
+Much of the credit goes to the maintainer of that package, Kyria <tweetfleet slack: @althalus>. The reasoning for no
+longer using EsiPy was due to it's reliance on pyswagger, which has caused a bit of a headache in how it operates on a
+low level.
+
+Eventually I'll rewrite this to be a bit cleaner and a bit more generic, but for now, it works!
+
+'''
+
+# noinspection PyPackageRequirements
+from logbook import Logger
+import uuid
+import time
+import config
+import base64
+
+import datetime
+from eos.enum import Enum
+from service.settings import EsiSettings, NetworkSettings
+
+from requests import Session
+from urllib.parse import urlencode, quote
+
+pyfalog = Logger(__name__)
+
+# todo: reimplement Caching for calls
+# from esipy.cache import FileCache
+# file_cache = FileCache(cache_path)
+# cache_path = os.path.join(config.savePath, config.ESI_CACHE)
+#
+# if not os.path.exists(cache_path):
+#     os.mkdir(cache_path)
+#
+
+
+scopes = [
+    'esi-skills.read_skills.v1',
+    'esi-fittings.read_fittings.v1',
+    'esi-fittings.write_fittings.v1'
+]
+
+
+class SsoMode(Enum):
+    AUTO = 0
+    CUSTOM = 1
+
+
+class APIException(Exception):
+    """ Exception for SSO related errors """
+
+    def __init__(self, url, code, json_response):
+        self.url = url
+        self.status_code = code
+        self.response = json_response
+        super(APIException, self).__init__(str(self))
+
+    def __str__(self):
+        if 'error' in self.response:
+            return 'HTTP Error %s: %s' % (self.status_code,
+                                          self.response['error'])
+        elif 'message' in self.response:
+            return 'HTTP Error %s: %s' % (self.status_code,
+                                          self.response['message'])
+        return 'HTTP Error %s' % (self.status_code)
+
+
+class ESIEndpoints(Enum):
+    CHAR = "/v4/characters/{character_id}/"
+    CHAR_SKILLS = "/v4/characters/{character_id}/skills/"
+    CHAR_FITTINGS = "/v1/characters/{character_id}/fittings/"
+    CHAR_DEL_FIT = "/v1/characters/{character_id}/fittings/{fitting_id}/"
+
+
+class EsiAccess(object):
+    def __init__(self):
+        self.settings = EsiSettings.getInstance()
+
+        # session request stuff
+        self._session = Session()
+        self._session.headers.update({
+            'Accept': 'application/json',
+            'User-Agent': (
+                'pyfa v{}'.format(config.version)
+            )
+        })
+        self._session.proxies = NetworkSettings.getInstance().getProxySettingsInRequestsFormat()
+
+    @property
+    def sso_url(self):
+        if (self.settings.get("ssoMode") == SsoMode.CUSTOM):
+            return "https://login.eveonline.com"
+        return "https://www.pyfa.io"
+
+    @property
+    def esi_url(self):
+        return "https://esi.tech.ccp.is"
+
+    @property
+    def oauth_verify(self):
+        return '%s/verify/' % self.esi_url
+
+    @property
+    def oauth_authorize(self):
+        return '%s/oauth/authorize' % self.sso_url
+
+    @property
+    def oauth_token(self):
+        return '%s/oauth/token' % self.sso_url
+
+    def getSkills(self, char):
+        return self.get(char, ESIEndpoints.CHAR_SKILLS, character_id=char.characterID)
+
+    def getSecStatus(self, char):
+        return self.get(char, ESIEndpoints.CHAR, character_id=char.characterID)
+
+    def getFittings(self, char):
+        return self.get(char, ESIEndpoints.CHAR_FITTINGS, character_id=char.characterID)
+
+    def postFitting(self, char, json_str):
+        # @todo: new fitting ID can be recovered from resp.data,
+        return self.post(char, ESIEndpoints.CHAR_FITTINGS, json_str, character_id=char.characterID)
+
+    def delFitting(self, char, fittingID):
+        return self.delete(char, ESIEndpoints.CHAR_DEL_FIT, character_id=char.characterID, fitting_id=fittingID)
+
+    @staticmethod
+    def update_token(char, tokenResponse):
+        """ helper function to update token data from SSO response """
+        char.accessToken = tokenResponse['access_token']
+        char.accessTokenExpires = datetime.datetime.fromtimestamp(time.time() + tokenResponse['expires_in'])
+        if 'refresh_token' in tokenResponse:
+            char.refreshToken = config.cipher.encrypt(tokenResponse['refresh_token'].encode())
+
+    def getLoginURI(self, redirect=None):
+        self.state = str(uuid.uuid4())
+
+        if (self.settings.get("ssoMode") == SsoMode.AUTO):
+            args = {
+                'state': self.state,
+                'pyfa_version': config.version,
+                'login_method': self.settings.get('loginMode'),
+                'client_hash': config.getClientSecret()
+            }
+
+            if redirect is not None:
+                args['redirect'] = redirect
+
+            return '%s?%s' % (
+                self.oauth_authorize,
+                urlencode(args)
+            )
+        else:
+            return '%s?response_type=%s&redirect_uri=%s&client_id=%s%s%s' % (
+                self.oauth_authorize,
+                'code',
+                quote('http://localhost:6461', safe=''),
+                self.settings.get('clientID'),
+                '&scope=%s' % '+'.join(scopes) if scopes else '',
+                '&state=%s' % self.state
+            )
+
+    def get_oauth_header(self, token):
+        """ Return the Bearer Authorization header required in oauth calls
+
+        :return: a dict with the authorization header
+        """
+        return {'Authorization': 'Bearer %s' % token}
+
+    def get_refresh_token_params(self, refreshToken):
+        """ Return the param object for the post() call to get the access_token
+        from the refresh_token
+
+        :param code: the refresh token
+        :return: a dict with the url, params and header
+        """
+        if refreshToken is None:
+            raise AttributeError('No refresh token is defined.')
+
+        data = {
+            'grant_type': 'refresh_token',
+            'refresh_token': refreshToken,
+        }
+
+        if self.settings.get('ssoMode') == SsoMode.AUTO:
+            # data is all we really need, the rest is handled automatically by pyfa.io
+            return {
+                'data': data,
+                'url': self.oauth_token,
+            }
+
+        # otherwise, we need to make the token with the client keys
+        return self.__make_token_request_parameters(data)
+
+    def __get_token_auth_header(self):
+        """ Return the Basic Authorization header required to get the tokens
+
+        :return: a dict with the headers
+        """
+        # encode/decode for py2/py3 compatibility
+        auth_b64 = "%s:%s" % (self.settings.get('clientID'), self.settings.get('clientSecret'))
+        auth_b64 = base64.b64encode(auth_b64.encode('latin-1'))
+        auth_b64 = auth_b64.decode('latin-1')
+
+        return {'Authorization': 'Basic %s' % auth_b64}
+
+    def __make_token_request_parameters(self, params):
+        request_params = {
+            'headers': self.__get_token_auth_header(),
+            'data': params,
+            'url': self.oauth_token,
+        }
+
+        return request_params
+
+    def get_access_token_request_params(self, code):
+        return self.__make_token_request_parameters(
+            {
+                'grant_type': 'authorization_code',
+                'code': code,
+            }
+        )
+
+    def auth(self, code):
+        request_data = self.get_access_token_request_params(code)
+        res = self._session.post(**request_data)
+        if res.status_code != 200:
+            raise Exception(
+                request_data['url'],
+                res.status_code,
+                res.json()
+            )
+        json_res = res.json()
+        return json_res
+
+    def refresh(self, ssoChar):
+        request_data = self.get_refresh_token_params(config.cipher.decrypt(ssoChar.refreshToken).decode())
+        res = self._session.post(**request_data)
+        if res.status_code != 200:
+            raise APIException(
+                request_data['url'],
+                res.status_code,
+                res.json()
+            )
+        json_res = res.json()
+        self.update_token(ssoChar, json_res)
+        return json_res
+
+    def _before_request(self, ssoChar):
+        if ssoChar.is_token_expired():
+            pyfalog.info("Refreshing token for {}".format(ssoChar.characterName))
+            self.refresh(ssoChar)
+
+        if ssoChar.accessToken is not None:
+            self._session.headers.update(self.get_oauth_header(ssoChar.accessToken))
+
+    def _after_request(self, resp):
+        if ("warning" in resp.headers):
+            pyfalog.warn("{} - {}".format(resp.headers["warning"], resp.url))
+
+        if resp.status_code >= 400:
+            raise APIException(
+                resp.url,
+                resp.status_code,
+                resp.json()
+            )
+
+        return resp
+
+    def get(self, ssoChar, endpoint, *args, **kwargs):
+        self._before_request(ssoChar)
+        endpoint = endpoint.format(**kwargs)
+        return self._after_request(self._session.get("{}{}".format(self.esi_url, endpoint)))
+
+    def post(self, ssoChar, endpoint, json, *args, **kwargs):
+        self._before_request(ssoChar)
+        endpoint = endpoint.format(**kwargs)
+        return self._after_request(self._session.post("{}{}".format(self.esi_url, endpoint), data=json))
+
+    def delete(self, ssoChar, endpoint, *args, **kwargs):
+        self._before_request(ssoChar)
+        endpoint = endpoint.format(**kwargs)
+        return self._after_request(self._session.delete("{}{}".format(self.esi_url, endpoint)))
diff --git a/service/esi_security_proxy.py b/service/esi_security_proxy.py
deleted file mode 100644
index 7c29f80b0..000000000
--- a/service/esi_security_proxy.py
+++ /dev/null
@@ -1,235 +0,0 @@
-# -*- encoding: utf-8 -*-
-""" EsiPy Security Proxy - An ESI Security class that directs authentication towards a third-party service.
-Client key/secret not needed.
-"""
-
-from __future__ import absolute_import
-
-import base64
-import logging
-import time
-
-from requests import Session
-from requests.utils import quote
-from six.moves.urllib.parse import urlparse
-from urllib.parse import urlencode
-
-from esipy.events import AFTER_TOKEN_REFRESH
-from esipy.exceptions import APIException
-LOGGER = logging.getLogger(__name__)
-
-
-class EsiSecurityProxy(object):
-    """ Contains all the OAuth2 knowledge for ESI use.
-    Based on pyswagger Security object, to be used with pyswagger BaseClient
-    implementation.
-    """
-
-    def __init__(
-            self,
-            **kwargs):
-        """ Init the ESI Security Object
-
-        :param sso_url: the default sso URL used when no "app" is provided
-        :param esi_url: the default esi URL used for verify endpoint
-        :param app: (optionnal) the pyswagger app object
-        :param security_name: (optionnal) the name of the object holding the
-        informations in the securityDefinitions, used to check authed endpoint
-        """
-
-        app = kwargs.pop('app', None)
-        sso_url = kwargs.pop('sso_url', "https://login.eveonline.com")
-        esi_url = kwargs.pop('esi_url', "https://esi.tech.ccp.is")
-
-        self.security_name = kwargs.pop('security_name', 'evesso')
-
-        # we provide app object, so we don't use sso_url
-        if app is not None:
-            # check if the security_name exists in the securityDefinition
-            security = app.root.securityDefinitions.get(
-                self.security_name,
-                None
-            )
-            if security is None:
-                raise NameError(
-                    "%s is not defined in the securityDefinitions" %
-                    self.security_name
-                )
-
-            self.oauth_authorize = security.authorizationUrl
-
-            # some URL we still need to "manually" define... sadly
-            # we parse the authUrl so we don't care if it's TQ or SISI.
-            # https://github.com/ccpgames/esi-issues/issues/92
-            parsed_uri = urlparse(security.authorizationUrl)
-            self.oauth_token = '%s://%s/oauth/token' % (
-                parsed_uri.scheme,
-                parsed_uri.netloc
-            )
-
-        # no app object is provided, so we use direct URLs
-        else:
-            if sso_url is None or sso_url == "":
-                raise AttributeError("sso_url cannot be None or empty "
-                                     "without app parameter")
-
-            self.oauth_authorize = '%s/oauth/authorize' % sso_url
-            self.oauth_token = '%s/oauth/token' % sso_url
-
-        # use ESI url for verify, since it's better for caching
-        if esi_url is None or esi_url == "":
-            raise AttributeError("esi_url cannot be None or empty")
-        self.oauth_verify = '%s/verify/' % esi_url
-
-        # session request stuff
-        self._session = Session()
-        self._session.headers.update({
-            'Accept': 'application/json',
-            'User-Agent': (
-                'EsiPy/Security/ - '
-                'https://github.com/Kyria/EsiPy'
-            )
-        })
-
-        # token data
-        self.refresh_token = None
-        self.access_token = None
-        self.token_expiry = None
-
-    def __get_oauth_header(self):
-        """ Return the Bearer Authorization header required in oauth calls
-
-        :return: a dict with the authorization header
-        """
-        return {'Authorization': 'Bearer %s' % self.access_token}
-
-    def __make_token_request_parameters(self, params):
-        """ Return the token uri from the securityDefinition
-
-        :param params: the data given to the request
-        :return: the oauth/token uri
-        """
-        request_params = {
-            'data': params,
-            'url': self.oauth_token,
-        }
-
-        return request_params
-
-    def get_auth_uri(self, *args, **kwargs):
-        """ Constructs the full auth uri and returns it.
-
-        :param state: The state to pass through the auth process
-        :param redirect: The URI that the proxy server will redirect to
-        :return: the authorizationUrl with the correct parameters.
-        """
-
-        return '%s?%s' % (
-            self.oauth_authorize,
-            urlencode(kwargs)
-        )
-
-    def get_refresh_token_params(self):
-        """ Return the param object for the post() call to get the access_token
-        from the refresh_token
-
-        :param code: the refresh token
-        :return: a dict with the url, params and header
-        """
-        if self.refresh_token is None:
-            raise AttributeError('No refresh token is defined.')
-
-        return self.__make_token_request_parameters(
-            {
-                'grant_type': 'refresh_token',
-                'refresh_token': self.refresh_token,
-            }
-        )
-
-    def update_token(self, response_json):
-        """ Update access_token, refresh_token and token_expiry from the
-        response body.
-        The response must be converted to a json object before being passed as
-        a parameter
-
-        :param response_json: the response body to use.
-        """
-        self.access_token = response_json['access_token']
-        self.token_expiry = int(time.time()) + response_json['expires_in']
-
-        if 'refresh_token' in response_json:
-            self.refresh_token = response_json['refresh_token']
-
-    def is_token_expired(self, offset=0):
-        """ Return true if the token is expired.
-
-        The offset can be used to change the expiry time:
-        - positive value decrease the time (sooner)
-        - negative value increase the time (later)
-        If the expiry is not set, always return True. This case allow the users
-        to define a security object, only knowing the refresh_token and get
-        a new access_token / expiry_time without errors.
-
-        :param offset: the expiry offset (in seconds) [default: 0]
-        :return: boolean true if expired, else false.
-        """
-        if self.token_expiry is None:
-            return True
-        return int(time.time()) >= (self.token_expiry - offset)
-
-    def refresh(self):
-        """ Update the auth data (tokens) using the refresh token in auth.
-        """
-        request_data = self.get_refresh_token_params()
-        res = self._session.post(**request_data)
-        if res.status_code != 200:
-            raise APIException(
-                request_data['url'],
-                res.status_code,
-                res.json()
-            )
-        json_res = res.json()
-        self.update_token(json_res)
-        return json_res
-
-    def verify(self):
-        """ Make a get call to the oauth/verify endpoint to get the user data
-
-        :return: the json with the data.
-        """
-        res = self._session.get(
-            self.oauth_verify,
-            headers=self.__get_oauth_header()
-        )
-        if res.status_code != 200:
-            raise APIException(
-                self.oauth_verify,
-                res.status_code,
-                res.json()
-            )
-        return res.json()
-
-    def __call__(self, request):
-        """ Check if the request need security header and apply them.
-        Required for pyswagger.core.BaseClient.request().
-
-        :param request: the pyswagger request object to check
-        :return: the updated request.
-        """
-        if not request._security:
-            return request
-
-        if self.is_token_expired():
-            json_response = self.refresh()
-            AFTER_TOKEN_REFRESH.send(**json_response)
-
-        for security in request._security:
-            if self.security_name not in security:
-                LOGGER.warning(
-                    "Missing Securities: [%s]" % ", ".join(security.keys())
-                )
-                continue
-            if self.access_token is not None:
-                request._p['header'].update(self.__get_oauth_header())
-
-        return request
diff --git a/service/fit.py b/service/fit.py
index e3875305b..a775b7343 100644
--- a/service/fit.py
+++ b/service/fit.py
@@ -74,7 +74,7 @@ class Fit(object):
             "exportCharges": True,
             "openFitInNew": False,
             "priceSystem": "Jita",
-            "priceSource": "eve-central.com",
+            "priceSource": "eve-marketdata.com",
             "showShipBrowserTooltip": True,
             "marketSearchDelay": 250
         }
@@ -1209,11 +1209,9 @@ class Fit(object):
         start_time = time()
         pyfalog.info("=" * 10 + "recalc: {0}" + "=" * 10, fit.name)
 
-
         fit.factorReload = self.serviceFittingOptions["useGlobalForceReload"]
         fit.clear()
 
         fit.calculateModifiedAttributes()
 
         pyfalog.info("=" * 10 + "recalc time: " + str(time() - start_time) + "=" * 10)
-
diff --git a/service/jargon/defaults.yaml b/service/jargon/defaults.yaml
index 0217bc87c..50d2ab13d 100644
--- a/service/jargon/defaults.yaml
+++ b/service/jargon/defaults.yaml
@@ -19,6 +19,7 @@ cpu: Co-Processor
 coproc: Co-Processor
 dc: Damage Control
 dcu: Damage Control
+dda: Drone Damage Amplifier
 disco: Smartbomb
 eanm: Energized Adaptive Nano Membrane
 enam: Energized Adaptive Nano Membrane
diff --git a/service/jargon/header.yaml b/service/jargon/header.yaml
index 031effff6..312aca5b6 100644
--- a/service/jargon/header.yaml
+++ b/service/jargon/header.yaml
@@ -12,3 +12,10 @@
 # Syntax:
 #
 #   abbreviation: full name
+#
+# The default jargon definitions are stored in Pyfa itself as well, and are
+# listed here for convenience overriding them. To disable a jargon definition,
+# set it as an empty string. For example, if you do not want "web" to return
+# anything containing "stasis":
+#
+#   web: ""
diff --git a/service/jargon/jargon.py b/service/jargon/jargon.py
index 0a5065faf..bc9a0d525 100644
--- a/service/jargon/jargon.py
+++ b/service/jargon/jargon.py
@@ -20,17 +20,18 @@
 import config
 import pkg_resources
 
+
 class Jargon(object):
     def __init__(self, rawdata: dict):
         self._rawdata = rawdata
 
         # copy the data to lowercase keys, ignore blank keys
-        self._data = {str(k).lower():v for k,v in rawdata.items() if k}
+        self._data = {str(k).lower(): v for k, v in rawdata.items() if k}
 
     def get(self, term: str) -> str:
         return self._data.get(term.lower())
 
-    def get_rawdata() -> dict:
+    def get_rawdata(self) -> dict:
         return self._rawdata
 
     def apply(self, query):
diff --git a/service/jargon/loader.py b/service/jargon/loader.py
index 11e95b7c4..be34a298e 100644
--- a/service/jargon/loader.py
+++ b/service/jargon/loader.py
@@ -26,16 +26,12 @@ from .resources import DEFAULT_DATA, DEFAULT_HEADER
 
 JARGON_PATH = os.path.join(config.savePath, 'jargon.yaml')
 
+
 class JargonLoader(object):
     def __init__(self, jargon_path: str):
         self.jargon_path = jargon_path
-        self._jargon_mtime = 0 # type: int
-        self._jargon = None # type: Jargon
-
-    def save_jargon(self, data: Jargon):
-        rawdata = data.get_rawdata()
-        with open(JARGON_PATH, 'w') as f:
-            yaml.dump(rawdata, stream=f, default_flow_style=False)
+        self._jargon_mtime = 0  # type: int
+        self._jargon = None  # type: Jargon
 
     def get_jargon(self) -> Jargon:
         if self._is_stale():
@@ -47,10 +43,12 @@ class JargonLoader(object):
                 self.jargon_mtime != self._get_jargon_file_mtime())
 
     def _load_jargon(self):
+        jargondata = yaml.load(DEFAULT_DATA)
         with open(JARGON_PATH) as f:
-            rawdata = yaml.load(f)
+            userdata = yaml.load(f)
+        jargondata.update(userdata)
         self.jargon_mtime = self._get_jargon_file_mtime()
-        self._jargon = Jargon(rawdata)
+        self._jargon = Jargon(jargondata)
 
     def _get_jargon_file_mtime(self) -> int:
         if not os.path.exists(self.jargon_path):
@@ -60,17 +58,22 @@ class JargonLoader(object):
     @staticmethod
     def init_user_jargon(jargon_path):
         values = yaml.load(DEFAULT_DATA)
-        if os.path.exists(jargon_path):
-            with open(jargon_path) as f:
-                custom_values = yaml.load(f)
-            if custom_values:
-                values.update(custom_values)
-        with open(jargon_path, 'w') as f:
-            f.write(DEFAULT_HEADER)
-            f.write('\n\n')
-            yaml.dump(values, stream=f, default_flow_style=False)
+
+        # Disabled for issue/1533; do not overwrite existing user config
+        # if os.path.exists(jargon_path):
+        #     with open(jargon_path) as f:
+        #         custom_values = yaml.load(f)
+        #     if custom_values:
+        #         values.update(custom_values)
+
+        if not os.path.exists(jargon_path):
+            with open(jargon_path, 'w') as f:
+                f.write(DEFAULT_HEADER)
+                f.write('\n\n')
+                yaml.dump(values, stream=f, default_flow_style=False)
 
     _instance = None
+
     @staticmethod
     def instance(jargon_path=None):
         if not JargonLoader._instance:
@@ -78,4 +81,5 @@ class JargonLoader(object):
             JargonLoader._instance = JargonLoader(jargon_path)
         return JargonLoader._instance
 
+
 JargonLoader.init_user_jargon(JARGON_PATH)
diff --git a/service/market.py b/service/market.py
index 70794f79b..dd2d60d14 100644
--- a/service/market.py
+++ b/service/market.py
@@ -41,6 +41,7 @@ pyfalog = Logger(__name__)
 # Event which tells threads dependent on Market that it's initialized
 mktRdy = threading.Event()
 
+
 class ShipBrowserWorkerThread(threading.Thread):
     def __init__(self):
         threading.Thread.__init__(self)
@@ -113,10 +114,8 @@ class SearchWorkerThread(threading.Thread):
             else:
                 filter_ = None
 
-
             jargon_request = self.jargonLoader.get_jargon().apply(request)
 
-
             results = []
             if len(request) >= config.minItemSearchLength:
                 results = eos.db.searchItems(request, where=filter_,
diff --git a/service/marketSources/__init__.py b/service/marketSources/__init__.py
index b093a0010..863b26494 100644
--- a/service/marketSources/__init__.py
+++ b/service/marketSources/__init__.py
@@ -1 +1 @@
-__all__ = ['evecentral', 'evemarketdata']
\ No newline at end of file
+__all__ = ['evemarketer', 'evemarketdata']
\ No newline at end of file
diff --git a/service/marketSources/evemarketdata.py b/service/marketSources/evemarketdata.py
index 0c7b53bff..be42cb66d 100644
--- a/service/marketSources/evemarketdata.py
+++ b/service/marketSources/evemarketdata.py
@@ -35,7 +35,7 @@ class EveMarketData(object):
     def __init__(self, types, system, priceMap):
         data = {}
         baseurl = "https://eve-marketdata.com/api/item_prices.xml"
-        data["system_id"] = system # Use Jita for market
+        data["system_id"] = system  # Use Jita for market
         data["type_ids"] = ','.join(str(x) for x in types)
 
         network = Network.getInstance()
diff --git a/service/marketSources/evecentral.py b/service/marketSources/evemarketer.py
similarity index 96%
rename from service/marketSources/evecentral.py
rename to service/marketSources/evemarketer.py
index 052941828..948b9ec48 100644
--- a/service/marketSources/evecentral.py
+++ b/service/marketSources/evemarketer.py
@@ -30,11 +30,11 @@ pyfalog = Logger(__name__)
 
 class EveCentral(object):
 
-    name = "eve-central.com"
+    name = "evemarketer"
 
     def __init__(self, types, system, priceMap):
         data = {}
-        baseurl = "https://eve-central.com/api/marketstat"
+        baseurl = "https://api.evemarketer.com/ec/marketstat"
 
         data["usesystem"] = system  # Use Jita for market
         data["typeid"] = set()
diff --git a/service/network.py b/service/network.py
index c1eeb7d15..0c3bfb2b9 100644
--- a/service/network.py
+++ b/service/network.py
@@ -93,25 +93,7 @@ class Network(object):
         # or with HTTP Basic auth support: proxies = {'http': 'http://user:pass@10.10.1.10:3128/'}
         # then you do: requests.get('http://example.org', proxies=proxies)
 
-        proxies = None
-        proxy_settings = NetworkSettings.getInstance().getProxySettings()
-        # proxy_settings is a tuple of (host, port), like  ('192.168.20.1', 3128), or None
-
-        if proxy_settings is not None:
-            # form proxy address in format "http://host:port
-            proxy_host_port = '{}:{}'.format(proxy_settings[0], proxy_settings[1])
-            proxy_auth_details = NetworkSettings.getInstance().getProxyAuthDetails()
-            # proxy_auth_details is a tuple of (login, password), or None
-            user_pass = ''
-            if proxy_auth_details is not None:
-                # construct prefix in form "user:password@"
-                user_pass = '{}:{}@'.format(proxy_auth_details[0], proxy_auth_details[1])
-            proxies = {
-                'http': 'http://' + user_pass + proxy_host_port,
-                'https': 'http://' + user_pass + proxy_host_port
-            }
-            # final form: { 'http': 'http://user:password@host:port', ... }, or
-            #             { 'http': 'http://host:port', ... }   if no auth info.
+        proxies = NetworkSettings.getInstance().getProxySettingsInRequestsFormat()
 
         try:
             resp = requests.get(url, headers=headers, proxies=proxies, **kwargs)
diff --git a/service/port.py b/service/port.py
index 7f58185be..37290f8f2 100644
--- a/service/port.py
+++ b/service/port.py
@@ -58,6 +58,7 @@ from collections import OrderedDict
 class ESIExportException(Exception):
     pass
 
+
 pyfalog = Logger(__name__)
 
 EFT_SLOT_ORDER = [Slot.LOW, Slot.MED, Slot.HIGH, Slot.RIG, Slot.SUBSYSTEM, Slot.SERVICE]
@@ -349,7 +350,6 @@ class Port(object):
 
         nested_dict = lambda: collections.defaultdict(nested_dict)
         fit = nested_dict()
-        sEsi = Esi.getInstance()
         sFit = svcFit.getInstance()
 
         # max length is 50 characters
diff --git a/service/price.py b/service/price.py
index 8bdd58b63..612937e39 100644
--- a/service/price.py
+++ b/service/price.py
@@ -234,4 +234,4 @@ class PriceWorkerThread(threading.Thread):
         self.wait[itemID].append(callback)
 
 
-from service.marketSources import evecentral, evemarketdata  # noqa: E402
+from service.marketSources import evemarketer, evemarketdata  # noqa: E402
diff --git a/service/server.py b/service/server.py
index 07da471b8..253b0417e 100644
--- a/service/server.py
+++ b/service/server.py
@@ -103,11 +103,18 @@ class AuthHandler(http.server.BaseHTTPRequestHandler):
     def log_message(self, format, *args):
         return
 
+import socketserver
 
 # http://code.activestate.com/recipes/425210-simple-stoppable-server-using-socket-timeout/
-class StoppableHTTPServer(http.server.HTTPServer):
+class StoppableHTTPServer(socketserver.TCPServer):
     def server_bind(self):
-        http.server.HTTPServer.server_bind(self)
+        # Can't use HTTPServer due to reliance on socket.getfqdn() which seems to be bugged.
+        # See https://github.com/pyfa-org/Pyfa/issues/1560#issuecomment-390095101
+        socketserver.TCPServer.server_bind(self)
+        host, port = self.server_address[:2]
+        self.server_name = host
+        self.server_port = port
+
         # self.settings = CRESTSettings.getInstance()
 
         # Allow listening for x seconds
diff --git a/service/settings.py b/service/settings.py
index ae5ce0e11..75bdb5405 100644
--- a/service/settings.py
+++ b/service/settings.py
@@ -284,6 +284,23 @@ class NetworkSettings(object):
         self.serviceNetworkSettings["login"] = login
         self.serviceNetworkSettings["password"] = password
 
+    def getProxySettingsInRequestsFormat(self) -> dict:
+        proxies = {}
+        proxy_settings = self.getProxySettings()
+        if proxy_settings is not None:
+            # form proxy address in format "http://host:port
+            proxy_host_port = '{}:{}'.format(proxy_settings[0], proxy_settings[1])
+            proxy_auth_details = self.getProxyAuthDetails()
+            user_pass = ''
+            if proxy_auth_details is not None:
+                # construct prefix in form "user:password@"
+                user_pass = '{}:{}@'.format(proxy_auth_details[0], proxy_auth_details[1])
+            proxies = {
+                'http': 'http://' + user_pass + proxy_host_port,
+                'https': 'http://' + user_pass + proxy_host_port
+            }
+        return proxies
+
 
 class HTMLExportSettings(object):
     """
@@ -363,10 +380,18 @@ class EsiSettings(object):
         return cls._instance
 
     def __init__(self):
+        # SSO Mode:
+        # 0 - pyfa.io
+        # 1 - custom application
         # LoginMode:
         # 0 - Server Start Up
         # 1 - User copy and paste data from website to pyfa
-        defaults = {"loginMode": 0, "clientID": "", "clientSecret": "", "timeout": 60}
+        defaults = {
+            "ssoMode": 0,
+            "loginMode": 0,
+            "clientID": "",
+            "clientSecret": "",
+            "timeout": 60}
 
         self.settings = SettingsProvider.getInstance().getSettings(
                 "pyfaServiceEsiSettings",
diff --git a/service/update.py b/service/update.py
index 86c56ef83..246b520fd 100644
--- a/service/update.py
+++ b/service/update.py
@@ -48,7 +48,12 @@ class CheckUpdateThread(threading.Thread):
         network = Network.getInstance()
 
         try:
-            response = network.request('https://api.github.com/repos/pyfa-org/Pyfa/releases', network.UPDATE)
+            try:
+                response = network.request('https://www.pyfa.io/update_check?pyfa_version={}&client_hash={}'.format(
+                    config.version, config.getClientSecret()), network.UPDATE)
+            except Exception as e:
+                response = network.request('https://api.github.com/repos/pyfa-org/Pyfa/releases', network.UPDATE)
+
             jsonResponse = response.json()
             jsonResponse.sort(
                 key=lambda x: calendar.timegm(dateutil.parser.parse(x['published_at']).utctimetuple()),
diff --git a/tox.ini b/tox.ini
index 3b150e6d0..c7490de61 100644
--- a/tox.ini
+++ b/tox.ini
@@ -7,7 +7,7 @@ passenv = CI TRAVIS TRAVIS_*
 deps =
     -rrequirements.txt
     -rrequirements_test.txt
-basepython = python2.7
+basepython = python3.6
 commands = py.test -vv --cov Pyfa tests2/
 
 [testenv:pep8]