diff --git a/Config/GUI.lua b/Config/GUI.lua
deleted file mode 100644
index 53235bd..0000000
--- a/Config/GUI.lua
+++ /dev/null
@@ -1,141 +0,0 @@
-
-local ADDON_NAME, Data = ...
-
-local Addon = LibStub("AceAddon-3.0"):GetAddon(ADDON_NAME)
-
-
-
-local tblConcat = table.concat
-
-
-do
-  Addon.GUI = {}
-  local GUI = Addon.GUI
-  
-  local links = setmetatable({}, {__index = function(t, k) return k end})
-  
-  function GUI:SwapLinks(link1, link2)
-    links[link1], links[link2] = links[link2], links[link1]
-  end
-  
-  local defaultInc   = 1000
-  local defaultOrder = 1000
-  local order        = defaultOrder
-  
-  function GUI:GetOrder()
-    return order
-  end
-  function GUI:SetOrder(newOrder)
-    order = newOrder
-    return self
-  end
-  function GUI:ResetOrder()
-    order = defaultOrder
-    return self
-  end
-  function GUI:Order(inc)
-    self:SetOrder(self:GetOrder() + (inc or defaultInc))
-    return self:GetOrder()
-  end
-  
-  function GUI:CreateEntry(opts, keys, name, desc, widgetType, disabled, order)
-    if type(keys) ~= "table" then keys = {keys} end
-    local key = widgetType .. "_" .. (tblConcat(keys, ".") or "")
-    opts.args[key] = {name = name, desc = desc, type = widgetType, order = order or self:Order(), disabled = disabled}
-    opts.args[key].set = function(info, val)        Addon:SetOption(val, unpack(keys)) end
-    opts.args[key].get = function(info)      return Addon:GetOption(unpack(keys))      end
-    return opts.args[key]
-  end
-  
-  function GUI:CreateHeader(opts, name)
-    return self:CreateEntry(opts, self:Order(), name, nil, "header", nil, self:Order(0))
-  end
-  
-  function GUI:CreateDescription(opts, desc, fontSize)
-    local option = self:CreateEntry(opts, self:Order(), desc, nil, "description", nil, self:Order(0))
-    option.fontSize = fontSize or "large"
-    return option
-  end
-  function GUI:CreateDivider(opts, count, fontSize)
-    for i = 1, count or 1 do
-      self:CreateDescription(opts, " ", fontSize or "small")
-    end
-  end
-  function GUI:CreateNewline(opts)
-    return self:CreateDescription(opts, " ", fontSize or "small")
-  end
-  
-  function GUI:CreateToggle(opts, keys, name, desc, disabled)
-    return self:CreateEntry(opts, keys, name, desc, "toggle", disabled)
-  end
-  
-  function GUI:CreateReverseToggle(opts, keys, name, desc, disabled)
-    local option = self:CreateEntry(opts, keys, name, desc, "toggle", disabled)
-    local set, get = option.set, option.get
-    option.set = function(info, val)        set(info, not val) end
-    option.get = function(info)      return not get()          end
-    return option
-  end
-  
-  function GUI:CreateSelect(opts, keys, name, desc, values, sorting, disabled)
-    local option = self:CreateEntry(opts, keys, name, desc, "select", disabled)
-    option.values  = values
-    option.sorting = sorting
-    option.style   = "dropdown"
-    return option
-  end
-  
-  function GUI:CreateMultiSelect(opts, keys, name, desc, values, disabled)
-    local option = self:CreateEntry(opts, keys, name, desc, "multiselect", disabled)
-    option.values  = values
-    return option
-  end
-  
-  function GUI:CreateRange(opts, keys, name, desc, min, max, step, disabled)
-    local option = self:CreateEntry(opts, keys, name, desc, "range", disabled)
-    option.min   = min
-    option.max   = max
-    option.step  = step
-    return option
-  end
-  
-  function GUI:CreateInput(opts, keys, name, desc, multiline, disabled)
-    local option     = self:CreateEntry(opts, keys, name, desc, "input", disabled)
-    option.multiline = multiline
-    return option
-  end
-  
-  function GUI:CreateColor(opts, keys, name, desc, disabled)
-    local option = self:CreateEntry(opts, keys, name, desc, "color", disabled)
-    option.set   = function(info, r, g, b)        Addon:SetOption(Addon:ConvertColorFromBlizzard(r, g, b), unpack(keys)) end
-    option.get   = function(info)          return Addon:ConvertColorToBlizzard(Addon:GetOption(unpack(keys)))            end
-    return option
-  end
-  
-  function GUI:CreateExecute(opts, key, name, desc, func, disabled)
-    local option = self:CreateEntry(opts, key, name, desc, "execute", disabled)
-    option.func  = func
-    return option
-  end
-  
-  function GUI:CreateGroup(opts, key, name, desc, groupType, disabled)
-    key = "group_" .. links[key]
-    opts.args[key] = {name = name, desc = desc, type = "group", childGroups = groupType, args = {}, order = self:Order(), disabled = disabled}
-    return opts.args[key]
-  end
-  
-  function GUI:CreateGroupBox(opts, name)
-    local key = "group_" .. self:Order(-1)
-    opts.args[key] = {name = name, type = "group", args = {}, order = self:Order(), inline = true}
-    return opts.args[key]
-  end
-  
-  function GUI:CreateGroupTop(name, groupType, disabled)
-    return {name = name, type = "group", childGroups = groupType, args = {}, order = self:Order(), disabled = disabled}
-  end
-end
-
-
-
-
-
diff --git a/Config/OptionsTables.lua b/Config/OptionsTables.lua
index 51befa6..70b98ee 100644
--- a/Config/OptionsTables.lua
+++ b/Config/OptionsTables.lua
@@ -8,38 +8,32 @@ local L = LibStub("AceLocale-3.0"):GetLocale(ADDON_NAME)
 
 
 
-
---   █████╗ ██████╗ ██████╗  ██████╗ ███╗   ██╗     ██████╗ ██████╗ ████████╗██╗ ██████╗ ███╗   ██╗███████╗
---  ██╔══██╗██╔══██╗██╔══██╗██╔═══██╗████╗  ██║    ██╔═══██╗██╔══██╗╚══██╔══╝██║██╔═══██╗████╗  ██║██╔════╝
---  ███████║██║  ██║██║  ██║██║   ██║██╔██╗ ██║    ██║   ██║██████╔╝   ██║   ██║██║   ██║██╔██╗ ██║███████╗
---  ██╔══██║██║  ██║██║  ██║██║   ██║██║╚██╗██║    ██║   ██║██╔═══╝    ██║   ██║██║   ██║██║╚██╗██║╚════██║
---  ██║  ██║██████╔╝██████╔╝╚██████╔╝██║ ╚████║    ╚██████╔╝██║        ██║   ██║╚██████╔╝██║ ╚████║███████║
---  ╚═╝  ╚═╝╚═════╝ ╚═════╝  ╚═════╝ ╚═╝  ╚═══╝     ╚═════╝ ╚═╝        ╚═╝   ╚═╝ ╚═════╝ ╚═╝  ╚═══╝╚══════╝
-
-function Addon:MakeAddonOptions(chatCmd)
-  local title = format("%s v%s  (/%s)", ADDON_NAME, tostring(self:GetOption"version"), chatCmd)
-  local title = format("%s", ADDON_NAME)
-  local panel = self:CreateOptionsCategory(nil, function()
+--   ██████╗ ███████╗███╗   ██╗███████╗██████╗  █████╗ ██╗          ██████╗ ██████╗ ████████╗██╗ ██████╗ ███╗   ██╗███████╗
+--  ██╔════╝ ██╔════╝████╗  ██║██╔════╝██╔══██╗██╔══██╗██║         ██╔═══██╗██╔══██╗╚══██╔══╝██║██╔═══██╗████╗  ██║██╔════╝
+--  ██║  ███╗█████╗  ██╔██╗ ██║█████╗  ██████╔╝███████║██║         ██║   ██║██████╔╝   ██║   ██║██║   ██║██╔██╗ ██║███████╗
+--  ██║   ██║██╔══╝  ██║╚██╗██║██╔══╝  ██╔══██╗██╔══██║██║         ██║   ██║██╔═══╝    ██║   ██║██║   ██║██║╚██╗██║╚════██║
+--  ╚██████╔╝███████╗██║ ╚████║███████╗██║  ██║██║  ██║███████╗    ╚██████╔╝██║        ██║   ██║╚██████╔╝██║ ╚████║███████║
+--   ╚═════╝ ╚══════╝╚═╝  ╚═══╝╚══════╝╚═╝  ╚═╝╚═╝  ╚═╝╚══════╝     ╚═════╝ ╚═╝        ╚═╝   ╚═╝ ╚═════╝ ╚═╝  ╚═══╝╚══════╝
+
+local function MakeGeneralOptions(opts)
+  local self = Addon
+  local GUI = self.GUI
+  local opts = GUI:CreateGroup(opts, ADDON_NAME, ADDON_NAME)
+  
   
-  local GUI = self.GUI:ResetOrder()
-  local opts = GUI:CreateGroupTop(title, "tab")
+  GUI:SetDBType"Global"
   
+  local option = GUI:CreateToggle(opts, {"UsePersistentStorage"}, L["Use Persistent Storage"], L["If enabled, cache will be stored on logout. This may slightly increase loading time.|n|nIf disabled, cache will be rebuilt during each session. This will result in dramatically more cache misses."])
   
-  GUI:CreateNewline(opts)
-  local option = GUI:CreateToggle(opts, {"..", "global", "UsePersistentStorage"}, L["Use Persistent Storage"], L["If enabled, cache will be stored on logout. This may slightly increase loading time.|n|nIf disabled, cache will be rebuilt during each session. This will result in dramatically more cache misses."])
-  option.set = function(info, val)        self:SetGlobalOption(val, "UsePersistentStorage") end
-  option.get = function(info)      return self:GetGlobalOption"UsePersistentStorage"        end
+  GUI:ResetDBType()
   
   return opts
-  end)
-  function self:OpenAddonOptions() return self:OpenConfig(panel) end
 end
 
 
 
 
 
