diff --git a/Source/Engine/Core/ConCmd.cs b/Source/Engine/Core/ConCmd.cs
index 901074e..5e9f62b 100644
--- a/Source/Engine/Core/ConCmd.cs
+++ b/Source/Engine/Core/ConCmd.cs
@@ -1,32 +1,22 @@
-using System;
-using System.Diagnostics;
-
-namespace WinterEngine.Core;
-
-[Flags]
-public enum CmdFlags
-{
-    None,
-    Cheat,
-    Development,
-    Debug
-}
-
-#if HAS_MACROS
-//#macro ConsoleCommand(name, desc, fn) internal sealed class nameConCommand : ConCmd {\
-    public override string Command => "name";\
-    public override string Description => desc;\
-    public override CmdFlags Flags => CmdFlags.None;\
-    public override void Exec(string[] args)\
-    fn\
-}
-#endif
-
-public abstract class ConCmd
-{
-    public abstract string Command { get; }
-    public abstract string Description { get; }
-    public abstract CmdFlags Flags { get; }
-
-    public abstract void Exec(string[] args);
-}
+using System;
+using System.Diagnostics;
+
+namespace WinterEngine.Core;
+
+[Flags]
+public enum CmdFlags
+{
+    None,
+    Cheat,
+    Development,
+    Debug
+}
+
+public abstract class ConCmd
+{
+    public abstract string Command { get; }
+    public abstract string Description { get; }
+    public abstract CmdFlags Flags { get; }
+
+    public abstract void Exec(string[] args);
+}
diff --git a/Source/Engine/Core/Engine.cs b/Source/Engine/Core/Engine.cs
index deeaea4..4d876f2 100644
--- a/Source/Engine/Core/Engine.cs
+++ b/Source/Engine/Core/Engine.cs
@@ -1,391 +1,384 @@
-using ImGuiNET;
-using System.Diagnostics;
-using System.Reflection;
-using System.Numerics;
-using ValveKeyValue;
-using Veldrid;
-using Veldrid.Sdl2;
-#if HAS_PROFILING
-using WinterEngine.Diagnostics;
-#endif
-using WinterEngine.DevUI;
-using WinterEngine.InputSystem;
-using WinterEngine.Localization;
-using WinterEngine.RenderSystem;
-using WinterEngine.Resource;
-using WinterEngine.SceneSystem;
-using WinterEngine.Utilities;
-using static WinterEngine.Localization.StringTools;
-using gToolsFramework = WinterEngine.ToolsFramework.ToolsFramework;
-using System.Globalization;
-using log4net.Layout;
-using log4net.Appender;
-using Veneer;
-
-#if HAS_MACROS
-//#macro ClassLogger(name) private static readonly ILog m_Log = LogManager.GetLogger(name)
-#endif
-
-namespace WinterEngine.Core;
-
-public class Engine
-{
-#if HAS_MACROS
-    //ClassLogger("Engine");
-#else
-    private static readonly ILog m_Log = LogManager.GetLogger("Engine");
-#endif
-
-    private static int m_ReturnCode = 0;
-
-    private static Assembly m_GameAssembly;
-    private static GameModule m_GameInstance;
-    private static FrameTimeAverager m_FTA = new FrameTimeAverager(0.666);
-
-    public static bool IsRunning = false;
-    public static bool IsToolsMode = false;
-    public static string GameDir => m_GameDir;
-    private static string m_GameDir = "";
-
-    const string LogPatternBase = "[%level][%logger] %message%newline";
-
-    public static void PreInit(string[] args)
-    {
-        // configure logger
-        Debug.WriteLine("[ENGINE] Initializing logger");
-
-        #region Log Appenders
-        ConsoleExAppender consoleAppender = new ConsoleExAppender()
-        {
-            Layout = new PatternLayout($"[%date]{LogPatternBase}")
-        };
-        consoleAppender.ActivateOptions();
-
-        GameConsoleAppender gConsoleAppender = new GameConsoleAppender()
-        {
-            Layout = new PatternLayout(LogPatternBase)
-        };
-        gConsoleAppender.ActivateOptions();
-
-        FileAppender fileAppender = new FileAppender()
-        {
-            Layout = new PatternLayout($"[%date]{LogPatternBase}"),
-            Encoding = System.Text.Encoding.Unicode,
-            File = Path.Combine("logs", $"runtime_{DateTime.Now.ToString("yyyymmddHHmmss")}.log"),
-            AppendToFile = false
-        };
-        fileAppender.ActivateOptions();
-
-#if DEBUG
-        DebugAppender debugAppender = new DebugAppender()
-        {
-            Layout = new PatternLayout($"[%level] %message%newline")
-        };
-        debugAppender.ActivateOptions();
-        log4net.Config.BasicConfigurator.Configure(new IAppender[] { gConsoleAppender, consoleAppender, fileAppender, debugAppender });
-#else
-        log4net.Config.BasicConfigurator.Configure(new IAppender[] {gConsoleAppender, consoleAppender, fileAppender});
-#endif
-        #endregion
-        // confirm all logging is working
-        m_Log.Info($"WinterEngine {EngineVersion.Version.Major} patch {EngineVersion.Version.Minor} (build {EngineVersion.Build})");
-
-        // add engine resources
-        m_Log.Info("Adding engine resources");
-        // adds the engine resources and starts up certain engine systems
-        ResourceManager.AddProvider(new Resource.Providers.DirectoryProvider("engine"));
-        // todo(engine): get system lang and load the corresponding translation (or try to)
-        TranslationManager.AddTranslation("engine_english.txt");
-
-        for (int i = 0; i < args.Length; i++)
-        {
-            switch (args[i])
-            {
-                case "-game":
-                    if (i == args.Length - 1)
-                    {
-                        Error(TRS("engine.error.no_game_provided"));
-                    }
-
-                    if (args[i + 1] == "" || !Directory.Exists(args[i + 1]))
-                    {
-                        Error(TRS("engine.error.invalid_game_provided"));
-                    }
-
-                    m_GameDir = args[i + 1];
-                    i++;
-                    break;
-                case "-tools":
-                    IsToolsMode = true;
-                    m_Log.Notice("Starting in Tools Mode");
-                    break;
-            }
-        }
-    }
-
-    public static void Init()
-    {
-        m_Log.Info("Reading Gameinfo...");
-
-        var kv = KVSerializer.Create(KVSerializationFormat.KeyValues1Text);
-        KVObject gameInfoData = kv.Deserialize(File.Open(Path.Combine(m_GameDir, "gameinfo.gi"), FileMode.Open));
-
-        KVValue gameProperName = gameInfoData["name"];
-
-        foreach (KVObject dirItem in (IEnumerable<KVObject>)gameInfoData["ResourcePaths"])
-        {
-            switch (dirItem.Name)
-            {
-                case "dir":
-                    ResourceManager.AddProvider(new Resource.Providers.DirectoryProvider(dirItem.Value.ToString()));
-                    break;
-                case "vpk":
-                    ResourceManager.AddProvider(new Resource.Providers.VpkProvider(dirItem.Value.ToString()));
-                    break;
-                default:
-                    throw new ArgumentException($"Invalid resource provider type {dirItem.Name}.");
-            }
-        }
-
-        foreach (KVObject langItem in (IEnumerable<KVObject>)gameInfoData["SupportedLanguages"])
-        {
-            // bruh?
-            if (langItem.Value.ToInt32(CultureInfo.CurrentCulture) > 0)
-            {
-                TranslationManager.AddTranslation($"{m_GameDir}_{langItem.Name}.txt");
-            }
-        }
-
-        Device.Init(gameProperName.ToString());
-        Renderer.Init();
-        InputManager.Init();
-        ConfigManager.Init();
-
-        ImGui.GetIO().ConfigWindowsMoveFromTitleBarOnly = true;
-
-        // Setup game console
-        InputAction conAction = new InputAction("Console");
-        conAction.AddBinding(Key.Tilde);
-        InputManager.RegisterAction(conAction);
-        GameConsole.RegisterCommand(new ConsoleCommands.HelpCommand());
-        GameConsole.RegisterCommand(new ConsoleCommands.QuitCommand());
-        GameConsole.RegisterCommand(new ConsoleCommands.ImguiDemoCommand());
-
-        if (IsToolsMode)
-        {
-            gToolsFramework.Init();
-        }
-
-        // register config var
-        ConfigManager.RegisterCVar("r_showfps", true);
-        ConfigManager.RegisterCVar("r_limitfps", true);
-        ConfigManager.RegisterCVar("maxfps", 60.0);
-
-        // load up the game now that we're initialized
-        // search for bin dir
-        if (Directory.Exists(Path.Combine(m_GameDir, "bin")))
-        {
-            string execAssemPath = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
-            // try and load client.dll
-            if (File.Exists(Path.Combine(m_GameDir, "bin", "game.dll")))
-            {
-                m_GameAssembly = Assembly.LoadFile(Path.Combine(execAssemPath, m_GameDir, "bin", "game.dll"));
-                m_Log.Notice($"Loaded Game Dll for Game {Path.GetDirectoryName(m_GameDir)}");
-            }
-            else
-            {
-                Error(TRS("engine.error.load_game_dll_fail"));
-            }
-        }
-        else
-        {
-            Error(TRS("engine.error.no_bin_folder"));
-        }
-
-        m_GameInstance = (GameModule)m_GameAssembly.CreateInstance(
-            m_GameAssembly.GetTypes().Where(t => typeof(GameModule).IsAssignableFrom(t)).First().FullName
-        );
-        m_GameInstance.Startup();
-
-
-        // Add gui game console
-        m_Log.Info("Registering UIGameConsole panel");
-        GuiManager.AddPanel(new UIGameConsole());
-
-#if HAS_PROFILING
-        InputAction profAction = new InputAction("Profiler");
-        profAction.AddBinding(Key.F1);
-        InputManager.RegisterAction(profAction);
-
-        GuiManager.AddPanel(new ProfilerPanel());
-#endif
-        GuiManager.AddPanel(new VeneerTestPanel());
-
-        IsRunning = true;
-    }
-
-    public static int Run()
-    {
-        m_Log.Info("Starting Engine loop...");
-        var stopwatch = Stopwatch.StartNew();
-        long previousFrameTicks = 0;
-
-        while (Device.Window.Exists)
-        {
-            long currentFrameTicks = stopwatch.ElapsedTicks;
-            double deltaTime = (currentFrameTicks - previousFrameTicks) / (double)Stopwatch.Frequency;
-
-            while (ConfigManager.GetValue<bool>("r_limitfps") && deltaTime < (1.0 / ConfigManager.GetValue<double>("maxfps")))
-            {
-                currentFrameTicks = stopwatch.ElapsedTicks;
-                deltaTime = (currentFrameTicks - previousFrameTicks) / (double)Stopwatch.Frequency;
-            }
-
-            previousFrameTicks = currentFrameTicks;
-
-            InputSnapshot snapshot = Device.Window.PumpEvents();
-            if (!Device.Window.Exists)
-            { break; }
-
-            m_FTA.AddTime(deltaTime);
-
-            InputManager.ProcessInputs = (!ImGui.GetIO().WantCaptureKeyboard && !ImGui.GetIO().WantCaptureMouse);
-            InputManager.UpdateEvents(snapshot);
-
-            if (IsToolsMode)
-                gToolsFramework.Update();
-
-            Renderer.ImGuiController.Update((float)deltaTime, snapshot); // Feed the input events to our ImGui controller, which passes them through to ImGui.
-
-            if (InputManager.ActionCheckPressed("Console"))
-            { GuiManager.SetPanelVisible("game_console", true); }
-
-#if HAS_PROFILING
-            if (InputManager.ActionCheckPressed("Profiler"))
-            { GuiManager.SetPanelVisible("engine_profiler", !GuiManager.GetPanelVisible("engine_profiler")); }
-
-            Profiler.PushProfile("ImGuiUpdate");
-#endif
-
-            if (ConfigManager.GetValue<bool>("r_showfps"))
-            {
-                Vector4 color = Vector4.One;
-                if (m_FTA.CurrentAverageFramesPerSecond > 50)
-                    color = new Vector4(0.0f, 1.0f, 0.0f, 1.0f);
-                else if (m_FTA.CurrentAverageFramesPerSecond > 30)
-                    color = new Vector4(1.0f, 1.0f, 0.0f, 1.0f);
-                else
-                    color = new Vector4(1.0f, 0.0f, 0.0f, 1.0f);
-
-                ImGui.GetForegroundDrawList().AddText(
-                    new Vector2(0, ImGui.GetMainViewport().WorkSize.Y - 10),
-                    ImGui.ColorConvertFloat4ToU32(color),
-                    $"FPS: {Math.Round(m_FTA.CurrentAverageFramesPerSecond, 2)}"
-                );
-            }
-
-            GuiManager.Update();
-#if HAS_PROFILING
-            Profiler.PopProfile();
-#endif
-
-            SceneManager.Update(deltaTime);
-            Renderer.Render((float)deltaTime);
-        }
-
-        Shutdown();
-        return m_ReturnCode;
-    }
-
-    public static void Shutdown()
-    {
-        m_Log.Info("Beginning Engine Shutdown");
-        IsRunning = false;
-
-        if (IsToolsMode)
-            gToolsFramework.Shutdown();
-
-        m_GameInstance.Shutdown();
-        SceneManager.Shutdown();
-        Renderer.Shutdown();
-
-        m_Log.Info("Engine Shutdown Complete");
-    }
-
-    public static void Error(string message)
-    {
-        m_Log.Error(message);
-        unsafe
-        {
-            Sdl2Native.SDL_ShowSimpleMessageBox(
-                SDL_MessageBoxFlags.Error,
-                "Winter Engine",
-                $"Engine Error:\n{message}",
-                null
-            );
-        }
-        // Just fucking exit lol
-        Environment.Exit(1);
-    }
-
-    public static void ExecuteCommand(string input)
-    {
-        string[] inpSplit = input.Split(" ");
-
-        if (GameConsole.cmdList.ContainsKey(inpSplit[0]))
-        {
-            GameConsole.cmdList.TryGetValue(inpSplit[0], out var command);
-            string[] args = inpSplit.Skip(1).ToArray();
-            // do command
-            command.Exec(args);
-            return;
-        }
-
-        if (ConfigManager.GetCVar(inpSplit[0]) != null)
-        {
-            ConVar cVar = ConfigManager.GetCVar(inpSplit[0]).GetValueOrDefault();
-
-            if (cVar.Type == typeof(bool))
-            {
-                if (bool.TryParse(inpSplit[1], out bool newValue))
-                {
-                    cVar.Value = newValue;
-                }
-                else
-                {
-                    m_Log.Error($"Invalid value {inpSplit[1]} for type bool");
-                }
-            }
-            else if (cVar.Type == typeof(int))
-            {
-                if (int.TryParse(inpSplit[1], out int newValue))
-                {
-                    cVar.Value = newValue;
-                }
-                else
-                {
-                    m_Log.Error($"Invalid value {inpSplit[1]} for type int");
-                }
-            }
-            else if (cVar.Type == typeof(float))
-            {
-                if (float.TryParse(inpSplit[1], out float newValue))
-                {
-                    cVar.Value = newValue;
-                }
-                else
-                {
-                    m_Log.Error($"Invalid value {inpSplit[1]} for type float");
-                }
-            }
-            else if (cVar.Type == typeof(string))
-            {
-                cVar.Value = string.Join(" ", inpSplit.Skip(1));
-            }
-            else
-            {
-                m_Log.Error($"Cannot set value of type {cVar.Type.Name} from console!");
-            }
-        }
-    }
-}
+using ImGuiNET;
+using System.Diagnostics;
+using System.Reflection;
+using System.Numerics;
+using ValveKeyValue;
+using Veldrid;
+using Veldrid.Sdl2;
+#if HAS_PROFILING
+using WinterEngine.Diagnostics;
+#endif
+using WinterEngine.DevUI;
+using WinterEngine.InputSystem;
+using WinterEngine.Localization;
+using WinterEngine.RenderSystem;
+using WinterEngine.Resource;
+using WinterEngine.SceneSystem;
+using WinterEngine.Utilities;
+using static WinterEngine.Localization.StringTools;
+using gToolsFramework = WinterEngine.ToolsFramework.ToolsFramework;
+using System.Globalization;
+using log4net.Layout;
+using log4net.Appender;
+using Veneer;
+
+
+namespace WinterEngine.Core;
+
+public class Engine
+{
+    private static readonly ILog m_Log = LogManager.GetLogger("Engine");
+
+    private static int m_ReturnCode = 0;
+
+    private static Assembly m_GameAssembly;
+    private static GameModule m_GameInstance;
+    private static FrameTimeAverager m_FTA = new FrameTimeAverager(0.666);
+
+    public static bool IsRunning = false;
+    public static bool IsToolsMode = false;
+    public static string GameDir => m_GameDir;
+    private static string m_GameDir = "";
+
+    const string LogPatternBase = "[%level][%logger] %message%newline";
+
+    public static void PreInit(string[] args)
+    {
+        // configure logger
+        Debug.WriteLine("[ENGINE] Initializing logger");
+
+        #region Log Appenders
+        ConsoleExAppender consoleAppender = new ConsoleExAppender()
+        {
+            Layout = new PatternLayout($"[%date]{LogPatternBase}")
+        };
+        consoleAppender.ActivateOptions();
+
+        GameConsoleAppender gConsoleAppender = new GameConsoleAppender()
+        {
+            Layout = new PatternLayout(LogPatternBase)
+        };
+        gConsoleAppender.ActivateOptions();
+
+        FileAppender fileAppender = new FileAppender()
+        {
+            Layout = new PatternLayout($"[%date]{LogPatternBase}"),
+            Encoding = System.Text.Encoding.Unicode,
+            File = Path.Combine("logs", $"runtime_{DateTime.Now.ToString("yyyymmddHHmmss")}.log"),
+            AppendToFile = false
+        };
+        fileAppender.ActivateOptions();
+
+#if DEBUG
+        DebugAppender debugAppender = new DebugAppender()
+        {
+            Layout = new PatternLayout($"[%level] %message%newline")
+        };
+        debugAppender.ActivateOptions();
+        log4net.Config.BasicConfigurator.Configure(new IAppender[] { gConsoleAppender, consoleAppender, fileAppender, debugAppender });
+#else
+        log4net.Config.BasicConfigurator.Configure(new IAppender[] {gConsoleAppender, consoleAppender, fileAppender});
+#endif
+        #endregion
+        // confirm all logging is working
+        m_Log.Info($"WinterEngine {EngineVersion.Version.Major} patch {EngineVersion.Version.Minor} (build {EngineVersion.Build})");
+
+        // add engine resources
+        m_Log.Info("Adding engine resources");
+        // adds the engine resources and starts up certain engine systems
+        ResourceManager.AddProvider(new Resource.Providers.DirectoryProvider("engine"));
+        // todo(engine): get system lang and load the corresponding translation (or try to)
+        TranslationManager.AddTranslation("engine_english.txt");
+
+        for (int i = 0; i < args.Length; i++)
+        {
+            switch (args[i])
+            {
+                case "-game":
+                    if (i == args.Length - 1)
+                    {
+                        Error(TRS("engine.error.no_game_provided"));
+                    }
+
+                    if (args[i + 1] == "" || !Directory.Exists(args[i + 1]))
+                    {
+                        Error(TRS("engine.error.invalid_game_provided"));
+                    }
+
+                    m_GameDir = args[i + 1];
+                    i++;
+                    break;
+                case "-tools":
+                    IsToolsMode = true;
+                    m_Log.Notice("Starting in Tools Mode");
+                    break;
+            }
+        }
+    }
+
+    public static void Init()
+    {
+        m_Log.Info("Reading Gameinfo...");
+
+        var kv = KVSerializer.Create(KVSerializationFormat.KeyValues1Text);
+        KVObject gameInfoData = kv.Deserialize(File.Open(Path.Combine(m_GameDir, "gameinfo.gi"), FileMode.Open));
+
+        KVValue gameProperName = gameInfoData["name"];
+
+        foreach (KVObject dirItem in (IEnumerable<KVObject>)gameInfoData["ResourcePaths"])
+        {
+            switch (dirItem.Name)
+            {
+                case "dir":
+                    ResourceManager.AddProvider(new Resource.Providers.DirectoryProvider(dirItem.Value.ToString()));
+                    break;
+                case "vpk":
+                    ResourceManager.AddProvider(new Resource.Providers.VpkProvider(dirItem.Value.ToString()));
+                    break;
+                default:
+                    throw new ArgumentException($"Invalid resource provider type {dirItem.Name}.");
+            }
+        }
+
+        foreach (KVObject langItem in (IEnumerable<KVObject>)gameInfoData["SupportedLanguages"])
+        {
+            // bruh?
+            if (langItem.Value.ToInt32(CultureInfo.CurrentCulture) > 0)
+            {
+                TranslationManager.AddTranslation($"{m_GameDir}_{langItem.Name}.txt");
+            }
+        }
+
+        Device.Init(gameProperName.ToString());
+        Renderer.Init();
+        InputManager.Init();
+        ConfigManager.Init();
+
+        ImGui.GetIO().ConfigWindowsMoveFromTitleBarOnly = true;
+
+        // Setup game console
+        InputAction conAction = new InputAction("Console");
+        conAction.AddBinding(Key.Tilde);
+        InputManager.RegisterAction(conAction);
+        GameConsole.RegisterCommand(new ConsoleCommands.HelpCommand());
+        GameConsole.RegisterCommand(new ConsoleCommands.QuitCommand());
+        GameConsole.RegisterCommand(new ConsoleCommands.ImguiDemoCommand());
+
+        if (IsToolsMode)
+        {
+            gToolsFramework.Init();
+        }
+
+        // register config var
+        ConfigManager.RegisterCVar("r_showfps", true);
+        ConfigManager.RegisterCVar("r_limitfps", true);
+        ConfigManager.RegisterCVar("maxfps", 60.0);
+
+        // load up the game now that we're initialized
+        // search for bin dir
+        if (Directory.Exists(Path.Combine(m_GameDir, "bin")))
+        {
+            string execAssemPath = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
+            // try and load client.dll
+            if (File.Exists(Path.Combine(m_GameDir, "bin", "game.dll")))
+            {
+                m_GameAssembly = Assembly.LoadFile(Path.Combine(execAssemPath, m_GameDir, "bin", "game.dll"));
+                m_Log.Notice($"Loaded Game Dll for Game {Path.GetDirectoryName(m_GameDir)}");
+            }
+            else
+            {
+                Error(TRS("engine.error.load_game_dll_fail"));
+            }
+        }
+        else
+        {
+            Error(TRS("engine.error.no_bin_folder"));
+        }
+
+        m_GameInstance = (GameModule)m_GameAssembly.CreateInstance(
+            m_GameAssembly.GetTypes().Where(t => typeof(GameModule).IsAssignableFrom(t)).First().FullName
+        );
+        m_GameInstance.Startup();
+
+
+        // Add gui game console
+        m_Log.Info("Registering UIGameConsole panel");
+        GuiManager.AddPanel(new UIGameConsole());
+
+#if HAS_PROFILING
+        InputAction profAction = new InputAction("Profiler");
+        profAction.AddBinding(Key.F1);
+        InputManager.RegisterAction(profAction);
+
+        GuiManager.AddPanel(new ProfilerPanel());
+#endif
+        GuiManager.AddPanel(new VeneerTestPanel());
+
+        IsRunning = true;
+    }
+
+    public static int Run()
+    {
+        m_Log.Info("Starting Engine loop...");
+        var stopwatch = Stopwatch.StartNew();
+        long previousFrameTicks = 0;
+
+        while (Device.Window.Exists)
+        {
+            long currentFrameTicks = stopwatch.ElapsedTicks;
+            double deltaTime = (currentFrameTicks - previousFrameTicks) / (double)Stopwatch.Frequency;
+
+            while (ConfigManager.GetValue<bool>("r_limitfps") && deltaTime < (1.0 / ConfigManager.GetValue<double>("maxfps")))
+            {
+                currentFrameTicks = stopwatch.ElapsedTicks;
+                deltaTime = (currentFrameTicks - previousFrameTicks) / (double)Stopwatch.Frequency;
+            }
+
+            previousFrameTicks = currentFrameTicks;
+
+            InputSnapshot snapshot = Device.Window.PumpEvents();
+            if (!Device.Window.Exists)
+            { break; }
+
+            m_FTA.AddTime(deltaTime);
+
+            InputManager.ProcessInputs = (!ImGui.GetIO().WantCaptureKeyboard && !ImGui.GetIO().WantCaptureMouse);
+            InputManager.UpdateEvents(snapshot);
+
+            if (IsToolsMode)
+                gToolsFramework.Update();
+
+            Renderer.ImGuiController.Update((float)deltaTime, snapshot); // Feed the input events to our ImGui controller, which passes them through to ImGui.
+
+            if (InputManager.ActionCheckPressed("Console"))
+            { GuiManager.SetPanelVisible("game_console", true); }
+
+#if HAS_PROFILING
+            if (InputManager.ActionCheckPressed("Profiler"))
+            { GuiManager.SetPanelVisible("engine_profiler", !GuiManager.GetPanelVisible("engine_profiler")); }
+
+            Profiler.PushProfile("ImGuiUpdate");
+#endif
+
+            if (ConfigManager.GetValue<bool>("r_showfps"))
+            {
+                Vector4 color = Vector4.One;
+                if (m_FTA.CurrentAverageFramesPerSecond > 50)
+                    color = new Vector4(0.0f, 1.0f, 0.0f, 1.0f);
+                else if (m_FTA.CurrentAverageFramesPerSecond > 30)
+                    color = new Vector4(1.0f, 1.0f, 0.0f, 1.0f);
+                else
+                    color = new Vector4(1.0f, 0.0f, 0.0f, 1.0f);
+
+                ImGui.GetForegroundDrawList().AddText(
+                    new Vector2(0, ImGui.GetMainViewport().WorkSize.Y - 10),
+                    ImGui.ColorConvertFloat4ToU32(color),
+                    $"FPS: {Math.Round(m_FTA.CurrentAverageFramesPerSecond, 2)}"
+                );
+            }
+
+            GuiManager.Update();
+#if HAS_PROFILING
+            Profiler.PopProfile();
+#endif
+
+            SceneManager.Update(deltaTime);
+            Renderer.Render((float)deltaTime);
+        }
+
+        Shutdown();
+        return m_ReturnCode;
+    }
+
+    public static void Shutdown()
+    {
+        m_Log.Info("Beginning Engine Shutdown");
+        IsRunning = false;
+
+        if (IsToolsMode)
+            gToolsFramework.Shutdown();
+
+        m_GameInstance.Shutdown();
+        SceneManager.Shutdown();
+        Renderer.Shutdown();
+
+        m_Log.Info("Engine Shutdown Complete");
+    }
+
+    public static void Error(string message)
+    {
+        m_Log.Error(message);
+        unsafe
+        {
+            Sdl2Native.SDL_ShowSimpleMessageBox(
+                SDL_MessageBoxFlags.Error,
+                "Winter Engine",
+                $"Engine Error:\n{message}",
+                null
+            );
+        }
+        // Just fucking exit lol
+        Environment.Exit(1);
+    }
+
+    public static void ExecuteCommand(string input)
+    {
+        string[] inpSplit = input.Split(" ");
+
+        if (GameConsole.cmdList.ContainsKey(inpSplit[0]))
+        {
+            GameConsole.cmdList.TryGetValue(inpSplit[0], out var command);
+            string[] args = inpSplit.Skip(1).ToArray();
+            // do command
+            command.Exec(args);
+            return;
+        }
+
+        if (ConfigManager.GetCVar(inpSplit[0]) != null)
+        {
+            ConVar cVar = ConfigManager.GetCVar(inpSplit[0]).GetValueOrDefault();
+
+            if (cVar.Type == typeof(bool))
+            {
+                if (bool.TryParse(inpSplit[1], out bool newValue))
+                {
+                    cVar.Value = newValue;
+                }
+                else
+                {
+                    m_Log.Error($"Invalid value {inpSplit[1]} for type bool");
+                }
+            }
+            else if (cVar.Type == typeof(int))
+            {
+                if (int.TryParse(inpSplit[1], out int newValue))
+                {
+                    cVar.Value = newValue;
+                }
+                else
+                {
+                    m_Log.Error($"Invalid value {inpSplit[1]} for type int");
+                }
+            }
+            else if (cVar.Type == typeof(float))
+            {
+                if (float.TryParse(inpSplit[1], out float newValue))
+                {
+                    cVar.Value = newValue;
+                }
+                else
+                {
+                    m_Log.Error($"Invalid value {inpSplit[1]} for type float");
+                }
+            }
+            else if (cVar.Type == typeof(string))
+            {
+                cVar.Value = string.Join(" ", inpSplit.Skip(1));
+            }
+            else
+            {
+                m_Log.Error($"Cannot set value of type {cVar.Type.Name} from console!");
+            }
+        }
+    }
+}
diff --git a/Source/Engine/Core/GameConsole.cs b/Source/Engine/Core/GameConsole.cs
index 747aef9..50e511d 100644
--- a/Source/Engine/Core/GameConsole.cs
+++ b/Source/Engine/Core/GameConsole.cs
@@ -1,136 +1,108 @@
-using log4net.Appender;
-using log4net.Core;
-using System.Reflection;
-using Veneer;
-using WinterEngine.Core;
-using WinterEngine.RenderSystem;
-using WinterEngine.Utilities;
-
-namespace WinterEngine.Core
-{
-    public class GameConsoleAppender : AppenderSkeleton
-    {
-        protected override void Append(LoggingEvent loggingEvent)
-        {
-            GameConsole.LogMessage(RenderLoggingEvent(loggingEvent), loggingEvent.Level);
-        }
-    }
-
-    public static class GameConsole
-    {
-        public struct LogInfo
-        {
-            public string Text { get; private set; }
-            public Level Type { get; private set; }
-
-            public LogInfo(string msg, Level type)
-            {
-                Type = type;
-                Text = msg;
-            }
-        }
-
-        public static void RegisterCommand(ConCmd command)
-        {
-            cmdList.TryAdd(command.Command, command);
-        }
-
-        public static void LogMessage(string message, Level level)
-        {
-            LogInfo info = new LogInfo(message, level);
-            logMessages.Add(info);
-            OnLogMessage?.Invoke(null, info);
-        }
-        public static event EventHandler<LogInfo> OnLogMessage;
-
-        private static List<LogInfo> logMessages = new List<LogInfo>();
-        public static Dictionary<string, ConCmd> cmdList = new Dictionary<string, ConCmd>();
-        public static bool ShowConsole = true;
-    }
-}
-
-// baseline commands
-namespace WinterEngine.ConsoleCommands
-{
-    // temporary until macros are finished
-#if HAS_MACROS
-    ConsoleCommand(help, "usage: <command>\nLists information on a command.", {
-        if (args.Length == 0)
-        {
-            LogManager.GetLogger("Command").Notice("Available Commands:");
-            List<string> cmdList = new List<string>();
-            foreach (ConCmd command in GameConsole.cmdList.Values)
-            {
-                cmdList.Add(command.Command);
-            }
-            LogManager.GetLogger("Command").Notice(string.Join(", ", cmdList));
-        }
-        else
-        {
-            if (GameConsole.cmdList.ContainsKey(args[0]))
-            {
-                GameConsole.cmdList.TryGetValue(args[0], out var command);
-                LogManager.GetLogger("Command").Notice($"{args[0]}: {command.Description}");
-            }
-        }
-    })
-
-    ConsoleCommand(quit, "Quit to Desktop", {
-        Device.Window.Close();
-    })
-#else
-    internal sealed class HelpCommand : ConCmd
-    {
-        public override string Command => "help";
-        public override string Description => "";
-        public override CmdFlags Flags => CmdFlags.None;
-
-
-        public override void Exec(string[] args)
-        {
-            if (args.Length == 0)
-            {
-                LogManager.GetLogger("Command").Notice("Available Commands:");
-                List<string> cmdList = new List<string>();
-                foreach (ConCmd command in GameConsole.cmdList.Values)
-                {
-                    cmdList.Add(command.Command);
-                }
-                LogManager.GetLogger("Command").Notice(string.Join(", ", cmdList));
-            }
-            else
-            {
-                if (GameConsole.cmdList.ContainsKey(args[0]))
-                {
-                    GameConsole.cmdList.TryGetValue(args[0], out var command);
-                    LogManager.GetLogger("Command").Notice($"{args[0]}: {command.Description}");
-                }
-            }
-        }
-    }
-
-    internal sealed class QuitCommand : ConCmd
-    {
-        public override string Command => "quit";
-        public override string Description => "Quit to desktop";
-        public override CmdFlags Flags => CmdFlags.None;
-
-        public override void Exec(string[] args)
-        {
-            Device.Window.Close();
-        }
-    }
-
-    internal sealed class ImguiDemoCommand : ConCmd
-    {
-        public override string Command => "show_imgui_demo";
-        public override string Description => "Show the ImGui Demo Window";
-        public override CmdFlags Flags => CmdFlags.None;
-
-        public override void Exec(string[] args)
-        {
-            GuiManager.ShowImguiDemo = true;
-        }
-    }
-#endif
-}
+using log4net.Appender;
+using log4net.Core;
+using System.Reflection;
+using Veneer;
+using WinterEngine.Core;
+using WinterEngine.RenderSystem;
+using WinterEngine.Utilities;
+
+namespace WinterEngine.Core
+{
+    public class GameConsoleAppender : AppenderSkeleton
+    {
+        protected override void Append(LoggingEvent loggingEvent)
+        {
+            GameConsole.LogMessage(RenderLoggingEvent(loggingEvent), loggingEvent.Level);
+        }
+    }
+
+    public static class GameConsole
+    {
+        public struct LogInfo
+        {
+            public string Text { get; private set; }
+            public Level Type { get; private set; }
+
+            public LogInfo(string msg, Level type)
+            {
+                Type = type;
+                Text = msg;
+            }
+        }
+
+        public static void RegisterCommand(ConCmd command)
+        {
+            cmdList.TryAdd(command.Command, command);
+        }
+
+        public static void LogMessage(string message, Level level)
+        {
+            LogInfo info = new LogInfo(message, level);
+            logMessages.Add(info);
+            OnLogMessage?.Invoke(null, info);
+        }
+        public static event EventHandler<LogInfo> OnLogMessage;
+
+        private static List<LogInfo> logMessages = new List<LogInfo>();
+        public static Dictionary<string, ConCmd> cmdList = new Dictionary<string, ConCmd>();
+        public static bool ShowConsole = true;
+    }
+}
+
+// baseline commands
+namespace WinterEngine.ConsoleCommands
+{
+    internal sealed class HelpCommand : ConCmd
+    {
+        public override string Command => "help";
+        public override string Description => "";
+        public override CmdFlags Flags => CmdFlags.None;
+
+
+        public override void Exec(string[] args)
+        {
+            if (args.Length == 0)
+            {
+                LogManager.GetLogger("Command").Notice("Available Commands:");
+                List<string> cmdList = new List<string>();
+                foreach (ConCmd command in GameConsole.cmdList.Values)
+                {
+                    cmdList.Add(command.Command);
+                }
+                LogManager.GetLogger("Command").Notice(string.Join(", ", cmdList));
+            }
+            else
+            {
+                if (GameConsole.cmdList.ContainsKey(args[0]))
+                {
+                    GameConsole.cmdList.TryGetValue(args[0], out var command);
+                    LogManager.GetLogger("Command").Notice($"{args[0]}: {command.Description}");
+                }
+            }
+        }
+    }
+
+    internal sealed class QuitCommand : ConCmd
+    {
+        public override string Command => "quit";
+        public override string Description => "Quit to desktop";
+        public override CmdFlags Flags => CmdFlags.None;
+
+        public override void Exec(string[] args)
+        {
+            Device.Window.Close();
+        }
+    }
+
+    internal sealed class ImguiDemoCommand : ConCmd
+    {
+        public override string Command => "show_imgui_demo";
+        public override string Description => "Show the ImGui Demo Window";
+        public override CmdFlags Flags => CmdFlags.None;
+
+        public override void Exec(string[] args)
+        {
+            GuiManager.ShowImguiDemo = true;
+        }
+    }
+}
diff --git a/Source/Engine/WinterEngine.csproj b/Source/Engine/WinterEngine.csproj
index a5e83a8..2db1905 100644
--- a/Source/Engine/WinterEngine.csproj
+++ b/Source/Engine/WinterEngine.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <OutputType>Library</OutputType>
     <RootNamespace>WinterEngine</RootNamespace>
