diff --git a/src/_bastion.lua b/src/_bastion.lua
index 380a865..6d92449 100644
--- a/src/_bastion.lua
+++ b/src/_bastion.lua
@@ -1,9 +1,9 @@
 local Tinkr = ...
 
+local Evaulator = Tinkr.Evaluator
+
 ---@class Bastion
-local Bastion = {
-    DebugMode = false
-}
+local Bastion = {DebugMode = false}
 Bastion.__index = Bastion
 
 function Bastion:Require(file)
@@ -50,348 +50,363 @@ function Bastion.require(class)
     return Bastion:Require("~/src/" .. class .. "/" .. class)
 end
 
-Bastion.Globals = {}
-
----@type ClassMagic
-Bastion.ClassMagic = Bastion.require("ClassMagic")
----@type List
-Bastion.List = Bastion.require("List")
----@type Library
-Bastion.Library = Bastion.require("Library")
----@type NotificationsList, Notification
-Bastion.NotificationsList, Bastion.Notification = Bastion.require("NotificationsList")
----@type Vector3
-Bastion.Vector3 = Bastion.require("Vector3")
----@type Sequencer
-Bastion.Sequencer = Bastion.require("Sequencer")
----@type Command
-Bastion.Command = Bastion.require("Command")
----@type Cache
-Bastion.Cache = Bastion.require("Cache")
----@type Cacheable
-Bastion.Cacheable = Bastion.require("Cacheable")
----@type Refreshable
-Bastion.Refreshable = Bastion.require("Refreshable")
----@type Unit
-Bastion.Unit = Bastion.require("Unit")
----@type Aura
-Bastion.Aura = Bastion.require("Aura")
----@type APL, APLActor, APLTrait
-Bastion.APL, Bastion.APLActor, Bastion.APLTrait = Bastion.require("APL")
----@type Module
-Bastion.Module = Bastion.require("Module")
----@type UnitManager
-Bastion.UnitManager = Bastion.require("UnitManager"):New()
----@type ObjectManager
-Bastion.ObjectManager = Bastion.require("ObjectManager"):New()
----@type EventManager
-Bastion.EventManager = Bastion.require("EventManager")
-Bastion.Globals.EventManager = Bastion.EventManager:New()
----@type Spell
-Bastion.Spell = Bastion.require("Spell")
----@type SpellBook
-Bastion.SpellBook = Bastion.require("SpellBook")
-Bastion.Globals.SpellBook = Bastion.SpellBook:New()
----@type Item
-Bastion.Item = Bastion.require("Item")
----@type ItemBook
-Bastion.ItemBook = Bastion.require("ItemBook")
-Bastion.Globals.ItemBook = Bastion.ItemBook:New()
----@type AuraTable
-Bastion.AuraTable = Bastion.require("AuraTable")
----@type Class
-Bastion.Class = Bastion.require("Class")
----@type Timer
-Bastion.Timer = Bastion.require("Timer")
----@type Timer
-Bastion.CombatTimer = Bastion.Timer:New('combat')
----@type MythicPlusUtils
-Bastion.MythicPlusUtils = Bastion.require("MythicPlusUtils"):New()
----@type NotificationsList
-Bastion.Notifications = Bastion.NotificationsList:New()
-
-local LIBRARIES = {}
-local MODULES = {}
-
-Bastion.Enabled = false
-
-Bastion.Globals.EventManager:RegisterWoWEvent('UNIT_AURA', function(unit, auras)
-    local u = Bastion.UnitManager[unit]
-
-    if u then
-        u:GetAuras():OnUpdate(auras)
-    end
-end)
-
-Bastion.Globals.EventManager:RegisterWoWEvent("UNIT_SPELLCAST_SUCCEEDED", function(...)
-    local unit, castGUID, spellID = ...
-
-    local spell = Bastion.Globals.SpellBook:GetIfRegistered(spellID)
-
-    if unit == "player" and spell then
-        spell.lastCastAt = GetTime()
-
-        if spell:GetPostCastFunction() then
-            spell:GetPostCastFunction()(spell)
+-- fenv for all required files
+function Bastion.Bootstrap()
+
+    Bastion.Globals = {}
+
+    ---@type ClassMagic
+    Bastion.ClassMagic = Bastion.require("ClassMagic")
+    ---@type List
+    Bastion.List = Bastion.require("List")
+    ---@type Library
+    Bastion.Library = Bastion.require("Library")
+    ---@type NotificationsList, Notification
+    Bastion.NotificationsList, Bastion.Notification = Bastion.require(
+                                                          "NotificationsList")
+    ---@type Vector3
+    Bastion.Vector3 = Bastion.require("Vector3")
+    ---@type Sequencer
+    Bastion.Sequencer = Bastion.require("Sequencer")
+    ---@type Command
+    Bastion.Command = Bastion.require("Command")
+    ---@type Cache
+    Bastion.Cache = Bastion.require("Cache")
+    ---@type Cacheable
+    Bastion.Cacheable = Bastion.require("Cacheable")
+    ---@type Refreshable
+    Bastion.Refreshable = Bastion.require("Refreshable")
+    ---@type Unit
+    Bastion.Unit = Bastion.require("Unit")
+    ---@type Aura
+    Bastion.Aura = Bastion.require("Aura")
+    ---@type APL, APLActor, APLTrait
+    Bastion.APL, Bastion.APLActor, Bastion.APLTrait = Bastion.require("APL")
+    ---@type Module
+    Bastion.Module = Bastion.require("Module")
+    ---@type UnitManager
+    Bastion.UnitManager = Bastion.require("UnitManager"):New()
+    ---@type ObjectManager
+    Bastion.ObjectManager = Bastion.require("ObjectManager"):New()
+    ---@type EventManager
+    Bastion.EventManager = Bastion.require("EventManager")
+    Bastion.Globals.EventManager = Bastion.EventManager:New()
+    ---@type Spell
+    Bastion.Spell = Bastion.require("Spell")
+    ---@type SpellBook
+    Bastion.SpellBook = Bastion.require("SpellBook")
+    Bastion.Globals.SpellBook = Bastion.SpellBook:New()
+    ---@type Item
+    Bastion.Item = Bastion.require("Item")
+    ---@type ItemBook
+    Bastion.ItemBook = Bastion.require("ItemBook")
+    Bastion.Globals.ItemBook = Bastion.ItemBook:New()
+    ---@type AuraTable
+    Bastion.AuraTable = Bastion.require("AuraTable")
+    ---@type Class
+    Bastion.Class = Bastion.require("Class")
+    ---@type Timer
+    Bastion.Timer = Bastion.require("Timer")
+    ---@type Timer
+    Bastion.CombatTimer = Bastion.Timer:New('combat')
+    ---@type MythicPlusUtils
+    Bastion.MythicPlusUtils = Bastion.require("MythicPlusUtils"):New()
+    ---@type NotificationsList
+    Bastion.Notifications = Bastion.NotificationsList:New()
+
+    local LIBRARIES = {}
+    local MODULES = {}
+
+    Bastion.Enabled = false
+
+    Bastion.Globals.EventManager:RegisterWoWEvent('UNIT_AURA',
+                                                  function(unit, auras)
+        local u = Bastion.UnitManager[unit]
+
+        if u then u:GetAuras():OnUpdate(auras) end
+    end)
+
+    Bastion.Globals.EventManager:RegisterWoWEvent("UNIT_SPELLCAST_SUCCEEDED",
+                                                  function(...)
+        local unit, castGUID, spellID = ...
+
+        local spell = Bastion.Globals.SpellBook:GetIfRegistered(spellID)
+
+        if unit == "player" and spell then
+            spell.lastCastAt = GetTime()
+
+            if spell:GetPostCastFunction() then
+                spell:GetPostCastFunction()(spell)
+            end
         end
-    end
-end)
+    end)
 
