--- a/Core.lua	Wed Mar 14 22:06:19 2012 -0400
+++ b/Core.lua	Thu Mar 15 08:47:41 2012 -0400
@@ -18,6 +18,15 @@
 -- ( ) alt tracking
 -- (_) reserves
 
+local _G=_G
+local strsplit=strsplit
+local string=string
+local sformat=string.format
+local bsk = LibStub("AceAddon-3.0"):NewAddon("bsk","AceConsole-3.0", "AceHook-3.0", "AceComm-3.0", "AceSerializer-3.0")
+_G.bsk=bsk
+local L = LibStub("AceLocale-3.0"):GetLocale("bsk", false)
+setfenv(1,bsk)
+
 local pkgrev = " @project-revision@ "
 
 -- important things to remember:
@@ -28,27 +37,27 @@
 -- 4) table.remove() works ok if reverse iterating, terrible at anything else
 -- 5) pairs() does not have a guaranteed iteration order
 
-bsk = LibStub("AceAddon-3.0"):NewAddon("bsk","AceConsole-3.0", "AceHook-3.0", "AceComm-3.0", "AceSerializer-3.0")
-local L = LibStub("AceLocale-3.0"):GetLocale("bsk", false)
 
 
-function bsk:OnInitialize()
+function OnInitialize()
 
-    self.db = LibStub("AceDB-3.0"):New("BskDB", self.defaults, "Default")
+    db = _G.LibStub("AceDB-3.0"):New("BskDB", defaults, "Default")
+    bsk:Print("Totally libstubbed a db")
 
-    self.options.args.profile = LibStub("AceDBOptions-3.0"):GetOptionsTable(self.db)
-    LibStub("AceConfig-3.0"):RegisterOptionsTable("bsk", self.options)
-    self.optionsFrame = LibStub("AceConfigDialog-3.0"):AddToBlizOptions("bsk", "bsk")
+    options.args.profile = _G.LibStub("AceDBOptions-3.0"):GetOptionsTable(db)
+    _G.LibStub("AceConfig-3.0"):RegisterOptionsTable("bsk", options)
+    --optionsFrame = LibStub("AceConfigDialog-3.0"):AddToBlizOptions("bsk", "bsk")
 
-    self:RegisterChatCommand("bsk", "HandleCommand")
+    local HandlePassThrough = function(...) HandleCommand(...) end
+    bsk:RegisterChatCommand("bsk", HandlePassThrough)
 end
 
-function bsk:OnEnable()
-    bsk:CreateWorkingStateFromChanges(self.db.profile.changes)
-    bsk:CreateGUI()
+function OnEnable()
+    CreateWorkingStateFromChanges(db.profile.changes)
+    CreateGUI()
 end
 
-function bsk:HandleCommand(paramIn)
+function HandleCommand(paramIn)
     local param = { strsplit(" ", paramIn) }
     local FixPersonName = function(p)
         p = p:lower()
@@ -62,129 +71,129 @@
         return
     end
     if param[1] == "persons" then
-        bsk:PrintPersons()
+        PrintPersons()
     elseif param[1] == "changes" then
-        bsk:PrintChanges()
+        PrintChanges()
     elseif param[1] == "delete" then
         if param[2] == nil or param[2] == "" or param[3] == nil or param[3] == "" then
-            bsk:PrintTable(param)
+            PrintTable(param)
             return
         end
         if param[2] == "list" then
-            bsk:DeleteList(param[3])
+            DeleteList(param[3])
         elseif param[2] == "personfromlist" then
             if param[4] == nil or param[4] == "" then
-                bsk:PrintTable(param)
+                PrintTable(param)
                 return
             end
             local person = FixPersonName(param[3])
-            bsk:RemovePersonFromList(person, param[4])
+            RemovePersonFromList(person, param[4])
         elseif param[2] == "person" then
             local person = FixPersonName(param[3])
-            bsk:RemovePerson(person)
+            RemovePerson(person)
         else
             bsk:Print(sformat("Deleting anything of type %s is not supported",param[2]))
         end
     elseif param[1] == "nuke" then
         if param[2] == nil or param[2] == "" then