-    <AssemblyVersion>17.0</AssemblyVersion>
+    <AssemblyVersion>20.0</AssemblyVersion>
   </PropertyGroup>
 
   <Import Project="../WEBase.props" />
diff --git a/Source/build_tools/macros.ps1 b/Source/build_tools/macros.ps1
deleted file mode 100644
index 98392ff..0000000
--- a/Source/build_tools/macros.ps1
+++ /dev/null
@@ -1,52 +0,0 @@
-<#
-    C# Macros
-
-    (C) 2023-2024 K. "ashi/eden" J.
-#>
-using namespace System.Collections.Generic;
-using namespace System.Text.RegularExpressions;
-
-class MacroData
-{
-    [string]$Name;
-    [string]$Contents;
-    [List[string]]$Parameters;
-
-    MacroData($name, $contents, $params)
-    {
-        $this.Name = $name;
-        $this.Contents = $contents;
-        $this.Parameters = $params;
-    }
-}
-
-$macros = New-Object List[MacroData];
-
-function ReadFile([string]$path)
-{
-    $wd = Get-Location;
-    [string]$fileContents = [System.IO.File]::ReadAllLines([System.IO.Path]::Combine($wd, $path));
-    [Console]::WriteLine($fileContents);
-
-    # foreach ($line in $fileContents)
-    # {
-    #     if ($line.StartsWith('#macro'))
-    #     {
-    #         $macroDef = [Regex]::Replace($line, "#macro\s+", "");
-
-    #         [string]$macroName;
-    #         [string]$macroContents;
-    #         [List[string]]$macroParameters;
-
-    #         # Loop through contents
-    #         for ($i = 0; $i -lt $macroDef.Length; $i++) {
-    #             $c = $macroDef[$i];
-
-    #             # check the value of the character
-
-    #         }
-    #     }
-    # }
-}
-
-ReadFile "Engine.cs";