-local pguid = UnitGUID("player")
-local missed = {}
+    local pguid = UnitGUID("player")
+    local missed = {}
 
-Bastion.Globals.EventManager:RegisterWoWEvent("COMBAT_LOG_EVENT_UNFILTERED", function()
-    local args = {CombatLogGetCurrentEventInfo()}
+    Bastion.Globals.EventManager:RegisterWoWEvent("COMBAT_LOG_EVENT_UNFILTERED",
+                                                  function()
+        local args = {CombatLogGetCurrentEventInfo()}
 
-    local subEvent = args[2]
-    local sourceGUID = args[4]
-    local destGUID = args[8]
-    local spellID = args[12]
+        local subEvent = args[2]
+        local sourceGUID = args[4]
+        local destGUID = args[8]
+        local spellID = args[12]
 
-    -- if sourceGUID == pguid then
-    --     local args = { CombatLogGetCurrentEventInfo() }
+        -- if sourceGUID == pguid then
+        --     local args = { CombatLogGetCurrentEventInfo() }
 
-    --     for i = 1, #args do
-    --         Log(tostring(args[i]))
-    --     end
-    -- end
+        --     for i = 1, #args do
+        --         Log(tostring(args[i]))
+        --     end
+        -- end
 
-    local u = Bastion.UnitManager[sourceGUID]
-    local u2 = Bastion.UnitManager[destGUID]
+        local u = Bastion.UnitManager[sourceGUID]
+        local u2 = Bastion.UnitManager[destGUID]
 
-    local t = GetTime()
+        local t = GetTime()
 
-    if u then
-        u:SetLastCombatTime(t)
-    end
+        if u then u:SetLastCombatTime(t) end
 
-    if u2 then
-        u2:SetLastCombatTime(t)
+        if u2 then
+            u2:SetLastCombatTime(t)
 
-        if subEvent == "SPELL_MISSED" and sourceGUID == pguid and spellID == 408 then
-            local missType = args[15]
+            if subEvent == "SPELL_MISSED" and sourceGUID == pguid and spellID ==
+                408 then
+                local missType = args[15]
 
-            if missType == "IMMUNE" then
-                local castingSpell = u:GetCastingOrChannelingSpell()
+                if missType == "IMMUNE" then
+                    local castingSpell = u:GetCastingOrChannelingSpell()
 
-                if castingSpell then
-                    if not missed[castingSpell:GetID()] then
-                        missed[castingSpell:GetID()] = true
+                    if castingSpell then
+                        if not missed[castingSpell:GetID()] then
+                            missed[castingSpell:GetID()] = true
+                        end
                     end
                 end
             end
         end
-    end
-end)
+    end)
+
+    Bastion.Ticker = C_Timer.NewTicker(0.1, function()
+        if not Bastion.CombatTimer:IsRunning() and UnitAffectingCombat("player") then
+            Bastion.CombatTimer:Start()
+        elseif Bastion.CombatTimer:IsRunning() and
+            not UnitAffectingCombat("player") then
+            Bastion.CombatTimer:Reset()
+        end
 
-Bastion.Ticker = C_Timer.NewTicker(0.1, function()
-    if not Bastion.CombatTimer:IsRunning() and UnitAffectingCombat("player") then
-        Bastion.CombatTimer:Start()
-    elseif Bastion.CombatTimer:IsRunning() and not UnitAffectingCombat("player") then
-        Bastion.CombatTimer:Reset()
+        if Bastion.Enabled then
+            Bastion.ObjectManager:Refresh()
+            for i = 1, #MODULES do MODULES[i]:Tick() end
+        end
+    end)
+
+    function Bastion:Register(module)
+        table.insert(MODULES, module)
+        Bastion:Print("Registered", module)
     end
 
-    if Bastion.Enabled then
-        Bastion.ObjectManager:Refresh()
+    -- Find a module by name
+    function Bastion:FindModule(name)
         for i = 1, #MODULES do
-            MODULES[i]:Tick()
+            if MODULES[i].name == name then return MODULES[i] end
         end
-    end
-end)
-
-function Bastion:Register(module)
-    table.insert(MODULES, module)
-    Bastion:Print("Registered", module)
-end
 