-
 --  ██████╗ ███████╗██████╗ ██╗   ██╗ ██████╗      ██████╗ ██████╗ ████████╗██╗ ██████╗ ███╗   ██╗███████╗
 --  ██╔══██╗██╔════╝██╔══██╗██║   ██║██╔════╝     ██╔═══██╗██╔══██╗╚══██╔══╝██║██╔═══██╗████╗  ██║██╔════╝
 --  ██║  ██║█████╗  ██████╔╝██║   ██║██║  ███╗    ██║   ██║██████╔╝   ██║   ██║██║   ██║██╔██╗ ██║███████╗
@@ -47,14 +41,16 @@ end
 --  ██████╔╝███████╗██████╔╝╚██████╔╝╚██████╔╝    ╚██████╔╝██║        ██║   ██║╚██████╔╝██║ ╚████║███████║
 --  ╚═════╝ ╚══════╝╚═════╝  ╚═════╝  ╚═════╝      ╚═════╝ ╚═╝        ╚═╝   ╚═╝ ╚═════╝ ╚═╝  ╚═══╝╚══════╝
 
-function Addon:MakeDebugOptions(categoryName, chatCmd, arg1, ...)
-  local title = format("%s v%s > %s  (/%s %s)", ADDON_NAME, tostring(self:GetOption"version"), categoryName, chatCmd, arg1)
-  local title = format("%s", categoryName)
-  local panel = self:CreateOptionsCategory(categoryName, function()
+local function MakeDebugOptions(opts, categoryName)
+  local self = Addon
+  local GUI = self.GUI
+  
+  if not self:IsDebugEnabled() then return end
   
-  local GUI = self.GUI:ResetOrder()
-  local opts = GUI:CreateGroupTop(title, "tab")
+  GUI:SetDBType"Global"
+  local opts = GUI:CreateGroup(opts, categoryName, categoryName)
   
+  GUI:CreateExecute(opts, "reload", self.L["Reload UI"], nil, ReloadUI)
   
   -- Enable
   do
@@ -64,7 +60,12 @@ function Addon:MakeDebugOptions(categoryName, chatCmd, arg1, ...)
       local opts = GUI:CreateGroupBox(opts, "Debug")
       GUI:CreateToggle(opts, {"debug"}, self.L["Enable"])
       GUI:CreateNewline(opts)
-      GUI:CreateExecute(opts, "reload", self.L["Reload UI"], nil, ReloadUI)
+      
+      GUI:CreateToggle(opts, {"debugShowLuaErrors"}, self.L["Display Lua Errors"], nil).width = 2
+      GUI:CreateNewline(opts)
+      
+      local disabled = not self:GetGlobalOption"debugShowLuaErrors"
+      GUI:CreateToggle(opts, {"debugShowLuaWarnings"}, self.L["Lua Warning"], nil, disabled).width = 2
     end
   end
   
@@ -72,7 +73,7 @@ function Addon:MakeDebugOptions(categoryName, chatCmd, arg1, ...)
   do
     local opts = GUI:CreateGroup(opts, GUI:Order(), "Output")
     
-    local disabled = not self:GetOption"debug"
+    local disabled = not self:GetGlobalOption"debug"
     
     do
       local opts = GUI:CreateGroupBox(opts, "Suppress All")
@@ -83,16 +84,93 @@ function Addon:MakeDebugOptions(categoryName, chatCmd, arg1, ...)
     do
       local opts = GUI:CreateGroupBox(opts, "Message Types")
       
-      local disabled = disabled or self:GetOption("debugOutput", "suppressAll")
+      local disabled = disabled or self:GetGlobalOption("debugOutput", "suppressAll")
       
-      GUI:CreateToggle(opts, {"debugOutput", "luaError"}, "Lua Error", nil, disabled).width = 2
+      for i, data in ipairs{
+        {"optionSet", "Option Set"},
+      } do
+        if i ~= 1 then
+          GUI:CreateNewline(opts)
+        end
+        GUI:CreateToggle(opts, {"debugOutput", data[1]}, data[2], nil, disabled).width = 2
+      end
     end
   end
   
+  GUI:ResetDBType()
+  
   return opts
-  end)
-  local function OpenOptions() return self:OpenConfig(panel) end
-  for _, arg in ipairs{arg1, ...} do
-    self.chatArgs[arg] = OpenOptions
+end
+
+
+
+
+
+--   █████╗ ██████╗ ██████╗  ██████╗ ███╗   ██╗     ██████╗ ██████╗ ████████╗██╗ ██████╗ ███╗   ██╗███████╗
+--  ██╔══██╗██╔══██╗██╔══██╗██╔═══██╗████╗  ██║    ██╔═══██╗██╔══██╗╚══██╔══╝██║██╔═══██╗████╗  ██║██╔════╝
+--  ███████║██║  ██║██║  ██║██║   ██║██╔██╗ ██║    ██║   ██║██████╔╝   ██║   ██║██║   ██║██╔██╗ ██║███████╗
+--  ██╔══██║██║  ██║██║  ██║██║   ██║██║╚██╗██║    ██║   ██║██╔═══╝    ██║   ██║██║   ██║██║╚██╗██║╚════██║
+--  ██║  ██║██████╔╝██████╔╝╚██████╔╝██║ ╚████║    ╚██████╔╝██║        ██║   ██║╚██████╔╝██║ ╚████║███████║
+--  ╚═╝  ╚═╝╚═════╝ ╚═════╝  ╚═════╝ ╚═╝  ╚═══╝     ╚═════╝ ╚═╝        ╚═╝   ╚═╝ ╚═════╝ ╚═╝  ╚═══╝╚══════╝
+
+function Addon:MakeAddonOptions(chatCmd)
+  local title = format("%s v%s  (/%s)", ADDON_NAME, tostring(self:GetOption"version"), chatCmd)
+  
+  local sections = {}
+  for _, data in ipairs{
+    {MakeGeneralOptions, nil},
+    {MakeDebugOptions,   self.L["Debug"], "debug", "db"},
+  } do
+    
+    local func = data[1]
+    local name = data[2]
+    local args = {unpack(data, 3)}
+    
+    tinsert(sections, function(opts) return func(opts, name) end)
+    
+    local function OpenOptions() return self:OpenConfig(name) end
+    if name == self.L["Debug"] then
+      local OpenOptions_Old = OpenOptions
+      OpenOptions = function(...)
+        if not self:GetGlobalOption"debug" then
+          self:SetGlobalOption(true, "debug")
+          self:Debug("Debug mode enabled")
+        end
+        return OpenOptions_Old(...)
+      end
+    end
+    
+    for _, arg in ipairs(args) do
+      self:RegisterChatArgAliases(arg, OpenOptions)
+    end
   end
+  
+  self.AceConfig:RegisterOptionsTable(ADDON_NAME, function()
+    local GUI = self.GUI:ResetOrder()
+    local opts = GUI:CreateOpts(title, "tab")
+    
+    for _, func in ipairs(sections) do
+      func(opts)
+    end
+    
+    return opts
+  end)
+  
+  self.AceConfigDialog:SetDefaultSize(ADDON_NAME, 700, 800)
 end
