--- a/SkeletonKey/SkeletonKey.lua	Sun Jul 31 16:45:02 2016 -0400
+++ b/SkeletonKey/SkeletonKey.lua	Tue Aug 02 12:33:13 2016 -0400
@@ -42,10 +42,21 @@
   [BINDING_TYPE_SPECIALIZATION] = L('Applied when you select this specialization.'),
 }
 
-
+kb.ChangedBindings = {}
 kb.SystemBindings = {}
 kb.ActionTypes = {}
 kb.TalentBindings = {}
+kb.PetCache = {
+  spell = {},
+  spellslot = {},
+  action = {},
+  special = {},
+  subtext = {}
+}
+kb.TalentCache = {}
+kb.ProfessionCache = {}
+kb.pendingCalls = {}
+kb.pendingAttributes = {}
 
 kb.configHeaders = {}
 kb.loadedProfiles = {}
@@ -74,8 +85,6 @@
 kb.IsCommandBound = function(self, command)
   local isAssigned, assignedBy = false, db.bindMode
   local isBound, boundBy = false, db.bindMode
-
-
   command = command or self.command
   for i = 1, #kb.orderedProfiles do
     local tier = kb.orderedProfiles[i]
@@ -295,6 +304,14 @@
   kb.UpdateSystemBinds()
   kb.ApplyAllBindings()
 
+  if not InCombatLockdown() then
+    kb.CreateHooks()
+  else
+    kb:print('Some functionality will not load until breaking combat.')
+    tinsert(kb.pendingCalls, kb.CreateHooks)
+  end
+
+
   kb.ui(true)
 end