--- Find a module by name
-function Bastion:FindModule(name)
-    for i = 1, #MODULES do
-        if MODULES[i].name == name then
-            return MODULES[i]
-        end
+        return nil
     end
 
-    return nil
-end
-
-function Bastion:Print(...)
-    local args = {...}
-    local str = "|cFFDF362D[Bastion]|r |cFFFFFFFF"
-    for i = 1, #args do
-        str = str .. tostring(args[i]) .. " "
+    function Bastion:Print(...)
+        local args = {...}
+        local str = "|cFFDF362D[Bastion]|r |cFFFFFFFF"
+        for i = 1, #args do str = str .. tostring(args[i]) .. " " end
+        print(str)
     end
-    print(str)
-end
 
-function Bastion:Debug(...)
-    if not Bastion.DebugMode then
-        return
-    end
-    local args = {...}
-    local str = "|cFFDF6520[Bastion]|r |cFFFFFFFF"
-    for i = 1, #args do
-        str = str .. tostring(args[i]) .. " "
+    function Bastion:Debug(...)
+        if not Bastion.DebugMode then return end
+        local args = {...}
+        local str = "|cFFDF6520[Bastion]|r |cFFFFFFFF"
+        for i = 1, #args do str = str .. tostring(args[i]) .. " " end
+        print(str)
     end