+
+
+function Addon:MakeBlizzardOptions(chatCmd)
+  local title = format("%s v%s  (/%s)", ADDON_NAME, tostring(self:GetOption"version"), chatCmd)
+  local panel = self:CreateBlizzardOptionsCategory(function()
+    local GUI = self.GUI:ResetOrder()
+    local opts = GUI:CreateOpts(title, "tab")
+    
+    GUI:CreateExecute(opts, "key", ADDON_NAME .. " " .. self.L["Options"], nil, function()
+      self:OpenConfig(ADDON_NAME)
+      self:CloseBlizzardConfig()
+    end)
+    
+    return opts
+  end)
+end
\ No newline at end of file
diff --git a/Config/Settings.lua b/Config/Settings.lua
index aa24612..d497aa9 100644
--- a/Config/Settings.lua
+++ b/Config/Settings.lua
@@ -9,19 +9,22 @@ local Addon = LibStub("AceAddon-3.0"):GetAddon(ADDON_NAME)
 function Addon:MakeDefaultOptions()
   local fakeAddon = {
     db = {
-      profile = {
+      profile = {},
+      
+      global = {
+        UsePersistentStorage = true,
+        
         
         -- Debug options
         debug = false,
+        
+        debugShowLuaErrors   = true,
+        debugShowLuaWarnings = true,
           
         debugOutput = {
           ["*"] = false,
         },
       },
-      
-      global = {
-        UsePersistentStorage = true,
-      },
     },
   }
   return fakeAddon.db
diff --git a/Config/_config.xml b/Config/_config.xml
index 0982105..e697f04 100644
--- a/Config/_config.xml
+++ b/Config/_config.xml
@@ -1,6 +1,5 @@
 <Ui xsi:schemaLocation="http://www.blizzard.com/wow/ui/ ..\FrameXML\UI.xsd">
   
   <Script file="Settings.lua"/>
-  <Script file="GUI.lua"/>
   <Script file="OptionsTables.lua"/>
 </Ui>
\ No newline at end of file
diff --git a/Init/Init.lua b/Init/Init.lua
index 6d7e313..1edb61e 100644
--- a/Init/Init.lua
+++ b/Init/Init.lua
@@ -3,8 +3,7 @@
 local ADDON_NAME, Data = ...
 
 
-local Addon = LibStub("AceAddon-3.0"):NewAddon(ADDON_NAME, "AceConsole-3.0")
-ItemCacheAddon = Addon
+local Addon = LibStub("AceAddon-3.0"):NewAddon(ADDON_NAME, "AceConsole-3.0", "AceEvent-3.0", "AceHook-3.0")
 
 
 Addon.AceConfig         = LibStub"AceConfig-3.0"
@@ -13,19 +12,22 @@ Addon.AceConfigRegistry = LibStub"AceConfigRegistry-3.0"
 Addon.AceDB             = LibStub"AceDB-3.0"
 Addon.AceDBOptions      = LibStub"AceDBOptions-3.0"
 
+Addon.SemVer = LibStub"SemVer"
 
 
 
 
-local strMatch  = string.match
-local strSub    = string.sub
+local strMatch     = string.match
+local strSub       = string.sub
 
-local tblConcat = table.concat
-local tblRemove = table.remove
+local tblConcat    = table.concat
+local tblSort      = table.sort
+local tblRemove    = table.remove
 
-local mathFloor = math.floor
-local mathMin   = math.min
-local mathMax   = math.max
+local mathFloor    = math.floor
+local mathMin      = math.min
+local mathMax      = math.max
+local mathRandom   = math.random
 
 local ipairs       = ipairs
 local next         = next
@@ -33,6 +35,8 @@ local unpack       = unpack
 local select       = select
 local type         = type
 local format       = format
+local tinsert      = tinsert
+local strjoin      = strjoin
 local tostring     = tostring
 local tonumber     = tonumber
 local getmetatable = getmetatable
@@ -42,7 +46,6 @@ local random       = random
 
 
 
-Addon.onOptionSetHandlers = {}
 
 
 
@@ -57,7 +60,8 @@ Addon.onOptionSetHandlers = {}
 
 
 do
-  Addon.debugPrefix = "[" .. BINDING_HEADER_DEBUG .. "]"
+  Addon.debugPrefix = "[" .. (BINDING_HEADER_DEBUG or "Debug") .. "]"
+  Addon.warnPrefix  = "[" .. (LUA_WARNING or "Warning") .. "]"
   
   local debugMode = false
   
@@ -73,17 +77,37 @@ do
   end
   --@end-debug@
   
-  function Addon:IsDebugEnabled()
-    if self.db then
-      return self:GetOption"debug"
+  
+  local function CheckOptionSafe(default, ...)
+    if Addon.db then
+      return Addon:CheckTable(Addon.db, ...)
     else
-      return debugMode
+      return default
     end
   end
   
+  function Addon:IsDebugEnabled()
+    return CheckOptionSafe(debugMode, "global", "debug")
+  end
+  local function IsDebugSuppressed()
+    return not Addon:IsDebugEnabled() or CheckOptionSafe(not debugMode, "global", "debugOutput", "suppressAll")
+  end
+  local function ShouldShowLuaErrors()
+    return Addon:IsDebugEnabled() and CheckOptionSafe(debugMode, "global", "debugShowLuaErrors")
+  end
+  local function ShouldShowWarnings()
+    return Addon:IsDebugEnabled() and CheckOptionSafe(debugMode, "global", "debugShowLuaWarnings")
+  end
+  function Addon:GetDebugView(key)
+    return self:IsDebugEnabled() and not CheckOptionSafe(debugMode, "global", "suppressAll") and CheckOptionSafe(debugMode, "debugView", key)
+  end
+  
+  function Addon:Dump(t)
+    return DevTools_Dump(t)
+  end
+  
   local function Debug(self, methodName, ...)
-    if not self:IsDebugEnabled() then return end
-    if self.GetOption and self:GetOption("debugOutput", "suppressAll") then return end
+    if IsDebugSuppressed() then return end
     return self[methodName](self, ...)
   end
   function Addon:Debug(...)
@@ -92,6 +116,24 @@ do
   function Addon:Debugf(...)
     return Debug(self, "Printf", "%s " .. select(1, ...), self.debugPrefix, select(2, ...))
   end
+  function Addon:DebugDump(t, header)
+    if header then
+      Debug(self, "Print", self.debugPrefix, tostring(header) .. ":")
+    end
+    return self:Dump(t)
+  end
+  
+  
+  local function Warn(self, methodName, ...)
+    if not ShouldShowWarnings() then return end
+    return self[methodName](self, ...)
+  end
+  function Addon:Warn(...)
+    return Warn(self, "Print", self.warnPrefix, ...)
+  end
+  function Addon:Warnf(...)
+    return Warn(self, "Printf", "%s " .. select(1, ...), self.warnPrefix, select(2, ...))
+  end
   
   local function DebugIf(self, methodName, keys, ...)
     if self.GetOption and self:GetOption(unpack(keys)) then
@@ -104,6 +146,24 @@ do
   function Addon:DebugfIf(keys, ...)
     return DebugIf(self, "Debugf", keys, ...)
   end
+  function Addon:DebugDumpIf(keys, ...)
+    return DebugIf(self, "DebugDump", keys, ...)
+  end
+  
+  local function DebugIfOutput(self, methodName, key, ...)
+    if self.GetGlobalOption and self:GetGlobalOption("debugOutput", key) then
+      return self[methodName](self, ...)
+    end
+  end
+  function Addon:DebugIfOutput(key, ...)
+    return DebugIfOutput(self, "Debug", key, ...)
+  end
+  function Addon:DebugfIfOutput(key, ...)
+    return DebugIfOutput(self, "Debugf", key, ...)
+  end
+  function Addon:DebugDumpIfOutput(key, ...)
+    return DebugIfOutput(self, "DebugDump", key, ...)
+  end
   
   function Addon:DebugData(t)
     local texts = {}
@@ -125,13 +185,9 @@ do
   end
   
   
-  function Addon:GetDebugView(key)
-    return self:IsDebugEnabled() and not self:GetOption("debugView", "suppressAll") and self:GetOption("debugView", key)
-  end
-  
   do
     local function GetErrorHandler(errFunc)
-      if Addon:IsDebugEnabled() and (not Addon:IsDBLoaded() or Addon:GetOption("debugOutput", "luaError")) then
+      if Addon:IsDebugEnabled() and ShouldShowLuaErrors() then
         return function(...)
           geterrorhandler()(...)
           if errFunc then
@@ -144,14 +200,28 @@ do
     function Addon:xpcall(func, errFunc)
       return xpcall(func, GetErrorHandler(errFunc))
     end
+    function Addon:xpcallSilent(func, errFunc)
+      return xpcall(func, nop)
+    end
     function Addon:Throw(...)
-      if Addon:IsDebugEnabled() and (not Addon:IsDBLoaded() or Addon:GetOption("debugOutput", "luaError")) then
-        local text = format(...)
+      if Addon:IsDebugEnabled() and ShouldShowLuaErrors() then
         geterrorhandler()(...)
       end
     end
     function Addon:Throwf(...)
-      return self:Throw(format(...))
+      local args = {...}
+      local count = select("#", ...)
+      self:xpcall(function() self:Throw(format(unpack(args, 1, count))) end)
+    end
+    function Addon:Assert(bool, ...)
+      if not bool then
+        self:Throw(...)
+      end
+    end
+    function Addon:Assertf(bool, ...)
+      if not bool then
+        self:Throwf(...)
+      end
     end
   end
 end
@@ -160,6 +230,42 @@ end
 
 
 
+--  ███████╗██╗  ██╗██████╗  █████╗ ███╗   ██╗███████╗██╗ ██████╗ ███╗   ██╗███████╗
+--  ██╔════╝╚██╗██╔╝██╔══██╗██╔══██╗████╗  ██║██╔════╝██║██╔═══██╗████╗  ██║██╔════╝
+--  █████╗   ╚███╔╝ ██████╔╝███████║██╔██╗ ██║███████╗██║██║   ██║██╔██╗ ██║███████╗
+--  ██╔══╝   ██╔██╗ ██╔═══╝ ██╔══██║██║╚██╗██║╚════██║██║██║   ██║██║╚██╗██║╚════██║
+--  ███████╗██╔╝ ██╗██║     ██║  ██║██║ ╚████║███████║██║╚██████╔╝██║ ╚████║███████║
+--  ╚══════╝╚═╝  ╚═╝╚═╝     ╚═╝  ╚═╝╚═╝  ╚═══╝╚══════╝╚═╝ ╚═════╝ ╚═╝  ╚═══╝╚══════╝
+
+do
+  Addon.expansions = {
+    retail  = 10,
+    wrath   = 3,
+    wotlk   = 3,
+    tbc     = 2,
+    bcc     = 2,
+    classic = 1,
+  }
+  Addon.expansionLevel = tonumber(GetBuildInfo():match"^(%d+)%.")
+  if Addon.expansionLevel >= Addon.expansions.retail then
+    Addon.expansionName = "retail"
+  elseif Addon.expansionLevel >= Addon.expansions.wrath then
+    Addon.expansionName = "wrath"
+  elseif Addon.expansionLevel == Addon.expansions.tbc then
+    Addon.expansionName = "tbc"
+  elseif Addon.expansionLevel == Addon.expansions.classic then
+    Addon.expansionName = "classic"
+  end
+  Addon.isRetail  = Addon.expansionName == "retail"
+  Addon.isWrath   = Addon.expansionName == "wrath"
+  Addon.isTBC     = Addon.expansionName == "tbc"
+  Addon.isClassic = Addon.expansionName == "classic"
+end
+
+
+
+
+
 --  ██████╗  █████╗ ████████╗ █████╗ ██████╗  █████╗ ███████╗███████╗
 --  ██╔══██╗██╔══██╗╚══██╔══╝██╔══██╗██╔══██╗██╔══██╗██╔════╝██╔════╝
 --  ██║  ██║███████║   ██║   ███████║██████╔╝███████║███████╗█████╗  
@@ -190,81 +296,274 @@ do
     return DeepCopy(val, {})
   end
   
-  function Addon:IsDBLoaded()
-    return self.db ~= nil
+  local function NotifyChange()
+    Addon:xpcall(function()
+      if Addon.AceConfigRegistry then
+        Addon.AceConfigRegistry:NotifyChange(ADDON_NAME)
+      end
+    end)
   end
-  function Addon:GetDB()
-    return self.db
+  
+  local onOptionSetHandlers = {}
+  function Addon:RegisterOptionSetHandler(func)
+    tinsert(onOptionSetHandlers, func)
+    return #onOptionSetHandlers
   end
-  function Addon:GetDefaultDB()
-    return self.dbDefault
+  function Addon:UnregisterOptionSetHandler(id)
+    onOptionSetHandlers[id] = nil
   end
-  function Addon:GetProfile()
-    return Addon.GetDB(self).profile
+  
+  local function OnOptionSet(self, val, ...)
+    if not self:GetDB() then return end -- db hasn't loaded yet
+    self:DebugfIfOutput("optionSet", "Setting %s: %s", strjoin(" > ", ...), tostring(val))
+    for id, func in next, onOptionSetHandlers, nil do
+      if type(func) == "function" then
+        func(self, val, ...)
+      else
+        self[func](self, val, ...)
+      end
+    end
   end
-  function Addon:GetGlobal()
-    return Addon:GetDB(self).global
+  
+  local dbTables = {
+    {"dbDefault", "Default", true},
+    {"db", ""},
+  }
+  local dbTypes = {
+    {"profile", ""},
+    {"global", "Global"},
+  }
+  
+  local defaultKey, defaultName
+  
+  for _, dbType in ipairs(dbTables) do
+    local dbKey, dbName, isDefault = unpack(dbType, 1, 3)
+    if isDefault then
+      defaultKey  = dbKey
+      defaultName = dbName
+    end
+    
+    local IsDBLoaded = format("Is%sDBLoaded", dbName)
+    local GetDB      = format("Get%sDB",      dbName)
+    
+    Addon[IsDBLoaded] = function(self)
+    return self[dbKey] ~= nil
+    end
+    Addon[GetDB] = function(self)
+      return self[dbKey]
+    end
+    
+    for _, dbSection in ipairs(dbTypes) do
+      local typeKey, typeName = unpack(dbSection, 1, 2)
+      
+      local GetOptionSafe    = format("Get%s%sOptionSafe", dbName,      typeName)
+      local GetOption        = format("Get%s%sOption",     dbName,      typeName)
+      local GetDefaultOption = format("Get%s%sOption",     defaultName, typeName)
+      
+      Addon[GetOptionSafe] = function(self, ...)
+        assert(self[dbKey], format("Attempted to access database before initialization: %s", tblConcat({dbKey, typeKey, ...}, " > ")))
+        local val = self[dbKey][typeKey]
+        for _, key in ipairs{...} do
+          assert(type(val) == "table", format("Bad database access: %s", tblConcat({dbKey, typeKey, ...}, " > ")))
+          val = val[key]
+        end
+        return val
+      end
+      
+      Addon[GetOption] = function(self, ...)
+        local val = Addon[GetOptionSafe](self, ...)
+        if type(val) == "table" then
+          self:Warnf("Database request returned a table: %s", tblConcat({dbKey, typeKey, ...}, " > "))
+        end
+        if val == nil then
+          self:Warnf("Database request found empty value: %s", tblConcat({dbKey, typeKey, ...}, " > "))
+        end
+        return val
+      end
+      
+      if not isDefault then
+        local SetOptionConfig    = format("Set%s%sOptionConfig",    dbName, typeName)
+        local SetOption          = format("Set%s%sOption",          dbName, typeName)
+        local ToggleOptionConfig = format("Toggle%s%sOptionConfig", dbName, typeName)
+        local ToggleOption       = format("Toggle%s%sOption",       dbName, typeName)
+        local ResetOptionConfig  = format("Reset%s%sOptionConfig",  dbName, typeName)
+        local ResetOption        = format("Reset%s%sOption",        dbName, typeName)
+      
+        Addon[SetOptionConfig] = function(self, val, ...)
+          assert(self[dbKey], format("Attempted to access database before initialization: %s = %s", tblConcat({dbKey, typeKey, ...}, " > "), tostring(val)))
+          local keys = {...}
+          local lastKey = tblRemove(keys, #keys)
+          local tbl = self[dbKey][typeKey]
+          for _, key in ipairs(keys) do
+            assert(type(tbl[key]) == "table", format("Bad database access: %s = %s", tblConcat({dbKey, typeKey, ...}, " > "), tostring(val)))
+            tbl = tbl[key]
+          end
+          local lastVal = tbl[lastKey]
+          if type(lastVal) == "table" then
+            self:Warnf("Database access overwriting a table: %s", tblConcat({dbKey, typeKey, ...}, " > "))
+          end
+          tbl[lastKey] = val
+          OnOptionSet(Addon, val, dbKey, typeKey, ...)
+          return lastVal ~= val
+        end
+      
+        Addon[SetOption] = function(self, val, ...)
+          local result = Addon[SetOptionConfig](self, val, ...)
+          NotifyChange()
+          return result
+        end
+        
+        Addon[ToggleOptionConfig] = function(self, ...)
+          return self[SetOptionConfig](self, not self[GetOption](self, ...), ...)
+        end
+        
+        Addon[ToggleOption] = function(self, ...)
+          return self[SetOption](self, not self[GetOption](self, ...), ...)
+        end
+        
+        Addon[ResetOption] = function(self, ...)
+          return self[SetOption](self, Addon.Copy(self, self[GetDefaultOption](self, ...)), ...)
+        end
+        
+        Addon[ResetOptionConfig] = function(self, ...)
+          return self[SetOptionConfig](self, Addon.Copy(self, self[GetDefaultOption](self, ...)), ...)
+        end
+      end
+      
+    end
   end
-  function Addon:GetDefaultGlobal()
-    return Addon:GetDefaultDB(self).global
+end
+
+
+
+
+
+--  ███████╗██╗   ██╗███████╗███╗   ██╗████████╗███████╗
+--  ██╔════╝██║   ██║██╔════╝████╗  ██║╚══██╔══╝██╔════╝
+--  █████╗  ██║   ██║█████╗  ██╔██╗ ██║   ██║   ███████╗
+--  ██╔══╝  ╚██╗ ██╔╝██╔══╝  ██║╚██╗██║   ██║   ╚════██║
+--  ███████╗ ╚████╔╝ ███████╗██║ ╚████║   ██║   ███████║
+--  ╚══════╝  ╚═══╝  ╚══════╝╚═╝  ╚═══╝   ╚═╝   ╚══════╝
+
+do
+  local function Call(func, ...)
+    local args = {...}
+    if type(func) == "function" then
+      Addon:xpcall(function() func(unpack(args)) end)
+    else
+      Addon:xpcall(function() Addon[func](unpack(args)) end)
+    end
   end
-  function Addon:GetDefaultProfile()
-    return Addon.GetDefaultDB(self).profile
+  
+  local onEventCallbacks = {}
+  local function OnEvent(event, ...)
+    local t = onEventCallbacks[event]
+    Addon:Assertf(t, "Event %s is registered, but no callbacks were found", event)
+    for i, func in ipairs(t) do
+      Call(func, Addon, event, ...)
+    end
   end
-  local function GetOption(self, db, ...)
-    local val = db
-    for _, key in ipairs{...} do
-      assert(type(val) == "table", format("Bad database access: %s", tblConcat({...}, " > ")))
-      val = val[key]
+  
+  function Addon:RegisterEventCallback(event, func)
+    local t = onEventCallbacks[event] or {}
+    tinsert(t, func)
+    if #t == 1 then
+      onEventCallbacks[event] = t
+      self:RegisterEvent(event, OnEvent)
     end
-    return val
+    return #t
   end
-  function Addon:GetOption(...)
-    return GetOption(self, Addon.GetProfile(self), ...)
+  function Addon:RegisterSingleEventCallback(event, ...)
+    local id = self:RegisterEventCallback(event, ...)
+    local func = onEventCallbacks[event][id]
+    onEventCallbacks[event][id] = function(...) func(...) self:UnregisterEventCallback(event, id) end
+    return id
   end
-  function Addon:GetDefaultOption(...)
-    return GetOption(self, Addon.GetDefaultProfile(self), ...)
+  function Addon:UnregisterEventCallbacks(event)
+    self:Assertf(onEventCallbacks[event], "Attempted to unregister event %s, but no callbacks were found", event)
+    onEventCallbacks[event] = nil
+    self:UnregisterEvent(event)
   end
-  function Addon:GetGlobalOption(...)
-    return GetOption(self, Addon.GetGlobal(self), ...)
+  function Addon:UnregisterEventCallback(event, id)
+    local t = onEventCallbacks[event] or {}
+    self:Assertf(t[id], "Attempted to unregister callback %s from event %s, but it was not found", id, event)
+    tblRemove(t, id)
+    if #t == 0 then
+      self:UnregisterEventCallbacks(event)
+    end
   end
-  local function SetOption(self, db, val, ...)
-    local keys = {...}
-    local lastKey = tblRemove(keys, #keys)
-    local tbl = db
-    for _, key in ipairs(keys) do
-      tbl = tbl[key]
+  
+  
+  local onInitializeCallbacks = {}
+  function Addon:RunInitializeCallbacks()
+    for i, func in ipairs(onInitializeCallbacks) do
+      Call(func, Addon)
     end
-    tbl[lastKey] = val
-    Addon.OnOptionSet(Addon, db, val, ...)
   end
-  function Addon:SetOption(val, ...)
-    return SetOption(self, Addon.GetProfile(self), val, ...)
+  function Addon:RegisterInitializeCallback(func)
+    tinsert(onInitializeCallbacks, func)
+    return #onInitializeCallbacks
   end
-  function Addon:SetGlobalOption(val, ...)
-    return SetOption(self, Addon.GetGlobal(self), val, ...)
+  function Addon:UnregisterInitializeCallbacks()
+    self:Assert(#onInitializeCallbacks > 0, "Attempted to unregister initialize callbacks, but none were found")
+    wipe(onInitializeCallbacks)
   end
-  function Addon:ToggleOption(...)
-    return Addon:SetOption(not Addon:GetOption(...), ...)
+  function Addon:UnregisterInitializeCallback(id)
+    self:Assertf(onInitializeCallbacks[id], "Attempted to unregister initialize callback %s, but it was not found", id)
+    tblRemove(onInitializeCallbacks, id)
+  end
+  
+  
+  local onEnableCallbacks = {}
+  function Addon:RunEnableCallbacks()
+    for i, func in ipairs(onEnableCallbacks) do
+      Call(func, Addon)
+    end
   end
-  function Addon:ToggleGlobalOption(...)
-    return Addon:SetOption(not Addon:GetGlobalOption(...), ...)
+  function Addon:RegisterEnableCallback(func)
+    tinsert(onEnableCallbacks, func)
+    return #onEnableCallbacks
   end
-  function Addon:ResetOption(...)
-    return Addon.SetOption(self, Addon.Copy(self, Addon.GetDefaultOption(self, ...)), ...)
+  function Addon:UnregisterEnableCallbacks()
+    self:Assert(#onEnableCallbacks > 0, "Attempted to unregister enable callbacks, but none were found")
+    wipe(onEnableCallbacks)
   end
-  function Addon:ResetGlobalOption(...)
-    return Addon.SetOption(self, Addon.Copy(self, Addon.GetDefaultGlobalOption(self, ...)), ...)
+  function Addon:UnregisterEnableCallback(id)
+    self:Assertf(onEnableCallbacks[id], "Attempted to unregister enable callback %s, but it was not found", id)
+    tblRemove(onEnableCallbacks, id)
   end
   
-  function Addon:OnOptionSet(...)
-    if not self:GetDB() then return end -- db hasn't loaded yet
-    for funcName, func in next, Addon.onOptionSetHandlers, nil do
-      if type(func) == "function" then
-        func(self, ...)
-      else
-        self[funcName](self, ...)
+  
+  function Addon:RegisterCVarCallback(cvar, func)
+    return self:RegisterEventCallback("CVAR_UPDATE", function(self, event, ...)
+      if cvar == ... then
+        func(self, event, ...)
       end
+    end)
+  end
+  
+  
+  onAddonLoadCallbacks = {}
+  function Addon:OnAddonLoad(addonName, func)
+    local loaded, finished = IsAddOnLoaded(addonName)
+    if finished then
+      Call(func, self)
+    else
+      local id
+      id = self:RegisterEventCallback("ADDON_LOADED", function(self, event, addon)
+        if addon == addonName then
+          Call(func, self)
+          self:UnregisterEventCallback("ADDON_LOADED", id)
+        end
+      end)
+    end
+  end
+  
+  function Addon:WhenOutOfCombat(func)
+    if not InCombatLockdown() then
+      Call(func, self)
+    else
+      self:RegisterSingleEventCallback("PLAYER_REGEN_ENABLED", function() Call(func, self) end)
     end
   end
 end
@@ -274,6 +573,7 @@ end
 
 
 
+
 --   ██████╗ ██████╗ ████████╗██╗ ██████╗ ███╗   ██╗███████╗
 --  ██╔═══██╗██╔══██╗╚══██╔══╝██║██╔═══██╗████╗  ██║██╔════╝
 --  ██║   ██║██████╔╝   ██║   ██║██║   ██║██╔██╗ ██║███████╗
@@ -282,21 +582,287 @@ end
 --   ╚═════╝ ╚═╝        ╚═╝   ╚═╝ ╚═════╝ ╚═╝  ╚═══╝╚══════╝
 
 do
-  function Addon:OpenConfig(category)
-    InterfaceOptionsFrame_OpenToCategory(category)
-    InterfaceOptionsFrame_OpenToCategory(category)
+  Addon.GUI = {}
+  local GUI = Addon.GUI
+  
+  local defaultInc   = 1000
+  local defaultOrder = 1000
+  local order        = defaultOrder
+  
+  local dbType = ""
+  local GetFunction      = function(keys) local funcName = format("Get%sOption",         dbType) return function(info)      return Addon[funcName](Addon, unpack(keys))      end end
+  local SetFunction      = function(keys) local funcName = format("Set%sOptionConfig",   dbType) return function(info, val)        Addon[funcName](Addon, val, unpack(keys)) end end
+  local ResetFunction    = function(keys) local funcName = format("Reset%sOptionConfig", dbType) return function(info, val)        Addon[funcName](Addon, unpack(keys))      end end
+  local GetColorFunction = function(keys) local funcName = format("Get%sOption",         dbType) return function(info)          return Addon:ConvertColorToBlizzard(Addon[funcName](Addon, unpack(keys)))            end end
+  local SetColorFunction = function(keys) local funcName = format("Set%sOptionConfig",   dbType) return function(info, r, g, b)        Addon[funcName](Addon, Addon:ConvertColorFromBlizzard(r, g, b), unpack(keys)) end end
+  
+  function GUI:SetDBType(typ)
+    dbType = typ or ""
+  end
+  function GUI:ResetDBType()
+    self:SetDBType()
+  end
+  
+  function GUI:GetOrder()
+    return order
+  end
+  function GUI:SetOrder(newOrder)
+    order = newOrder
+    return self
+  end
+  function GUI:ResetOrder()
+    order = defaultOrder
+    return self
+  end
+  function GUI:Order(inc)
+    self:SetOrder(self:GetOrder() + (inc or defaultInc))
+    return self:GetOrder()
+  end
+  
+  function GUI:CreateEntry(opts, keys, name, desc, widgetType, disabled, order)
+    order = order or self:Order()
+    if type(keys) ~= "table" then keys = {keys} end
+    local key = widgetType .. "_" .. (tblConcat(keys, ".") or "") .. "_" .. order
+    opts.args[key] = {name = name, desc = desc, type = widgetType, order = order, disabled = disabled}
+    opts.args[key].set = SetFunction(keys)
+    opts.args[key].get = GetFunction(keys)
+    return opts.args[key]
+  end
+  
+  function GUI:CreateHeader(opts, name)
+    return self:CreateEntry(opts, {"header"}, name, nil, "header")
+  end
+  
+  function GUI:CreateDescription(opts, desc, fontSize)
+    local option = self:CreateEntry(opts, {"description"}, desc, nil, "description")
+    option.fontSize = fontSize or "large"
+    return option
+  end
+  function GUI:CreateDivider(opts, count, fontSize)
+    for i = 1, count or 1 do
+      self:CreateDescription(opts, " ", fontSize or "small")
+    end
+  end
+  function GUI:CreateNewline(opts)
+    return self:CreateDescription(opts, " ", fontSize or "small")
+  end
+  
+  function GUI:CreateToggle(opts, keys, name, desc, disabled)
+    return self:CreateEntry(opts, keys, name, desc, "toggle", disabled)
+  end
+  
+  function GUI:CreateReverseToggle(opts, keys, name, desc, disabled)
+    local option = self:CreateEntry(opts, keys, name, desc, "toggle", disabled)
+    local set, get = option.set, option.get
+    option.get = function(info)      return not get()          end
+    option.set = function(info, val)        set(info, not val) end
+    return option
+  end
+  
+  function GUI:CreateSelect(opts, keys, name, desc, values, sorting, disabled)
+    local option = self:CreateEntry(opts, keys, name, desc, "select", disabled)
+    option.values  = values
+    option.sorting = sorting
+    option.style   = "dropdown"
+    return option
+  end
+  
+  function GUI:CreateMultiSelect(opts, keys, name, desc, values, disabled)
+    local option = self:CreateEntry(opts, keys, name, desc, "multiselect", disabled)
+    option.values  = values
+    return option
+  end
+  
+  function GUI:CreateRange(opts, keys, name, desc, min, max, step, disabled)
+    local option = self:CreateEntry(opts, keys, name, desc, "range", disabled)
+    option.min   = min
+    option.max   = max
+    option.step  = step
+    return option
+  end
+  
+  function GUI:CreateInput(opts, keys, name, desc, multiline, disabled)
+    local option     = self:CreateEntry(opts, keys, name, desc, "input", disabled)
+    option.multiline = multiline
+    return option
   end
   
+  function GUI:CreateColor(opts, keys, name, desc, disabled)
+    local option = self:CreateEntry(opts, keys, name, desc, "color", disabled)
+    option.get   = GetColorFunction(keys)
+    option.set   = SetColorFunction(keys)
+    return option
+  end
+  
+  function GUI:CreateExecute(opts, key, name, desc, func, disabled)
+    local option = self:CreateEntry(opts, key, name, desc, "execute", disabled)
+    option.func  = func
+    return option
+  end
+  function GUI:CreateReset(opts, keys, func, disabled)
+    local option = self:CreateEntry(opts, {"reset", unpack(keys)}, Addon.L["Reset"], nil, "execute", disabled)
+    option.func  = func or ResetFunction(keys)
+    option.width = 0.6
+    return option
+  end
+  
+  function GUI:CreateGroup(opts, key, name, desc, groupType, disabled)
+    local order = self:Order()
+    key = tostring(key or order)
+    opts.args[key] = {name = name, desc = desc, type = "group", childGroups = groupType or "tab", args = {}, order = order, disabled = disabled}
+    return opts.args[key]
+  end
+  function GUI:CreateGroupBox(opts, name)
+    local option = self:CreateGroup(opts, nil, name or " ")
+    option.inline = true
+    return option
+  end
+  
+  function GUI:CreateOpts(name, groupType, disabled)
+    return {name = name, type = "group", childGroups = groupType or "tab", args = {}, order = self:Order()}
+  end
+  
+  
+  
+  local usingSettingsPanel = Settings and Settings.RegisterCanvasLayoutCategory -- from AceConfigDialog
+  local SettingsFrame = usingSettingsPanel and SettingsPanel or InterfaceOptionsFrame
+  local blizzardCategory
+  
+  -- Fix InterfaceOptionsFrame_OpenToCategory not actually opening the category (and not even scrolling to it)
+  -- Originally from BlizzBugsSuck (https://www.wowinterface.com/downloads/info17002-BlizzBugsSuck.html) and edited to not be global
+  if not usingSettingsPanel then
+    local function GetPanelName(panel)
+      local tp = type(panel)
+      local cat = INTERFACEOPTIONS_ADDONCATEGORIES
+      if tp == "string" then
+        for i = 1, #cat do
+          local p = cat[i]
+          if p.name == panel then
+            if p.parent then
+              return GetPanelName(p.parent)
+            else
+              return panel
+            end
+          end
+        end
+      elseif tp == "table" then
+        for i = 1, #cat do
+          local p = cat[i]
+          if p == panel then
+            if p.parent then
+              return GetPanelName(p.parent)
+            else
+              return panel.name
+            end
+          end
+        end
+      end
+    end
+    
+    local skip
+    local function InterfaceOptionsFrame_OpenToCategory_Fix(panel)
+      if skip --[[or InCombatLockdown()--]] then return end
+      local panelName = GetPanelName(panel)
+      if not panelName then return end -- if its not part of our list return early
+      local noncollapsedHeaders = {}
+      local shownPanels = 0
+      local myPanel
+      local t = {}
+      local cat = INTERFACEOPTIONS_ADDONCATEGORIES
+      for i = 1, #cat do
+        local panel = cat[i]
+        if not panel.parent or noncollapsedHeaders[panel.parent] then
+          if panel.name == panelName then
+            panel.collapsed = true
+            t.element = panel
+            InterfaceOptionsListButton_ToggleSubCategories(t)
+            noncollapsedHeaders[panel.name] = true
+            myPanel = shownPanels + 1
+          end
+          if not panel.collapsed then
+            noncollapsedHeaders[panel.name] = true
+          end
+          shownPanels = shownPanels + 1
+        end
+      end
+      local min, max = InterfaceOptionsFrameAddOnsListScrollBar:GetMinMaxValues()
+      if shownPanels > 15 and min < max then
+        local val = (max/(shownPanels-15))*(myPanel-2)
+        InterfaceOptionsFrameAddOnsListScrollBar:SetValue(val)
+      end
+      skip = true
+      InterfaceOptionsFrame_OpenToCategory(panel)
+      skip = false
+    end
+    
+    local isMe = false
+    hooksecurefunc("InterfaceOptionsFrame_OpenToCategory", function(...)
+      if skip then return end
+      if Addon:GetGlobalOption("fix", "InterfaceOptionsFrameForAll") or Addon:GetGlobalOption("fix", "InterfaceOptionsFrameForMe") and isMe then
+        Addon:DebugIfOutput("InterfaceOptionsFrameFix", "Patching Interface Options")
+        InterfaceOptionsFrame_OpenToCategory_Fix(...)
+        isMe = false
+      end
+    end)
+  end
+  
+  function Addon:OpenBlizzardConfig(category)
+    if usingSettingsPanel then
+      Settings.OpenToCategory(blizzardCategory)
+    else
+      isMe = Addon:GetGlobalOption("fix", "InterfaceOptionsFrameForMe")
+      if isMe then
+        InterfaceOptionsFrame_OpenToCategory(blizzardCategory)
+        isMe = true
+      end
+      InterfaceOptionsFrame_OpenToCategory(blizzardCategory)
+    end
+  end
+  function Addon:CloseBlizzardConfig()
+    if usingSettingsPanel then
+      SettingsFrame:Close(true)
+    else
+      SettingsFrame:Hide()
+    end
+  end
+  function Addon:ToggleBlizzardConfig(...)
+    if SettingsFrame:IsShown() then
+      self:CloseBlizzardConfig(...)
+    else
+      self:OpenBlizzardConfig(...)
+    end
+  end
+  
+  function Addon:OpenConfig(...)
+    self.AceConfigDialog:Open(ADDON_NAME)
+    if select("#", ...) > 0 then
+      self.AceConfigDialog:SelectGroup(ADDON_NAME, ...)
+    end
+  end
+  function Addon:CloseConfig()
+    self.AceConfigDialog:Close(ADDON_NAME)
+  end
+  function Addon:ToggleConfig(...)
+    if self.AceConfigDialog.OpenFrames[ADDON_NAME] then
+      self:CloseConfig()
+    else
+      self:OpenConfig(...)
+      self.AceConfigDialog:SelectGroup(ADDON_NAME, ...)
+    end
+  end
+  
+  
   function Addon:ResetProfile(category)
     self:GetDB():ResetProfile()
     self.AceConfigRegistry:NotifyChange(category)
   end
   
-  function Addon:CreateOptionsCategory(categoryName, options)
-    local category = ADDON_NAME .. (categoryName and ("." .. categoryName) or "")
-    self.AceConfig:RegisterOptionsTable(category, options)
-    local Panel = self.AceConfigDialog:AddToBlizOptions(category, categoryName, categoryName and ADDON_NAME or nil)
-    Panel.default = function() self:ResetProfile(category) end
+  function Addon:CreateBlizzardOptionsCategory(options)
+    local blizzardOptions = ADDON_NAME .. ".Blizzard"
+    self.AceConfig:RegisterOptionsTable(blizzardOptions, options)
+    local Panel, id = self.AceConfigDialog:AddToBlizOptions(blizzardOptions, ADDON_NAME)
+    blizzardCategory = id
+    Panel.default = function() self:ResetProfile(blizzardOptions) end
     return Panel
   end
 end
@@ -304,6 +870,101 @@ end
 
 
 
+--   ██████╗██╗  ██╗ █████╗ ████████╗
+--  ██╔════╝██║  ██║██╔══██╗╚══██╔══╝
+--  ██║     ███████║███████║   ██║   
+--  ██║     ██╔══██║██╔══██║   ██║   
+--  ╚██████╗██║  ██║██║  ██║   ██║   
+--   ╚═════╝╚═╝  ╚═╝╚═╝  ╚═╝   ╚═╝   
+
+do
+  Addon.chatArgs = {}
+
+  function Addon:RegisterChatArg(arg, func)
+    Addon.chatArgs[arg] = func
+  end
+
+  function Addon:RegisterChatArgAliases(arg, func)
+    for i = #arg, 1, -1 do
+      local alias = strSub(arg, 1, i)
+      if not self.chatArgs[alias] then
+        self:RegisterChatArg(alias, func)
+      end
+    end
+    Addon.chatArgs[arg] = func
+  end
+
+  function Addon:OnChatCommand(input)
+    local args = {self:GetArgs(input, 1)}
+    
+    local func = args[1] and self.chatArgs[args[1]] or nil
+    if func then
+      func(self, unpack(args))
+    else
+      self:OpenConfig()
+    end
+  end
+
+  function Addon:InitChatCommands(slashKeywords)
+    for i, chatCommand in ipairs(slashKeywords) do
+      if i == 1 then
+        self:MakeAddonOptions(chatCommand)
+        self:MakeBlizzardOptions(chatCommand)
+      end
+      self:RegisterChatCommand(chatCommand, "OnChatCommand", true)
+    end
+
+    local function PrintVersion() self:Printf("Version: %s", tostring(self.version)) end
+    self:RegisterChatArgAliases("version", PrintVersion)
+  end
+end
+
+
+
+
+--   ██████╗ ██████╗ ██╗      ██████╗ ██████╗ ███████╗
+--  ██╔════╝██╔═══██╗██║     ██╔═══██╗██╔══██╗██╔════╝
+--  ██║     ██║   ██║██║     ██║   ██║██████╔╝███████╗
+--  ██║     ██║   ██║██║     ██║   ██║██╔══██╗╚════██║
+--  ╚██████╗╚██████╔╝███████╗╚██████╔╝██║  ██║███████║
+--   ╚═════╝ ╚═════╝ ╚══════╝ ╚═════╝ ╚═╝  ╚═╝╚══════╝
+
+do
+  function Addon:GetHexFromColor(r, g, b)
+    return format("%02x%02x%02x", r, g, b)
+  end
+  function Addon:ConvertColorFromBlizzard(r, g, b)
+    return self:GetHexFromColor(self:Round(r*255, 1), self:Round(g*255, 1), self:Round(b*255, 1))
+  end
+  function Addon:GetTextColorAsHex(frame)
+    return self:ConvertColorFromBlizzard(frame:GetTextColor())
+  end
+  
+  function Addon:ConvertHexToRGB(hex)
+    return tonumber(strSub(hex, 1, 2), 16), tonumber(strSub(hex, 3, 4), 16), tonumber(strSub(hex, 5, 6), 16), 1
+  end
+  function Addon:ConvertColorToBlizzard(hex)
+    return tonumber(strSub(hex, 1, 2), 16) / 255, tonumber(strSub(hex, 3, 4), 16) / 255, tonumber(strSub(hex, 5, 6), 16) / 255, 1
+  end
+  function Addon:SetTextColorFromHex(frame, hex)
+    frame:SetTextColor(self:ConvertColorToBlizzard(hex))
+  end
+  
+  function Addon:TrimAlpha(hex)
+    return strMatch(hex, "%x?%x?(%x%x%x%x%x%x)") or hex
+  end
+  function Addon:MakeColorCode(hex, text)
+    return format("|cff%s%s%s", hex, text or "", text and "|r" or "")
+  end
+  
+  function Addon:StripColorCode(text, hex)
+    local pattern = hex and ("|c%x%x" .. hex) or "|c%x%x%x%x%x%x%x%x"
+    return self:ChainGsub(text, {pattern, "|r", ""})
+  end
+end
+
+
+
 
 
 --  ███╗   ██╗██╗   ██╗███╗   ███╗██████╗ ███████╗██████╗ ███████╗
@@ -322,10 +983,16 @@ do
   end
   
   function Addon:Clamp(min, num, max)
-    assert(type(min) == "number", "Can't clamp. min is " .. type(min))
-    assert(type(max) == "number", "Can't clamp. max is " .. type(max))
-    assert(min <= max, format("Can't clamp. min (%d) > max (%d)", min, max))
-    return mathMin(mathMax(num, min), max)
+    assert(not min or type(min) == "number", "Can't clamp. min is " .. type(min))
+    assert(not max or type(max) == "number", "Can't clamp. max is " .. type(max))
+    assert(not min or not max or (min <= max), format("Can't clamp. min (%d) > max (%d)", min, max))
+    if min then
+      num = mathMax(num, min)
+    end
+    if max then
+      num = mathMin(num, max)
+    end
+    return num
   end
 end
 
@@ -370,6 +1037,51 @@ do
     end
     return new
   end
+
+  function Addon:Filter(t, ...)
+    local new = {}
+    
+    for i, v in pairs(t) do
+      local pass = true
+      for j = 1, select("#", ...) do
+        local filter = select(j, ...)
+        if not filter(v, i, t) then
+          pass = false
+          break
+        end
+      end
+      if pass then
+        tinsert(new, v)
+      end
+    end
+    
+    local meta = getmetatable(self)
+    if meta then
+      setmetatable(new, meta)
+    end
+    
+    return new
+  end
+  
+  function Addon:Squish(t)
+    local new = {}
+    for k in pairs(t) do
+      tinsert(new, k)
+    end
+    tblSort(new)
+    for i, k in ipairs(new) do
+      new[i] = t[k]
+    end
+    return new
+  end
+
+  function Addon:Shuffle(t)
+    for i = #t, 2, -1 do
+      local j = math.random(i)
+      t[i], t[j] = t[j], t[i]
+    end
+  end
+
   
   function Addon:MakeLookupTable(t, val, keepOrigVals)
     local ValFunc
@@ -394,7 +1106,57 @@ do
     return new
   end
   
+  
+  function Addon:CheckTable(t, ...)
+    local val = t
+    for _, key in ipairs{...} do
+      val = (val or {})[key]
+    end
+    return val
+  end
+  
+  function Addon:Concatenate(t1, t2)
+    for _, v in ipairs(t2) do
+      t1[#t1+1] = v
+    end
+    for k, v in pairs(t2) do
+      if type(k) ~= "number" then
+        t1[k] = v
+      end
+    end
+  end
+  
   function Addon:Random(t)
     return t[random(#t)]
   end
+  
+  do
+    cycleMemory = setmetatable({}, {__mode = "k"})
+    function Addon:Cycle(t, offset)
+      if cycleMemory[t] then
+        cycleMemory[t] = next(t, cycleMemory[t]) or next(t)
+      else
+        cycleMemory[t] = offset or next(t)
+      end
+      return cycleMemory[t], t[cycleMemory[t]]
+    end
+  end
+  
+  do
+    cycleMemory = setmetatable({}, {__mode = "k"})
+    function Addon:ICycle(t, offset)
+      cycleMemory[t] = ((cycleMemory[t] or (offset - 1) or 0) % #t) + 1
+      return cycleMemory[t], t[cycleMemory[t]]
+    end
+  end
+  
+  
+  function Addon:Switch(val, t, fallback)
+    fallback = fallback or nop
+    if val == nil then
+      return fallback(val)
+    else
+      return setmetatable(t, {__index = function() return fallback end})[val](val)
+    end
+  end
 end
diff --git a/Init/Functions.lua b/Init/InitAddon.lua
similarity index 99%
rename from Init/Functions.lua
rename to Init/InitAddon.lua
index f244cd2..ca8688c 100644
--- a/Init/Functions.lua
+++ b/Init/InitAddon.lua
@@ -3,7 +3,7 @@ local ADDON_NAME, Data = ...
 
 
 local Addon = LibStub("AceAddon-3.0"):GetAddon(ADDON_NAME)
-
+ItemCacheAddon = Addon
 
 
 
diff --git a/Init/_init.xml b/Init/_init.xml
index 337962b..9619c30 100644
--- a/Init/_init.xml
+++ b/Init/_init.xml
@@ -1,5 +1,5 @@
 <Ui xsi:schemaLocation="http://www.blizzard.com/wow/ui/ ..\FrameXML\UI.xsd">
   
   <Script file="Init.lua"/>
-  <Script file="Functions.lua"/>
+  <Script file="InitAddon.lua"/>
 </Ui>
\ No newline at end of file
diff --git a/ItemCache.lua b/ItemCache.lua
index 314d51c..a13e200 100644
--- a/ItemCache.lua
+++ b/ItemCache.lua
@@ -1231,39 +1231,37 @@ function Addon:CreateOptions()
 end
 
 function Addon:InitDB()
-  local configVersion = self.SemVer(self:GetOption"_VERSION" or tostring(self.Version))
-  if configVersion < self.Version then
-    -- Update data schema here
+  local configVersion = self.SemVer(self:GetOption"version" or tostring(self.version))
+  
+  if not self:GetOption"version" then -- first run
+    
+  else -- upgrade data schema
+    
   end
-  self:SetOption(tostring(self.Version), "_VERSION")
+  
+  self:SetOption(tostring(self.version), "version")
 end
 
 
 function Addon:OnInitialize()
-  self.Version   = self.SemVer(GetAddOnMetadata(ADDON_NAME, "Version"))
-  self.db        = self.AceDB:New(("%sDB"):format(ADDON_NAME)        , self:MakeDefaultOptions(), true)
-  self.dbDefault = self.AceDB:New(("%sDB_Default"):format(ADDON_NAME), self:MakeDefaultOptions(), true)
+  self.db        = self.AceDB:New(("%sDB"):format(ADDON_NAME), self:MakeDefaultOptions(), true)
+  self.dbDefault = self.AceDB:New({}                         , self:MakeDefaultOptions(), true)
   
-  self.chatCommands = {"zt", "zera", ADDON_NAME:lower()}
-  for _, chatCommand in ipairs(self.chatCommands) do
-    self:RegisterChatCommand(chatCommand, "OnChatCommand", true)
-  end
+  self:RunInitializeCallbacks()
   
   ItemDB:Init()
 end
 
 function Addon:OnEnable()
+  self.version = self.SemVer(GetAddOnMetadata(ADDON_NAME, "Version"))
   self:InitDB()
   self:GetDB().RegisterCallback(self, "OnProfileChanged", "InitDB")
   self:GetDB().RegisterCallback(self, "OnProfileCopied" , "InitDB")
   self:GetDB().RegisterCallback(self, "OnProfileReset"  , "InitDB")
   
-  self.chatArgs = {}
-  do
-    local function PrintVersion() self:Printf("Version: %s", tostring(self.version)) end
-    for _, arg in ipairs{"version", "vers", "ver", "v"} do self.chatArgs[arg] = PrintVersion end
-  end
-  self:CreateOptions()
+  self:InitChatCommands{"ic", ADDON_NAME:lower()}
+  
+  self:RunEnableCallbacks()
 end
 
 function Addon:OnDisable()
diff --git a/Locale/LocaleAutomatic.lua b/Locale/LocaleAutomatic.lua
new file mode 100644
index 0000000..81577cb
--- /dev/null
+++ b/Locale/LocaleAutomatic.lua
@@ -0,0 +1,66 @@
+
+local ADDON_NAME, Data = ...
+
+
+local Addon = LibStub("AceAddon-3.0"):GetAddon(ADDON_NAME)
+
+
+
+
+local strLower  = string.lower
+
+local tostring = tostring
+
+
+
+local L = setmetatable({}, {
+  __index = function(self, key)
+    rawset(self, key, key)
+    if Addon:IsDebugEnabled() then
+      geterrorhandler()(ADDON_NAME..": Missing automatic translation for '"..tostring(key).."'")
+    end
+    return key
+  end
+})
+Addon.L = L
+
+
+L["Options"] = OPTIONS
+
+L["Enable"]  = ENABLE
+L["Disable"] = DISABLE
+L["Enabled"] = VIDEO_OPTIONS_ENABLED
+-- L["Disabled"] = ADDON_DISABLED
+L["Modifiers:"] = MODIFIERS_COLON
+
+L["never"] = strLower(CALENDAR_REPEAT_NEVER)
+L["any"]   = strLower(SPELL_TARGET_TYPE1_DESC)
+L["all"]   = strLower(SPELL_TARGET_TYPE12_DESC)
+
+L["SHIFT key"] = SHIFT_KEY
+L["CTRL key"]  = CTRL_KEY
+L["ALT key"]   = ALT_KEY
+
+L["Features"] = FEATURES_LABEL
+
+
+L["ERROR"] = ERROR_CAPS
+
+
+L["Debug"]                        = BINDING_HEADER_DEBUG
+L["Display Lua Errors"]           = SHOW_LUA_ERRORS
+L["Reload UI"]                    = RELOADUI
+L["Hide messages like this one."] = COMBAT_LOG_MENU_SPELL_HIDE
+L["Lua Warning"]                  = LUA_WARNING
+L["Clear Cache"]                  = BROWSER_CLEAR_CACHE
+-- L["Delete"]                       = DELETE
+
+
+
+
+
+
+
+
+
+
diff --git a/Locale/_locale.xml b/Locale/_locale.xml
index 5eab1f0..6d80d91 100644
--- a/Locale/_locale.xml
+++ b/Locale/_locale.xml
@@ -1,5 +1,6 @@
 <Ui xsi:schemaLocation="http://www.blizzard.com/wow/ui/ ..\FrameXML\UI.xsd">
   
-  <Script file="Locale\enUS.lua"/>
+  <Script file="LocaleAutomatic.lua"/>
   
+  <Script file="enUS.lua"/> <!-- Load enUS first -->
 </Ui>
\ No newline at end of file