-            bsk:PrintTable(param)
+            PrintTable(param)
             return
         end
         local person = FixPersonName(param[2])
-        bsk:NukePerson(person)
+        NukePerson(person)
     elseif param[1] == "add" then
         if param[2] == nil or param[2] == "" then
-            bsk:PrintTable(param)
+            PrintTable(param)
             return
         end
         if param[3] == nil or param[3] == "" then
-            bsk:PrintTable(param)
+            PrintTable(param)
             return
         end
         if param[2] == "person" then
             if param[3] == "all" then
-                bsk:AddMissingPersons()
+                AddMissingPersons()
             else
                 local person = FixPersonName(param[3])
-                bsk:AddPerson(person)
+                AddPerson(person)
             end
         elseif param[2] == "list" then
-            bsk:CreateList(param[3])
+            CreateList(param[3])
         elseif param[2] == "tolist" then
             if param[4] == nil or param[4] == "" then
-                bsk:PrintTable(param)
+                PrintTable(param)
                 return
             end
             local person = FixPersonName(param[3])
-            bsk:AddPersonToListEnd(person,param[4])
+            AddPersonToListEnd(person,param[4])
         elseif param[2] == "tolistrandom" then
             if param[4] == nil or param[4] == "" then
-                bsk:PrintTable(param)
+                PrintTable(param)
                 return
             end
             local person = FixPersonName(param[3])
-            bsk:AddPersonToListRandom(person,param[4])
+            AddPersonToListRandom(person,param[4])
         end
     elseif param[1] == "populate" then
         if param[2] == nil or param[2] == "" or param[3] == nil or param[3] == "" then
-            bsk:PrintTable(param)
+            PrintTable(param)
             return
         end
         -- list = p2
-        local index = bsk:GetListIndex(param[2])
+        local index = GetListIndex(param[2])
         if param[3] == "random" then
-            bsk:PopulateListRandom(index)
+            PopulateListRandom(index)
         end
     elseif param[1] == "suicide" then
         if param[2] == nil or param[2] == "" or param[3] == nil or param[3] == "" then
-            bsk:PrintTable(param)
+            PrintTable(param)
             return
         end
         local person = FixPersonName(param[2])
-        bsk:SuicidePerson(person,param[3])
+        SuicidePerson(person,param[3])
     elseif param[1] == "lists" then
         if param[2] == nil or param[2] == "" then
-            bsk:PrettyPrintLists()
+            PrettyPrintLists()
             return
         else
-            local listIndex = bsk:GetListIndex(param[2])
-            bsk:PrettyPrintList(listIndex)
+            local listIndex = GetListIndex(param[2])
+            PrettyPrintList(listIndex)
         end
     elseif param[1] == "reserve" then
         if param[2] == nil or param[2] == "" then
-            bsk:printtable(param)
+            printtable(param)
             return
         end
         local person = FixPersonName(param[2])
-        bsk:AddReserve(person)
+        AddReserve(person)
     elseif param[1] == "trim" then
         if param[2] == nil or param[2] == "" then
-            bsk:printtable(param)
+            printtable(param)
             return
         end
-        bsk:TrimLists(param[2])
+        TrimLists(param[2])
     elseif param[1] == "rename" then
         if param[2] == nil or param[2] == "" or param[3] == nil or param[3] == "" then
-            bsk:printtable(param)
+            printtable(param)
             return
         end
-        bsk:RenameList(param[2],param[3])
+        RenameList(param[2],param[3])
     elseif param[1] == "selfdestruct" then
-        bsk:SelfDestruct()
+        SelfDestruct()
     else
-        bsk:CreateGUI()
+        CreateGUI()
     end
 
-    --if self.frame == nil then
-        --self:CreateGUI()
-        --self:ShowGUI()
+    --if frame == nil then
+        --CreateGUI()
+        --ShowGUI()
     --else
-        --self:ShowGUI()
+        --ShowGUI()
     --end
 
 end
 
-bsk.defaults = {
+defaults = {
     profile = {
         persons = {},
         changes = {},