-    print(str)
-end
 
-local Command = Bastion.Command:New('bastion')
+    local Command = Bastion.Command:New('bastion')
 
-Command:Register('toggle', 'Toggle bastion on/off', function()
-    Bastion.Enabled = not Bastion.Enabled
-    if Bastion.Enabled then
-        Bastion:Print("Enabled")
-    else
-        Bastion:Print("Disabled")
-    end
-end)
+    Command:Register('toggle', 'Toggle bastion on/off', function()
+        Bastion.Enabled = not Bastion.Enabled
+        if Bastion.Enabled then
+            Bastion:Print("Enabled")
+        else
+            Bastion:Print("Disabled")
+        end
+    end)
 
-Command:Register('debug', 'Toggle debug mode on/off', function()
-    Bastion.DebugMode = not Bastion.DebugMode
-    if Bastion.DebugMode then
-        Bastion:Print("Debug mode enabled")
-    else
-        Bastion:Print("Debug mode disabled")
-    end
-end)
-
-Command:Register('dumpspells', 'Dump spells to a file', function()
-    local i = 1
-    local rand = math.random(100000, 999999)
-    while true do
-        local spellName, spellSubName = GetSpellBookItemName(i, BOOKTYPE_SPELL)
-        if not spellName then
-            do
-                break
-            end
+    Command:Register('debug', 'Toggle debug mode on/off', function()
+        Bastion.DebugMode = not Bastion.DebugMode
+        if Bastion.DebugMode then
+            Bastion:Print("Debug mode enabled")
+        else
+            Bastion:Print("Debug mode disabled")
         end
+    end)
+
+    Command:Register('dumpspells', 'Dump spells to a file', function()
+        local i = 1
+        local rand = math.random(100000, 999999)
+        local BOOKTYPE_SPELL = BOOKTYPE_SPELL or (Enum.SpellBookSpellBank.Player and Enum.SpellBookSpellBank.Player or 'spell')
+        while true do
+            local spellName, spellSubName
+
+            if C_SpellBook.GetSpellBookItemName then
+                spellName, spellSubName = C_SpellBook.GetSpellBookItemName(i, BOOKTYPE_SPELL)
+            else
+                spellName, spellSubName = GetSpellBookItemName(i, BOOKTYPE_SPELL)
+            end
+
+            if not spellName then do break end end
 
-        -- use spellName and spellSubName here
-        local spellID = select(7, GetSpellInfo(spellName))
+            -- use spellName and spellSubName here
+            local spellID
 
-        if spellID then
-            spellName = spellName:gsub("[%W%s]", "")
-            WriteFile('bastion-' .. UnitClass('player') .. '-' .. rand .. '.lua',
-                "local " .. spellName .. " = Bastion.Globals.SpellBook:GetSpell(" .. spellID .. ")\n", true)
+            if C_Spell.GetSpellInfo then
+                local info = C_Spell.GetSpellInfo(spellName)
+                spellID = info.spellID
+            else
+                spellID = select(7, GetSpellInfo(spellName))
+            end
+
+            if spellID then
+                spellName = spellName:gsub("[%W%s]", "")
+                WriteFile('bastion-' .. UnitClass('player') .. '-' .. rand ..
+                              '.lua',
+                          "local " .. spellName ..
+                              " = Bastion.Globals.SpellBook:GetSpell(" ..
+                              spellID .. ")\n", true)
+            end
+            i = i + 1
         end
-        i = i + 1
-    end
-end)
-
-Command:Register('module', 'Toggle a module on/off', function(args)
-    local module = Bastion:FindModule(args[2])
-    if module then
-        module:Toggle()
-        if module.enabled then
-            Bastion:Print("Enabled", module.name)
+    end)
+
+    Command:Register('module', 'Toggle a module on/off', function(args)
+        local module = Bastion:FindModule(args[2])
+        if module then
+            module:Toggle()
+            if module.enabled then
+                Bastion:Print("Enabled", module.name)
+            else
+                Bastion:Print("Disabled", module.name)
+            end
         else
-            Bastion:Print("Disabled", module.name)
+            Bastion:Print("Module not found")
+        end
+    end)
+
+    Command:Register('mplus', 'Toggle m+ module on/off', function(args)
+        local cmd = args[2]
+        if cmd == 'debuffs' then
+            Bastion.MythicPlusUtils:ToggleDebuffLogging()
+            Bastion:Print("Debuff logging", Bastion.MythicPlusUtils
+                              .debuffLogging and "enabled" or "disabled")
+            return
         end
-    else
-        Bastion:Print("Module not found")
-    end
-end)
-
-Command:Register('mplus', 'Toggle m+ module on/off', function(args)
-    local cmd = args[2]
-    if cmd == 'debuffs' then
-        Bastion.MythicPlusUtils:ToggleDebuffLogging()
-        Bastion:Print("Debuff logging", Bastion.MythicPlusUtils.debuffLogging and "enabled" or "disabled")
-        return
-    end
 
-    if cmd == 'casts' then
-        Bastion.MythicPlusUtils:ToggleCastLogging()
-        Bastion:Print("Cast logging", Bastion.MythicPlusUtils.castLogging and "enabled" or "disabled")
-        return
-    end
+        if cmd == 'casts' then
+            Bastion.MythicPlusUtils:ToggleCastLogging()
+            Bastion:Print("Cast logging",
+                          Bastion.MythicPlusUtils.castLogging and "enabled" or
+                              "disabled")
+            return
+        end
 
-    Bastion:Print("[MythicPlusUtils] Unknown command")
-    Bastion:Print("Available commands:")
-    Bastion:Print("debuffs")
-    Bastion:Print("casts")
-end)
+        Bastion:Print("[MythicPlusUtils] Unknown command")
+        Bastion:Print("Available commands:")
+        Bastion:Print("debuffs")
+        Bastion:Print("casts")
+    end)
 
