diff --git a/CMakeLists.txt b/CMakeLists.txt
index 37b9e8cb..514a941f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,6 +27,8 @@ set(SURREALCOMMON_SOURCES
 	SurrealEngine/EditorApp.h
 	SurrealEngine/DebuggerApp.cpp
 	SurrealEngine/DebuggerApp.h
+	SurrealEngine/Logger.cpp
+	SurrealEngine/Logger.h
 	SurrealEngine/Engine.cpp
 	SurrealEngine/Engine.h
 	SurrealEngine/Exception.cpp
diff --git a/SurrealEngine/Audio/AudioDevice.cpp b/SurrealEngine/Audio/AudioDevice.cpp
index ec916ee5..ea90f315 100644
--- a/SurrealEngine/Audio/AudioDevice.cpp
+++ b/SurrealEngine/Audio/AudioDevice.cpp
@@ -320,7 +320,7 @@ class OpenALAudioDevice : public AudioDevice
 		ALSoundSource& source = sources[channel];
 		if (source.IsPlaying())
 		{
-			engine->LogMessage("Attempted to play sound on active channel " + channel);
+			LogMessage("Attempted to play sound on active channel " + channel);
 			return 0;
 		}
 
diff --git a/SurrealEngine/DebuggerApp.cpp b/SurrealEngine/DebuggerApp.cpp
index 5fab87be..b58395d2 100644
--- a/SurrealEngine/DebuggerApp.cpp
+++ b/SurrealEngine/DebuggerApp.cpp
@@ -35,6 +35,8 @@ int DebuggerApp::Main(std::vector<std::string> args)
 	InitWidgetResources();
 	WidgetTheme::SetTheme(std::make_unique<DarkWidgetTheme>());
 
+	Logger::Get()->SetCallback([&](const LogMessageLine& line) { PrintLog(line); });
+
 	WriteOutput(ColorEscape(96) + "Welcome to the Surreal Engine debugger!" + ResetEscape() + NewLine());
 	WriteOutput(NewLine());
 	WriteOutput("Type " + ColorEscape(92) + "help" + ResetEscape() + " for a list of commands" + NewLine());
@@ -52,7 +54,6 @@ int DebuggerApp::Main(std::vector<std::string> args)
 
 		Engine engine(launchinfo);
 		engine.tickDebugger = [&]() { Tick(); };
-		engine.printLogDebugger = [&](const LogMessageLine& line) { PrintLog(line); };
 
 		WritePrompt();
 		while (!ExitRequested)
diff --git a/SurrealEngine/EditorApp.cpp b/SurrealEngine/EditorApp.cpp
index 0a212544..39469495 100644
--- a/SurrealEngine/EditorApp.cpp
+++ b/SurrealEngine/EditorApp.cpp
@@ -17,28 +17,26 @@ int EditorApp::main(std::vector<std::string> args)
 	InitWidgetResources();
 	WidgetTheme::SetTheme(std::make_unique<LightWidgetTheme>());
 
-	CommandLine cmd(args);
-	commandline = &cmd;
-
-	GameLaunchInfo info = GameFolderSelection::GetLaunchInfo();
-	if (!info.gameRootFolder.empty())
+	try
 	{
-		auto engine = std::make_unique<Engine>(info);
+		CommandLine cmd(args);
+		commandline = &cmd;
 
-		try
+		GameLaunchInfo info = GameFolderSelection::GetLaunchInfo();
+		if (!info.gameRootFolder.empty())
 		{
+			Engine engine(info);
+
 			auto editorWindow = std::make_unique<EditorMainWindow>();
 			editorWindow->SetFrameGeometry(Rect::xywh(0.0, 0.0, 1024.0, 768.0));
 			editorWindow->Show();
 
 			DisplayWindow::RunLoop();
 		}
-		catch (const std::exception& e)
-		{
-			auto log = std::move(engine->Log);
-			engine.reset();
-			ErrorWindow::ExecModal(e.what(), log);
-		}
+	}
+	catch (const std::exception& e)
+	{
+		ErrorWindow::ExecModal(e.what(), Logger::Get()->GetLog());
 	}
 
 	DeinitWidgetResources();
diff --git a/SurrealEngine/Engine.cpp b/SurrealEngine/Engine.cpp
index 98c7d145..cc212768 100644
--- a/SurrealEngine/Engine.cpp
+++ b/SurrealEngine/Engine.cpp
@@ -100,6 +100,7 @@ void Engine::Run()
 		if (EntryLevel)
 			EntryLevelInfo->TimeSeconds() += entryLevelElapsed;
 		LevelInfo->TimeSeconds() += levelElapsed;
+		Logger::Get()->SetTimeSeconds(LevelInfo->TimeSeconds());
 
 		UpdateInput(realTimeElapsed);
 
@@ -1236,43 +1237,6 @@ void Engine::SetPause(bool value)
 {
 }
 
-void Engine::LogMessage(const std::string& message)
-{
-	if (!Frame::Callstack.empty() && Frame::Callstack.back()->Func)
-	{
-		UStruct* func = Frame::Callstack.back()->Func;
-		std::string name;
-		for (UStruct* s = func; s != nullptr; s = s->StructParent)
-		{
-			if (name.empty())
-				name = s->Name.ToString();
-			else
-				name = s->Name.ToString() + "." + name;
-		}
-
-		LogMessageLine line;
-		line.Time = LevelInfo ? LevelInfo->TimeSeconds() : 0.0f;
-		line.Source = name;
-		line.Text = message;
-		Log.push_back(std::move(line));
-	}
-	else
-	{
-		LogMessageLine line;
-		line.Time = LevelInfo ? LevelInfo->TimeSeconds() : 0.0f;
-		line.Text = message;
-		Log.push_back(std::move(line));
-	}
-
-	if (printLogDebugger)
-		printLogDebugger(Log.back());
-}
-
-void Engine::LogUnimplemented(const std::string& message)
-{
-	LogMessage("Unimplemented: " + message);
-}
-
 const char* Engine::keynames[256] =
 {
 	/*00*/ "None", "LeftMouse", "RightMouse", "Cancel",
diff --git a/SurrealEngine/Engine.h b/SurrealEngine/Engine.h
index edaa6481..4aa6cc4a 100644
--- a/SurrealEngine/Engine.h
+++ b/SurrealEngine/Engine.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include "Logger.h"
 #include "Math/vec.h"
 #include "Math/mat.h"
 #include "Math/floating.h"
@@ -52,13 +53,6 @@ struct FSceneNode;
 struct FSurfaceFacet;
 struct MeshFace;
 
-struct LogMessageLine
-{
-	float Time;
-	std::string Source;
-	std::string Text;
-};
-
 class Engine : public GameWindowHost
 {
 public:
@@ -141,11 +135,6 @@ class Engine : public GameWindowHost
 		bool TransferItems = false;
 	} ClientTravelInfo;
 
-	void LogMessage(const std::string& message);
-	void LogUnimplemented(const std::string& message);
-
-	std::list<LogMessageLine> Log;
-
 	GameLaunchInfo LaunchInfo;
 	std::unique_ptr<PackageManager> packages;
 	std::unique_ptr<GameWindow> window; // TODO: Move into UViewport
@@ -194,7 +183,6 @@ class Engine : public GameWindowHost
 	std::map<std::string, ActiveInputAxis> activeInputAxes;
 
 	std::function<void()> tickDebugger;
-	std::function<void(const LogMessageLine& line)> printLogDebugger;
 };
 
 extern Engine* engine;
diff --git a/SurrealEngine/GameApp.cpp b/SurrealEngine/GameApp.cpp
index 1340ad27..73851bcf 100644
--- a/SurrealEngine/GameApp.cpp
+++ b/SurrealEngine/GameApp.cpp
@@ -1,6 +1,7 @@
 
 #include "Precomp.h"
 #include "Exception.h"
+#include "Logger.h"
 #include "GameApp.h"
 #include "CommandLine.h"
 #include "GameFolder.h"
@@ -19,24 +20,22 @@ int GameApp::main(std::vector<std::string> args)
 	InitWidgetResources();
 	WidgetTheme::SetTheme(std::make_unique<DarkWidgetTheme>());
 
-	CommandLine cmd(args);
-	commandline = &cmd;
-
-	GameLaunchInfo info = GameFolderSelection::GetLaunchInfo();
-	if (!info.gameRootFolder.empty())
+	try
 	{
-		auto engine = std::make_unique<Engine>(info);
-		try
-		{
-			engine->Run();
-		}
-		catch (const std::exception& e)
+		CommandLine cmd(args);
+		commandline = &cmd;
+
+		GameLaunchInfo info = GameFolderSelection::GetLaunchInfo();
+		if (!info.gameRootFolder.empty())
 		{
-			auto log = std::move(engine->Log);
-			engine.reset();
-			ErrorWindow::ExecModal(e.what(), log);
+			Engine engine(info);
+			engine.Run();
 		}
 	}
+	catch (const std::exception& e)
+	{
+		ErrorWindow::ExecModal(e.what(), Logger::Get()->GetLog());
+	}
 
 	DeinitWidgetResources();
 	return 0;
diff --git a/SurrealEngine/Logger.cpp b/SurrealEngine/Logger.cpp
new file mode 100644
index 00000000..42d1d15c
--- /dev/null
+++ b/SurrealEngine/Logger.cpp
@@ -0,0 +1,57 @@
+
+#include "Precomp.h"
+#include "Logger.h"
+#include "VM/Frame.h"
+
+void LogMessage(const std::string& message)
+{
+	Logger::Get()->LogMessage(message);
+}
+
+void LogUnimplemented(const std::string& message)
+{
+	Logger::Get()->LogUnimplemented(message);
+}
+
+void Logger::LogMessage(const std::string& message)
+{
+	if (!Frame::Callstack.empty() && Frame::Callstack.back()->Func)
+	{
+		UStruct* func = Frame::Callstack.back()->Func;
+		std::string name;
+		for (UStruct* s = func; s != nullptr; s = s->StructParent)
+		{
+			if (name.empty())
+				name = s->Name.ToString();
+			else
+				name = s->Name.ToString() + "." + name;
+		}
+
+		LogMessageLine line;
+		line.Time = time;
+		line.Source = name;
+		line.Text = message;
+		Log.push_back(std::move(line));
+	}
+	else
+	{
+		LogMessageLine line;
+		line.Time = time;
+		line.Text = message;
+		Log.push_back(std::move(line));
+	}
+
+	if (printLogDebugger)
+		printLogDebugger(Log.back());
+}
+
+void Logger::LogUnimplemented(const std::string& message)
+{
+	LogMessage("Unimplemented: " + message);
+}
+
+Logger* Logger::Get()
+{
+	static Logger logger;
+	return &logger;
+}
diff --git a/SurrealEngine/Logger.h b/SurrealEngine/Logger.h
new file mode 100644
index 00000000..2bd0658b
--- /dev/null
+++ b/SurrealEngine/Logger.h
@@ -0,0 +1,36 @@
+#pragma once
+
+#include <string>
+#include <list>
+#include <functional>
+
+void LogMessage(const std::string& message);
+void LogUnimplemented(const std::string& message);
+
+struct LogMessageLine
+{
+	float Time;
+	std::string Source;
+	std::string Text;
+};
+
+class Logger
+{
+public:
+	static Logger* Get();
+
+	void LogMessage(const std::string& message);
+	void LogUnimplemented(const std::string& message);
+	void SetTimeSeconds(float value) { time = value; }
+	void SetCallback(std::function<void(const LogMessageLine& line)> cb) { printLogDebugger = std::move(cb); }
+	const std::list<LogMessageLine>& GetLog() const { return Log; }
+
+private:
+	float time = 0.0f;
+	std::list<LogMessageLine> Log;
+	std::function<void(const LogMessageLine& line)> printLogDebugger;
+
+	Logger() = default;
+	Logger(const Logger&) = delete;
+	Logger& operator=(const Logger&) = delete;
+};
diff --git a/SurrealEngine/Native/NActor.cpp b/SurrealEngine/Native/NActor.cpp
index d40c4fe8..9ef392f3 100644
--- a/SurrealEngine/Native/NActor.cpp
+++ b/SurrealEngine/Native/NActor.cpp
@@ -138,7 +138,7 @@ void NActor::Destroy(UObject* Self, BitfieldBool& ReturnValue)
 
 void NActor::Error(UObject* Self, const std::string& S)
 {
-	engine->LogMessage("Error: " + S);
+	LogMessage("Error: " + S);
 	UObject::Cast<UActor>(Self)->Destroy();
 }
 
@@ -516,55 +516,55 @@ void NActor::VisibleCollidingActors(UObject* Self, UObject* BaseClass, UObject*&
 
 void NActor::GetPlayerPawn(UObject* Self, UObject*& ReturnValue)
 {
-	engine->LogUnimplemented("Actor.GetPlayerPawn");
+	LogUnimplemented("Actor.GetPlayerPawn");
 	ReturnValue = nullptr;
 }
 
 void NActor::AIClearEvent(UObject* Self, const NameString& eventName)
 {
-	engine->LogUnimplemented("Actor.AIClearEvent");
+	LogUnimplemented("Actor.AIClearEvent");
 }
 
 void NActor::AIClearEventCallback(UObject* Self, const NameString& eventName)
 {
-	engine->LogUnimplemented("Actor.AIClearEventCallback");
+	LogUnimplemented("Actor.AIClearEventCallback");
 }
 
 void NActor::AIEndEvent(UObject* Self, const NameString& eventName, uint8_t eventType)
 {
-	engine->LogUnimplemented("Actor.AIEndEvent");
+	LogUnimplemented("Actor.AIEndEvent");
 }
 
 void NActor::AIGetLightLevel(UObject* Self, const vec3& Location, float& ReturnValue)
 {
-	engine->LogUnimplemented("Actor.AIGetLightLevel");
+	LogUnimplemented("Actor.AIGetLightLevel");
 	ReturnValue = 1.0f;
 }
 
 void NActor::AISendEvent(UObject* Self, const NameString& eventName, uint8_t eventType, float* Value, float* Radius)
 {
-	engine->LogUnimplemented("Actor.AISendEvent");
+	LogUnimplemented("Actor.AISendEvent");
 }
 
 void NActor::AISetEventCallback(UObject* Self, const NameString& eventName, const NameString& callback, NameString* scoreCallback, BitfieldBool* bCheckVisibility, BitfieldBool* bCheckDir, BitfieldBool* bCheckCylinder, BitfieldBool* bCheckLOS)
 {
-	engine->LogUnimplemented("Actor.AISetEventCallback");
+	LogUnimplemented("Actor.AISetEventCallback");
 }
 
 void NActor::AIStartEvent(UObject* Self, const NameString& eventName, uint8_t eventType, float* Value, float* Radius)
 {
-	engine->LogUnimplemented("Actor.AIStartEvent");
+	LogUnimplemented("Actor.AIStartEvent");
 }
 
 void NActor::AIVisibility(UObject* Self, BitfieldBool* bIncludeVelocity, float& ReturnValue)
 {
-	engine->LogUnimplemented("Actor.AIVisibility");
+	LogUnimplemented("Actor.AIVisibility");
 	ReturnValue = 0.0f;
 }
 
 void NActor::TraceTexture(UObject* Self, UObject* BaseClass, UObject*& Actor, NameString& texName, NameString& texGroup, int& flags, vec3& HitLoc, vec3& HitNorm, const vec3& End, vec3* Start, vec3* Extent)
 {
-	engine->LogUnimplemented("Actor.TraceTexture");
+	LogUnimplemented("Actor.TraceTexture");
 	// Deus Ex
 	// Note: this is not correct, but it will give unrealscript an iterator
 	UActor* SelfActor = UObject::Cast<UActor>(Self);
@@ -576,7 +576,7 @@ void NActor::TraceTexture(UObject* Self, UObject* BaseClass, UObject*& Actor, Na
 
 void NActor::TraceVisibleActors(UObject* Self, UObject* BaseClass, UObject*& Actor, vec3& HitLoc, vec3& HitNorm, const vec3& End, vec3* Start, vec3* Extent)
 {
-	engine->LogUnimplemented("Actor.TraceVisibleActors");
+	LogUnimplemented("Actor.TraceVisibleActors");
 	// Deus Ex
 	// Note: this is not correct, but it will give unrealscript an iterator
 	UActor* SelfActor = UObject::Cast<UActor>(Self);
diff --git a/SurrealEngine/Native/NConsole.cpp b/SurrealEngine/Native/NConsole.cpp
index c1c60e7f..4f2891ab 100644
--- a/SurrealEngine/Native/NConsole.cpp
+++ b/SurrealEngine/Native/NConsole.cpp
@@ -17,5 +17,5 @@ void NConsole::ConsoleCommand(UObject* Self, const std::string& S, BitfieldBool&
 
 void NConsole::SaveTimeDemo(UObject* Self, const std::string& S)
 {
-	engine->LogUnimplemented("Console.SaveTimeDemo(" + S + ")");
+	LogUnimplemented("Console.SaveTimeDemo(" + S + ")");
 }
diff --git a/SurrealEngine/Native/NDeusExPlayer.cpp b/SurrealEngine/Native/NDeusExPlayer.cpp
index f6b71c3a..6c361a1d 100644
--- a/SurrealEngine/Native/NDeusExPlayer.cpp
+++ b/SurrealEngine/Native/NDeusExPlayer.cpp
@@ -33,7 +33,7 @@ void NDeusExPlayer::CreateDataVaultImageNoteObject(UObject* Self, UObject*& Retu
 
 void NDeusExPlayer::CreateDumpLocationObject(UObject* Self, UObject*& ReturnValue)
 {
-	engine->LogUnimplemented("DeusExPlayer.CreateDumpLocationObject");
+	LogUnimplemented("DeusExPlayer.CreateDumpLocationObject");
 	ReturnValue = nullptr;
 }
 
diff --git a/SurrealEngine/Native/NGameInfo.cpp b/SurrealEngine/Native/NGameInfo.cpp
index 2d68d75d..f1147e1e 100644
--- a/SurrealEngine/Native/NGameInfo.cpp
+++ b/SurrealEngine/Native/NGameInfo.cpp
@@ -13,7 +13,7 @@ void NGameInfo::RegisterFunctions()
 void NGameInfo::GetNetworkNumber(UObject* Self, std::string& ReturnValue)
 {
 	ReturnValue = "0";
-	engine->LogUnimplemented("GetNetworkNumber");
+	LogUnimplemented("GetNetworkNumber");
 }
 
 void NGameInfo::ParseKillMessage(const std::string& KillerName, const std::string& VictimName, const std::string& WeaponName, const std::string& DeathMessage, std::string& ReturnValue)
diff --git a/SurrealEngine/Native/NObject.cpp b/SurrealEngine/Native/NObject.cpp
index 0849186c..911cd48c 100644
--- a/SurrealEngine/Native/NObject.cpp
+++ b/SurrealEngine/Native/NObject.cpp
@@ -446,7 +446,7 @@ void NObject::DynamicLoadObject(const std::string& ObjectName, UObject* ObjectCl
 
 	if (!ReturnValue && (!MayFail || *MayFail == false))
 	{
-		engine->LogMessage("Object.DynamicLoadObject: could not load '" + ObjectName + "'");
+		LogMessage("Object.DynamicLoadObject: could not load '" + ObjectName + "'");
 	}
 }
 
@@ -695,9 +695,9 @@ void NObject::Localize(const std::string& SectionName, const std::string& KeyNam
 void NObject::Log(const std::string& S, NameString* Tag)
 {
 	if (Tag)
-		engine->LogMessage("[" + Tag->ToString() + "] " + S);
+		LogMessage("[" + Tag->ToString() + "] " + S);
 	else
-		engine->LogMessage(S);
+		LogMessage(S);
 }
 
 void NObject::Loge(float A, float& ReturnValue)
@@ -884,7 +884,7 @@ void NObject::RandRange(UObject* Self, float Min, float Max, float& ReturnValue)
 
 void NObject::ResetConfig()
 {
-	engine->LogUnimplemented("Object.ResetConfig");
+	LogUnimplemented("Object.ResetConfig");
 }
 
 void NObject::Right(const std::string& S, int i, std::string& ReturnValue)
@@ -933,7 +933,7 @@ void NObject::Square(float A, float& ReturnValue)
 
 void NObject::StaticSaveConfig()
 {
-	engine->LogUnimplemented("Object.StaticSaveConfig");
+	LogUnimplemented("Object.StaticSaveConfig");
 }
 
 void NObject::SubtractEqual_ByteByte(uint8_t& A, uint8_t B, uint8_t& ReturnValue)
@@ -1036,7 +1036,7 @@ void NObject::VSize(const vec3& A, float& ReturnValue)
 
 void NObject::Warn(const std::string& S)
 {
-	engine->LogMessage("Warning: " + S);
+	LogMessage("Warning: " + S);
 }
 
 void NObject::XorXor_BoolBool(bool A, bool B, BitfieldBool& ReturnValue)
diff --git a/SurrealEngine/Native/NPawn.cpp b/SurrealEngine/Native/NPawn.cpp
index 62094054..d381a443 100644
--- a/SurrealEngine/Native/NPawn.cpp
+++ b/SurrealEngine/Native/NPawn.cpp
@@ -58,46 +58,46 @@ void NPawn::CheckValidSkinPackage(const std::string& SkinPack, const std::string
 
 void NPawn::ClearPaths(UObject* Self)
 {
-	engine->LogUnimplemented("Pawn.ClearPaths");
+	LogUnimplemented("Pawn.ClearPaths");
 }
 
 void NPawn::ClientHearSound(UObject* Self, UObject* Actor, int Id, UObject* S, const vec3& SoundLocation, const vec3& Parameters)
 {
-	engine->LogUnimplemented("Pawn.ClientHearSound");
+	LogUnimplemented("Pawn.ClientHearSound");
 }
 
 void NPawn::EAdjustJump(UObject* Self, vec3& ReturnValue)
 {
-	engine->LogUnimplemented("Pawn.EAdjustJump");
+	LogUnimplemented("Pawn.EAdjustJump");
 }
 
 void NPawn::FindBestInventoryPath(UObject* Self, float& MinWeight, bool bPredictRespawns, UObject*& ReturnValue)
 {
-	engine->LogUnimplemented("Pawn.FindBestInventoryPath");
+	LogUnimplemented("Pawn.FindBestInventoryPath");
 	ReturnValue = nullptr;
 }
 
 void NPawn::FindPathTo(UObject* Self, const vec3& aPoint, BitfieldBool* bSinglePath, BitfieldBool* bClearPaths, UObject*& ReturnValue)
 {
-	engine->LogUnimplemented("Pawn.FindPathTo");
+	LogUnimplemented("Pawn.FindPathTo");
 	ReturnValue = nullptr;
 }
 
 void NPawn::FindPathToward(UObject* Self, UObject* anActor, BitfieldBool* bSinglePath, BitfieldBool* bClearPaths, UObject*& ReturnValue)
 {
-	engine->LogUnimplemented("Pawn.FindPathToward");
+	LogUnimplemented("Pawn.FindPathToward");
 	ReturnValue = nullptr;
 }
 
 void NPawn::FindRandomDest(UObject* Self, BitfieldBool* bClearPaths, UObject*& ReturnValue)
 {
-	engine->LogUnimplemented("Pawn.FindRandomDest");
+	LogUnimplemented("Pawn.FindRandomDest");
 	ReturnValue = nullptr;
 }
 
 void NPawn::FindStairRotation(UObject* Self, float DeltaTime, int& ReturnValue)
 {
-	engine->LogUnimplemented("Pawn.FindStairRotation");
+	LogUnimplemented("Pawn.FindStairRotation");
 	ReturnValue = 0;
 }
 
@@ -134,7 +134,7 @@ void NPawn::PickTarget(UObject* Self, float& bestAim, float& bestDist, const vec
 
 void NPawn::PickWallAdjust(UObject* Self, BitfieldBool& ReturnValue)
 {
-	engine->LogUnimplemented("Pawn.PickWallAdjust");
+	LogUnimplemented("Pawn.PickWallAdjust");
 	ReturnValue = false;
 }
 
diff --git a/SurrealEngine/Native/NPlayerPawn.cpp b/SurrealEngine/Native/NPlayerPawn.cpp
index 84ac0308..e0957a08 100644
--- a/SurrealEngine/Native/NPlayerPawn.cpp
+++ b/SurrealEngine/Native/NPlayerPawn.cpp
@@ -35,7 +35,7 @@ void NPlayerPawn::ConsoleCommand(UObject* Self, const std::string& Command, std:
 
 void NPlayerPawn::CopyToClipboard(UObject* Self, const std::string& Text)
 {
-	engine->LogUnimplemented("PlayerPawn.CopyToClipboard(" + Text + ")");
+	LogUnimplemented("PlayerPawn.CopyToClipboard(" + Text + ")");
 }
 
 void NPlayerPawn::GetDefaultURL(UObject* Self, const std::string& Option, std::string& ReturnValue)
@@ -50,19 +50,19 @@ void NPlayerPawn::GetEntryLevel(UObject* Self, UObject*& ReturnValue)
 
 void NPlayerPawn::GetPlayerNetworkAddress(UObject* Self, std::string& ReturnValue)
 {
-	engine->LogUnimplemented("PlayerPawn.GetPlayerNetworkAddress");
+	LogUnimplemented("PlayerPawn.GetPlayerNetworkAddress");
 	ReturnValue = "";
 }
 
 void NPlayerPawn::PasteFromClipboard(UObject* Self, std::string& ReturnValue)
 {
-	engine->LogUnimplemented("PlayerPawn.PasteFromClipboard");
+	LogUnimplemented("PlayerPawn.PasteFromClipboard");
 	ReturnValue = "";
 }
 
 void NPlayerPawn::ResetKeyboard(UObject* Self)
 {
-	engine->LogUnimplemented("PlayerPawn.ResetKeyboard");
+	LogUnimplemented("PlayerPawn.ResetKeyboard");
 }
 
 void NPlayerPawn::UpdateURL(UObject* Self, const std::string& NewOption, const std::string& NewValue, bool bSaveDefault)
@@ -70,5 +70,5 @@ void NPlayerPawn::UpdateURL(UObject* Self, const std::string& NewOption, const s
 	UPlayerPawn* SelfPlayerPawn = UObject::Cast<UPlayerPawn>(Self);
 	SelfPlayerPawn->Level()->URL.AddOrReplaceOption(NewOption + "=" + NewValue);
 	if (bSaveDefault)
-		engine->LogUnimplemented("PlayerPawn.UpdateURL save default");
+		LogUnimplemented("PlayerPawn.UpdateURL save default");
 }
diff --git a/SurrealEngine/Native/NPlayerPawnExt.cpp b/SurrealEngine/Native/NPlayerPawnExt.cpp
index 6dc63a32..0db27ed1 100644
--- a/SurrealEngine/Native/NPlayerPawnExt.cpp
+++ b/SurrealEngine/Native/NPlayerPawnExt.cpp
@@ -14,15 +14,15 @@ void NPlayerPawnExt::RegisterFunctions()
 
 void NPlayerPawnExt::InitRootWindow(UObject* Self)
 {
-	engine->LogUnimplemented("PlayerPawnExt.InitRootWindow");
+	LogUnimplemented("PlayerPawnExt.InitRootWindow");
 }
 
 void NPlayerPawnExt::PostRenderWindows(UObject* Self, UObject* Canvas)
 {
-	engine->LogUnimplemented("PlayerPawnExt.PostRenderWindows");
+	LogUnimplemented("PlayerPawnExt.PostRenderWindows");
 }
 
 void NPlayerPawnExt::PreRenderWindows(UObject* Self, UObject* Canvas)
 {
-	engine->LogUnimplemented("PlayerPawnExt.PreRenderWindows");
+	LogUnimplemented("PlayerPawnExt.PreRenderWindows");
 }
diff --git a/SurrealEngine/Native/NScriptedTexture.cpp b/SurrealEngine/Native/NScriptedTexture.cpp
index 9fdea0a9..f5949555 100644
--- a/SurrealEngine/Native/NScriptedTexture.cpp
+++ b/SurrealEngine/Native/NScriptedTexture.cpp
@@ -15,27 +15,27 @@ void NScriptedTexture::RegisterFunctions()
 
 void NScriptedTexture::DrawColoredText(UObject* Self, float X, float Y, const std::string& Text, UObject* Font, const Color& FontColor)
 {
-	engine->LogUnimplemented("ScriptedTexture.DrawColoredText");
+	LogUnimplemented("ScriptedTexture.DrawColoredText");
 }
 
 void NScriptedTexture::DrawText(UObject* Self, float X, float Y, const std::string& Text, UObject* Font)
 {
-	engine->LogUnimplemented("ScriptedTexture.DrawText");
+	LogUnimplemented("ScriptedTexture.DrawText");
 }
 
 void NScriptedTexture::DrawTile(UObject* Self, float X, float Y, float XL, float YL, float U, float V, float UL, float VL, UObject* Tex, bool bMasked)
 {
-	engine->LogUnimplemented("ScriptedTexture.DrawTile");
+	LogUnimplemented("ScriptedTexture.DrawTile");
 }
 
 void NScriptedTexture::ReplaceTexture(UObject* Self, UObject* Tex)
 {
-	engine->LogUnimplemented("ScriptedTexture.ReplaceTexture");
+	LogUnimplemented("ScriptedTexture.ReplaceTexture");
 }
 
 void NScriptedTexture::TextSize(UObject* Self, const std::string& Text, float& XL, float& YL, UObject* Font)
 {
-	engine->LogUnimplemented("ScriptedTexture.TextSize");
+	LogUnimplemented("ScriptedTexture.TextSize");
 	XL = 0.0f;
 	YL = 0.0f;
 }
diff --git a/SurrealEngine/UObject/UObject.cpp b/SurrealEngine/UObject/UObject.cpp
index 9ae9b83f..ca93cd9c 100644
--- a/SurrealEngine/UObject/UObject.cpp
+++ b/SurrealEngine/UObject/UObject.cpp
@@ -566,7 +566,7 @@ void PropertyDataBlock::ReadProperties(ObjectStream* stream)
 #if 0
 			Exception::Throw("Unknown property " + name);
 #else
-			engine->LogMessage("Skipping unknown property " + name.ToString());
+			LogMessage("Skipping unknown property " + name.ToString());
 			if (header.type != UPT_Bool)
 				stream->Skip(header.size);
 			continue;
diff --git a/SurrealEngine/UObject/USubsystem.cpp b/SurrealEngine/UObject/USubsystem.cpp
index 59251b03..660239f1 100644
--- a/SurrealEngine/UObject/USubsystem.cpp
+++ b/SurrealEngine/UObject/USubsystem.cpp
@@ -19,7 +19,7 @@ std::string USurrealRenderDevice::GetPropertyAsString(const NameString& property
 	else if (propertyName == "HighDetailActors")
 		return IniPropertyConverter<bool>::ToString(HighDetailActors);
 
-	engine->LogMessage("Queried unknown property for SurrealRenderDevice: " + propertyName.ToString());
+	LogMessage("Queried unknown property for SurrealRenderDevice: " + propertyName.ToString());
 	return {};
 }
 
@@ -36,7 +36,7 @@ void USurrealRenderDevice::SetPropertyFromString(const NameString& propertyName,
 	else if (propertyName == "HighDetailActors")
 		HighDetailActors = IniPropertyConverter<bool>::FromString(value);
 	else
-		engine->LogMessage("Setting unknown property for SurrealRenderDevice: " + propertyName.ToString());
+		LogMessage("Setting unknown property for SurrealRenderDevice: " + propertyName.ToString());
 
 	engine->packages->SetIniValue("System", Class, propertyName, value);
 }
@@ -103,7 +103,7 @@ std::string USurrealAudioDevice::GetPropertyAsString(const NameString& propertyN
 	else if (propertyName == "AmbientFactor")
 		return IniPropertyConverter<float>::ToString(AmbientFactor);
 
-	engine->LogMessage("Queried unknown property for SurrealAudioDevice: " + propertyName.ToString());
+	LogMessage("Queried unknown property for SurrealAudioDevice: " + propertyName.ToString());
 	return {};
 }
 
@@ -142,7 +142,7 @@ void USurrealAudioDevice::SetPropertyFromString(const NameString& propertyName,
 	else if (propertyName == "AmbientFactor")
 		AmbientFactor = IniPropertyConverter<float>::FromString(value);
 	else
-		engine->LogMessage("Setting unknown property for SurrealAudioDevice: " + propertyName.ToString());
+		LogMessage("Setting unknown property for SurrealAudioDevice: " + propertyName.ToString());
 
 	engine->packages->SetIniValue("System", Class, propertyName, value);
 }
@@ -199,13 +199,13 @@ std::string USurrealNetworkDevice::GetPropertyAsString(const NameString& propert
 	if (propertyName == "Class")
 		return "class'" + Class + "'";
 
-	engine->LogMessage("Queried unknown property for SurrealNetworkDevice: " + propertyName.ToString());
+	LogMessage("Queried unknown property for SurrealNetworkDevice: " + propertyName.ToString());
 	return {};
 }
 
 void USurrealNetworkDevice::SetPropertyFromString(const NameString& propertyName, const std::string& value)
 {
-	engine->LogMessage("Setting unknown property for SurrealNetworkDevice: " + propertyName.ToString());
+	LogMessage("Setting unknown property for SurrealNetworkDevice: " + propertyName.ToString());
 	engine->packages->SetIniValue("System", Class, propertyName, value);
 }
 
@@ -289,7 +289,7 @@ std::string USurrealClient::GetPropertyAsString(const NameString& propertyName)
 	else if (propertyName == "SkinDetail")
 		return SkinDetail;
 
-	engine->LogMessage("Queried unknown property for Surreal.ViewportManager: " + propertyName.ToString());
+	LogMessage("Queried unknown property for Surreal.ViewportManager: " + propertyName.ToString());
 	return {};
 }
 
@@ -324,7 +324,7 @@ void USurrealClient::SetPropertyFromString(const NameString& propertyName, const
 	else if (propertyName == "SkinDetail")
 		SkinDetail = value;
 	else
-		engine->LogMessage("Setting unknown property for Surreal.ViewportManager: " + propertyName.ToString());
+		LogMessage("Setting unknown property for Surreal.ViewportManager: " + propertyName.ToString());
 
 	engine->packages->SetIniValue("System", Class, propertyName, value);
 }
diff --git a/SurrealEngine/VM/Frame.cpp b/SurrealEngine/VM/Frame.cpp
index 1540f6bc..dbb5e80d 100644
--- a/SurrealEngine/VM/Frame.cpp
+++ b/SurrealEngine/VM/Frame.cpp
@@ -425,7 +425,7 @@ ExpressionEvalResult Frame::Run()
 			Iterators.pop_back();
 			break;
 		case StatementResult::AccessedNone:
-			engine->LogMessage("Accessed None in function" + Object->Name.ToString() + "." + Func->Name.ToString());
+			LogMessage("Accessed None in function" + Object->Name.ToString() + "." + Func->Name.ToString());
 			break;
 		}