-Command:Register('missed', 'Dump the list of immune kidney shot spells', function()
-    for k, v in pairs(missed) do
-        Bastion:Print(k)
-    end
-end)
+    Command:Register('missed', 'Dump the list of immune kidney shot spells',
+                     function()
+        for k, v in pairs(missed) do Bastion:Print(k) end
+    end)
 
----@param library Library
-function Bastion:RegisterLibrary(library)
-    LIBRARIES[library.name] = library
-end
+    ---@param library Library
+    function Bastion:RegisterLibrary(library)
+        LIBRARIES[library.name] = library
+    end
 
-function Bastion:CheckLibraryDependencies()
-    for k, v in pairs(LIBRARIES) do
-        if v.dependencies then
-            for i = 1, #v.dependencies do
-                local dep = v.dependencies[i]
-                if LIBRARIES[dep] then
-                    if LIBRARIES[dep].dependencies then
-                        for j = 1, #LIBRARIES[dep].dependencies do
-                            if LIBRARIES[dep].dependencies[j] == v.name then
-                                Bastion:Print("Circular dependency detected between " .. v.name .. " and " .. dep)
-                                return false
+    function Bastion:CheckLibraryDependencies()
+        for k, v in pairs(LIBRARIES) do
+            if v.dependencies then
+                for i = 1, #v.dependencies do
+                    local dep = v.dependencies[i]
+                    if LIBRARIES[dep] then
+                        if LIBRARIES[dep].dependencies then
+                            for j = 1, #LIBRARIES[dep].dependencies do
+                                if LIBRARIES[dep].dependencies[j] == v.name then
+                                    Bastion:Print(
+                                        "Circular dependency detected between " ..
+                                            v.name .. " and " .. dep)
+                                    return false
+                                end
                             end
                         end
+                    else
+                        Bastion:Print("Library " .. v.name .. " depends on " ..
+                                          dep .. " but it's not registered")
+                        return false
                     end
-                else
-                    Bastion:Print("Library " .. v.name .. " depends on " .. dep .. " but it's not registered")
-                    return false
                 end
             end
         end
+
+        return true
     end
 
-    return true
-end
+    function Bastion:Import(library)
+        local lib = self:GetLibrary(library)
 
-function Bastion:Import(library)
-    local lib = self:GetLibrary(library)
+        if not lib then error("Library " .. library .. " not found") end
 
-    if not lib then
-        error("Library " .. library .. " not found")
+        return lib:Resolve()
     end
 
-    return lib:Resolve()
-end
+    function Bastion:GetLibrary(name)
+        if not LIBRARIES[name] then
+            error("Library " .. name .. " not found")
+        end
 
-function Bastion:GetLibrary(name)
-    if not LIBRARIES[name] then
-        error("Library " .. name .. " not found")
+        local library = LIBRARIES[name]
+
+        -- if library.dependencies then
+        --     for i = 1, #library.dependencies do
+        --         local dep = library.dependencies[i]
+        --         if LIBRARIES[dep] then
+        --             if LIBRARIES[dep].dependencies then
+        --                 for j = 1, #LIBRARIES[dep].dependencies do
+        --                     if LIBRARIES[dep].dependencies[j] == library.name then
+        --                         Bastion:Print("Circular dependency detected between " .. library.name .. " and " .. dep)
+        --                         return false
+        --                     end
+        --                 end
+        --             end
+        --         else
+        --             Bastion:Print("Library " .. v.name .. " depends on " .. dep .. " but it's not registered")
+        --             return false
+        --         end
+        --     end
+        -- end
+
+        return library
     end
 
-    local library = LIBRARIES[name]
-
-    -- if library.dependencies then
-    --     for i = 1, #library.dependencies do
-    --         local dep = library.dependencies[i]
-    --         if LIBRARIES[dep] then
-    --             if LIBRARIES[dep].dependencies then
-    --                 for j = 1, #LIBRARIES[dep].dependencies do
-    --                     if LIBRARIES[dep].dependencies[j] == library.name then
-    --                         Bastion:Print("Circular dependency detected between " .. library.name .. " and " .. dep)
-    --                         return false
-    --                     end
-    --                 end
-    --             end
-    --         else
-    --             Bastion:Print("Library " .. v.name .. " depends on " .. dep .. " but it's not registered")
-    --             return false
-    --         end
-    --     end
+    -- if not Bastion:CheckLibraryDependencies() then
+    --     return
     -- end
 
-    return library
+    Load("@Libraries/")
+    Load("@Modules/")
+    Load("@")
 end
 
--- if not Bastion:CheckLibraryDependencies() then
---     return
--- end
-
-Load("@Libraries/")
-Load("@Modules/")
-Load("@")
+Bastion.Bootstrap()