diff --git a/r5dev/common/opcodes.cpp b/r5dev/common/opcodes.cpp
index 5f2423e1..5a1e0281 100644
--- a/r5dev/common/opcodes.cpp
+++ b/r5dev/common/opcodes.cpp
@@ -1,92 +1,100 @@
-#include "core/stdafx.h"
-#include "common/opcodes.h"
+/*-----------------------------------------------------------------------------
+ * _opcodes.cpp
+ *-----------------------------------------------------------------------------*/
+
+#include "core/stdafx.h"
+#include "tier0/basetypes.h"
+#include "common/opcodes.h"
+#include "engine/host_cmd.h"
+#include "bsplib/bsplib.h"
+#include "ebisusdk/EbisuSDK.h"
 
- /*-----------------------------------------------------------------------------
-  * _opcodes.cpp
-  *-----------------------------------------------------------------------------*/
 
 #ifdef DEDICATED
 void Dedicated_Init()
 {
-	*(uintptr_t*)0x14D415040 = 0x1417304E8;
-	*(uintptr_t*)0x14B37C3C0 = 0x141F10CA0;
-	*(uintptr_t*)0x14B3800D7 = 0x1; // bDedicated
-
-	//-------------------------------------------------------------------------
-	// RESEARCH FOR IMPROVEMENT!
-	//-------------------------------------------------------------------------
-	e10.Patch({ 0xC3 }); // FUN --> RET | RET early to prevent '' code execution.
-	e8.Offset(0x44).Patch({ 0xE9, 0x41, 0x04, 0x00, 0x00 });                        // FUN --> RET | Return early in 'RenderFrame?' (Called from VGUI and Host_Init).
-	gInitMaterialSystem.Offset(0x7D).Patch({ 0xC3 });                               // JMP --> RET | Return early to prevent 'InitDebugMaterials' from being executed.
-	e3.Offset(0xFB0).Patch({ 0x90, 0x90, 0x90, 0x90, 0x90 });                       // CAL --> NOP | NOP call to unused VGUI code to prevent crash at SIGNONSTATE_PRESPAWN.
-	addr_CEngine_Frame.Offset(0x410).Patch({ 0x90, 0x90, 0x90, 0x90, 0x90, 0x90 }); // CAL --> NOP | CHLClient call inside eng->frame.
-	FairFight_Init.Offset(0x61).Patch({ 0xE9, 0xED, 0x00, 0x00, 0x00, 0x00 });      // JA  --> JMP | Prevent FairFight anti-cheat from initializing on the server.
-	s1.Offset(0x1023).Patch({ 0x90, 0x90, 0x90 });                                  // CAL --> NOP | NOP NULL call as client is never initialized.
-	s2.Offset(0xF).Patch({ 0xE9, 0x22, 0x01, 0x00, 0x00 });                         // JS  --> JMP | Skip ListenServer HeartBeat.
-	e1.Offset(0x213).Patch({ 0x90, 0x90, 0x90, 0x90, 0x90, 0x90 });                 // JNE --> NOP | Skip settings field loading for client texture assets.
-	e9.Offset(0x6).Patch({ 0x90, 0x90, 0x90, 0x90, 0x90 });                         // CAL --> NOP | NOP call to prevent texture creation.
-	gShaderCreate.Patch({ 0xC3 });                                                  // FUN --> RET | RET early to prevent 'ShaderCreate' code execution.
-	gTextureCreate.Patch({ 0xC3 });                                                 // FUN --> RET | RET early to prevent 'TextureCreate' code execution.
-	c2.Offset(0x23C).Patch({ 0x90, 0x90, 0x90, 0x90, 0x90, 0x90 });                 // JNE --> NOP | TODO: NOP 'particle_script' instead.
-	c2.Offset(0x2BD).Patch({ 0x90, 0x90, 0x90 });                                   // MOV --> NOP | TODO: NOP 'particle_script' instead.
-	c3.Offset(0xA9).Patch({ 0x90, 0x90, 0x90, 0x90 });                              // MOV --> NOP | TODO: NOP 'highlight_system' instead.
-
-	//-------------------------------------------------------------------------
-	// CENGINEAPI
-	//-------------------------------------------------------------------------
-	gCEngineAPI__Init.Offset(0xB7).Patch({ 0xE9, 0xC7, 0x00, 0x00, 0x00 });           // JNE --> JNP | Skip Video Mode validation code.
-	gCEngineAPI__OnStartup.Offset(0x5E).Patch({ 0xE9, 0xC6, 0x01, 0x00, 0x00 });      // JNE --> JNP | Skip Video Mode initialization code.
-	gCEngineAPI__Connect.Offset(0xDD).Patch({ 0x90, 0x90, 0x90 });                    // CAL --> NOP | NOP call to texture and material preloading.
-	gCEngineAPI__Connect.Offset(0xF1).Patch({ 0x90, 0x90, 0x90, 0x90, 0x90, 0x90 });  // CAL --> NOP | NOP call to texture and material preloading.
-	gCEngineAPI__Connect.Offset(0x1C6).Patch({ 0x90, 0x90, 0x90, 0x90, 0x90 });       // CAL --> NOP | NOP call to texture and material preloading.
-	//gCEngineAPI__ModInit.Offset(0x3DD).Patch({ 0xE9, 0xB5, 0x00, 0x00, 0x00, 0x00 }); // JNE --> JNP | Skip CreateWindow Initialization code.
-	gCEngineAPI__ModInit.Offset(0x44C).Patch({ 0xEB, 0x49 });                         // JNZ --> JMP | Skip CreateGameWindow validation code.
-	//gCEngineAPI__ModInit.Offset(0x3DD).Patch({ 0xEB, 0x6D });                         // JE  --> JMP | Skip CreateGameWindow initialization code.
-
-	//-------------------------------------------------------------------------
-	// CENGINEVGUI
-	//-------------------------------------------------------------------------
-	gCEngineVGui__Init.Patch({ 0x48, 0x33, 0xC0, 0xC3, 0x90, 0x90, 0x90 }); // CMP --> XOR | Skip VGUI initialization jumptable.
-	gCEngineVGui__OnLevelLoadingStarted.Patch({ 0xC3 });                    // FUN --> RET | 
+	*(uintptr_t*)0x14D415040 = 0x1417304E8; // CEngineClient::CEngineClient().
+	//*(uintptr_t*)0x14B37C3C0 = 0x141F10CA0; // CHLClient::CHLClient().
+	*(uintptr_t*)0x14B3800D7 = 0x1;         // bool bDedicated = true.
 
 	//-------------------------------------------------------------------------
 	// CGAME
 	//-------------------------------------------------------------------------
-	gCGame__CreateGameWindow.Offset(0x2C).Patch({ 0xE9, 0x9A, 0x00, 0x00, 0x00 }); // PUS --> XOR | Prevent ShowWindow and CreateGameWindow from being initialized.
+	CVideoMode_Common__CreateGameWindow.Offset(0x2C).Patch({ 0xE9, 0x9A, 0x00, 0x00, 0x00 }); // PUS --> XOR | Prevent ShowWindow and CreateGameWindow from being initialized (STGS RPak datatype is registered here).
 
 	//-------------------------------------------------------------------------
 	// CHLClIENT
 	//-------------------------------------------------------------------------
-	gCHLClient__1000.Patch({ 0xC3 });       // FUN --> RET | Return early in 'gCHLClient::unnamed' to prevent infinite loop.
-	gCHLClient__HudMessage.Patch({ 0xC3 }); // FUN --> RET | Return early from 'CHudMessage' call.
+	gCHLClient__1000.Patch({ 0xC3 }); // FUN --> RET | Return early in unknown 'CHLClient' function to prevent infinite loop.
 
 	//-------------------------------------------------------------------------
 	// CSOURCEAPPSYSTEMGROUP
 	//-------------------------------------------------------------------------
-	gCSourceAppSystemGroup__Create.Offset(0x35D).Patch({ 0x90, 0x90, 0x90 }); // CAL --> NOP | joystickInit?
-	//gCSourceAppSystemGroup__Create.Offset(0x384).Patch({ 0x90, 0x90, 0x90 }); // CAL --> NOP | PrecacheMaterial.
-	gCSourceAppSystemGroup__Create.Offset(0x39E).Patch({ 0x90, 0x90, 0x90 }); // CAL --> NOP | binkBlankTexture.
-
-	//-------------------------------------------------------------------------
-	// CVIDEOMODE_COMMON
-	//-------------------------------------------------------------------------
-	gCVideoMode_Common__DrawStartupGraphic.Patch({ 0xC3 }); // FUN --> RET | Return early in 'CVideoMode_Common::DrawStartupGraphic'.
+	gCSourceAppSystemGroup__Create.Offset(0x248).Patch({ 0x90, 0x90, 0x90 }); // CAL --> NOP | inputSystem->Connect().
+	gCSourceAppSystemGroup__Create.Offset(0x267).Patch({ 0x90, 0x90, 0x90 }); // CAL --> NOP | materials->Connect().
+	//gCSourceAppSystemGroup__Create.Offset(0x286).Patch({ 0x90, 0x90, 0x90 }); // CAL --> NOP | mdlCache->Connect().
+	gCSourceAppSystemGroup__Create.Offset(0x2A5).Patch({ 0x90, 0x90, 0x90 }); // CAL --> NOP | studioRender->Connect().
+	gCSourceAppSystemGroup__Create.Offset(0x2C4).Patch({ 0x90, 0x90, 0x90 }); // CAL --> NOP | avi->Connect().
+	gCSourceAppSystemGroup__Create.Offset(0x2E3).Patch({ 0x90, 0x90, 0x90 }); // CAL --> NOP | engineAPI->Connect().
+	//gCSourceAppSystemGroup__Create.Offset(0x302).Patch({ 0x90, 0x90, 0x90 }); // CAL --> NOP | dataCache->Connect().
+	gCSourceAppSystemGroup__Create.Offset(0x321).Patch({ 0x90, 0x90, 0x90 }); // CAL --> NOP | matSystemSurface->Connect().
+	gCSourceAppSystemGroup__Create.Offset(0x340).Patch({ 0x90, 0x90, 0x90 }); // CAL --> NOP | vgui->Connect().
+	gCSourceAppSystemGroup__Create.Offset(0x35D).Patch({ 0x90, 0x90, 0x90 }); // CAL --> NOP | inputSystem->Init().
+	gCSourceAppSystemGroup__Create.Offset(0x384).Patch({ 0x90, 0x90, 0x90 }); // CAL --> NOP | studioRender->Init().
+	gCSourceAppSystemGroup__Create.Offset(0x39E).Patch({ 0x90, 0x90, 0x90 }); // CAL --> NOP | bik->Init().
+	gCSourceAppSystemGroup__Create.Offset(0x3AB).Patch({ 0x90, 0x90, 0x90 }); // CAL --> NOP | engineAPI->Init().
+	gCSourceAppSystemGroup__Create.Offset(0x3F6).Patch({ 0x90, 0x90, 0x90 }); // CAL --> NOP | vgui->Init().
+	gCSourceAppSystemGroup__Create.Offset(0x3E9).Patch({ 0x90, 0x90, 0x90 }); // CAL --> NOP | matEmbeddedPanel->Init().
+	gCSourceAppSystemGroup__Create.Offset(0x3F9).Patch({ 0x90, 0x90, 0x90, 0x90, 0x90 }); // CAL --> NOP | EAC_ClientInterface_Init().
 
 	//-------------------------------------------------------------------------
 	// CMATERIALSYSTEM
 	//-------------------------------------------------------------------------
-	gCMaterialSystem__MatsysMode_Init.Offset(0x22).Patch({ 0xEB, 0x66 }); // JE  --> JMP | Matsys mode init (CMaterialSystem).
+	//gCMaterialSystem__MatsysMode_Init.Offset(0x22).Patch({ 0xEB, 0x66 });        // JE  --> JMP | Matsys mode init (CMaterialSystem). // TODO: Needed?
+	CMaterialSystem__Init.Offset(0x406).Patch({ 0xE9, 0x55, 0x05, 0x00, 0x00 }); // MOV --> JMP | Jump over material KeyValue definitions and 'CMatRenderContextBase::sm_RenderData([x])'.
+	InitMaterialSystem.Offset(0x7D).Patch({ 0xC3 });                             // JMP --> RET | Return early to prevent 'InitDebugMaterials' from being executed. // RESEARCH NEEDED.
 
 	//-------------------------------------------------------------------------
 	// CSHADERSYSTEM
 	//-------------------------------------------------------------------------
-	//gCShaderSystem_Init.Patch({ 0xC3 });                                   // FUN --> RET | Return early in 'CShaderSystem::Init' to prevent initialization.
-	gCShaderSystem__9.Offset(0x3).Patch({ 0xE9, 0x95, 0x03, 0x00, 0x00 }); // Unnecessary CShaderSystem call?
+	CShaderSystem__Init.Patch({ 0xC3 });                                         // FUN --> RET | Return early in 'CShaderSystem::Init' to prevent initialization.
 
 	//-------------------------------------------------------------------------
-	// CSHADERGLUE
+	// CSTUDIORENDERCONTEXT
 	//-------------------------------------------------------------------------
-	gCShaderGlue__Init.Patch({ 0xC3 }); // FUN --> RET | Skip ShaderSetup(). CShaderGlue.
+	// Note: The registers here seems to contains pointers to material data and 'CMaterial' class methods when the shader system is initialized.
+	CStudioRenderContext__LoadModel.Offset(0x17D).Patch({ 0x90, 0x90, 0x90, 0x90 });             // MOV --> NOP | RAX + RCX are both nullptrs.
+	CStudioRenderContext__LoadModel.Offset(0x181).Patch({ 0x90, 0x90, 0x90 });                   // MOV --> NOP | RCX is nullptr when trying to dereference.
+	CStudioRenderContext__LoadModel.Offset(0x184).Patch({ 0x90, 0x90, 0x90, 0x90, 0x90, 0x90 }); // CAL --> NOP | RAX is nullptr during virtual call resulting in exception 'C0000005'.
+	CStudioRenderContext__LoadMaterials.Offset(0x28).Patch({ 0xE9, 0x80, 0x04, 0x00, 0x00 });    // FUN --> RET | 'CStudioRenderContext::LoadMaterials' is called virtually by the 'RMDL' streaming job.
+
+
+	//-------------------------------------------------------------------------
+	// CMODELLOADER
+	//-------------------------------------------------------------------------
+	CModelLoader__LoadModel.Offset(0x462).Patch({ 0x90, 0x90, 0x90, 0x90, 0x90 });               // CAL --> NOP | Prevent call to 'CStudioRenderContext::LoadMaterials'.
+	CModelLoader__Studio_LoadModel.Offset(0x325).Patch({ 0x90, 0x90, 0x90, 0x90, 0x90, 0x90 });  // CAL --> NOP | Virtual call to 'CMaterialSystem::FindMaterialEx' fails as RAX is nullptr.
+	CModelLoader__Studio_LoadModel.Offset(0x33D).Patch({ 0x90, 0x90, 0x90, 0x90, 0x90, 0x90 });  // CAL --> NOP | Virtual call to 'CMaterialGlue' class method fails as RAX is nullptr.
+	CModelLoader__Studio_LoadModel.Offset(0x359).Patch({ 0x90, 0x90, 0x90, 0x90, 0x90, 0x90 });  // CAL --> NOP | Virtual call to 'CMaterialGlue' class method fails as RAX is nullptr.
+	CModelLoader__Studio_LoadModel.Offset(0x374).Patch({ 0x90, 0x90, 0x90, 0x90, 0x90, 0x90 });  // CAL --> NOP | Virtual call to 'CMaterialGlue' class method fails as RAX is nullptr.
+	CModelLoader__Studio_LoadModel.Offset(0x38D).Patch({ 0x90, 0x90, 0x90, 0x90, 0x90, 0x90 });  // CAL --> NOP | Virtual call to 'ReturnZero' fails as RAX is nullptr.
+	CModelLoader__Studio_LoadModel.Offset(0x3A4).Patch({ 0x90, 0x90, 0x90, 0x90, 0x90, 0x90 });  // CAL --> NOP | Virtual call to 'CMaterialGlue' class method fails as RAX is nullptr.
+
+	//-------------------------------------------------------------------------
+	// CGAMESERVER
+	//-------------------------------------------------------------------------
+	CGameServer__SpawnServer.Offset(0x43).Patch({ 0x90, 0x90, 0x90, 0x90, 0x90 }); // CAL --> NOP | Prevent call to unknown material/shader code.
+	CGameServer__SpawnServer.Offset(0x48).Patch({ 0x90, 0x90, 0x90, 0x90, 0x90 }); // TODO: Research 'CIVDebugOverlay'.
+
+	//-------------------------------------------------------------------------
+	// MM_HEARTBEAT
+	//-------------------------------------------------------------------------
+	MM_Heartbeat__ToString.Offset(0xF).Patch({ 0xE9, 0x22, 0x01, 0x00, 0x00 });    // JS  --> JMP | Skip ListenServer HeartBeat.
+
+	//-------------------------------------------------------------------------
+	// RUNTIME: SYS_INITGAME
+	//-------------------------------------------------------------------------
+	Sys_InitGame.Offset(0x70).Patch({ 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90 }); // STZNZ --> NOP | Prevent 'bDedicated' from being set to false.
 
 	//-------------------------------------------------------------------------
 	// RUNTIME: HOST_INIT
@@ -95,29 +103,31 @@ void Dedicated_Init()
 	gHost_Init_0.Offset(0x182).Patch({ 0x90, 0x90, 0x90, 0x90, 0x90 }); // CAL --> JMP | Disable UI material asset initialization.
 	gHost_Init_0.Offset(0x859).Patch({ 0xE9, 0x19, 0x04, 0x00, 0x00 }); // LEA --> RET | Disable 'client.dll' library initialization.
 	gHost_Init_0.Offset(0xC77).Patch({ 0xE8, 0x44, 0xCF, 0xFF, 0xFF }); // CAL --> CAL | Disable user config loading and call entitlements.rson initialization instead.
-	gHost_Init_1.Offset(0x19).Patch({ 0xEB, 0x6E });                    // JNE --> JMP | Take dedicated initialization routine instead.
+
 	gHost_Init_1.Offset(0x609).Patch({ 0xEB, 0x2B });                   // JE  --> JMP | Skip client.dll Init_PostVideo() validation code.
 	gHost_Init_1.Offset(0x621).Patch({ 0xEB, 0x0C });                   // JNE --> JMP | Skip client.dll Init_PostVideo() validation code.
 	gHost_Init_1.Offset(0x658).Patch({ 0xE9, 0x8C, 0x00, 0x00, 0x00 }); // JE  --> JMP | Skip NULL call as client is never initialized.
 	gHost_Init_1.Offset(0x6E9).Patch({ 0xE9, 0xB0, 0x00, 0x00, 0x00 }); // JNE --> JMP | Skip shader preloading as cvar can't be checked due to client being NULL.
-	//gHost_Init_2.Offset(0x5D8).Patch({ 0xEB, 0x05 });                   // JE  --> JMP | Render?
 
-	//-------------------------------------------------------------------------
-	// RUNTIME: _HOST_RUNFRAME
-	//-------------------------------------------------------------------------
-	//s1.Offset(0x1C6).Patch({ 0xE9, 0xAD, 0x11, 0x00, 0x00 }); // JNE --> JMP | Return early in _Host_RunFrame() for debugging perposes.
-	//s1.Offset(0x1010).Patch({ 0xEB, 0x14 });                  // JNE --> JMP | Return early in _Host_RunFrame() for debugging perposes.
+	gHost_Init_2.Offset(0x26F).Patch({ 0xE9, 0x4D, 0x05, 0x00, 0x00 }); // JNE --> JMP | client.dll systems initialization.
 
 	//-------------------------------------------------------------------------
 	// RUNTIME: HOST_NEWGAME
 	//-------------------------------------------------------------------------
+	Host_NewGame.Offset(0x4E0).Patch({ 0x90, 0x90, 0x90, 0x90, 0x90 });
 	Host_NewGame.Offset(0x637).Patch({ 0xE9, 0xC1, 0x00, 0x00, 0x00 }); // JNE --> JMP | Prevent connect localhost from being executed in Host_NewGame.
 
+	//-------------------------------------------------------------------------
+	// RUNTIME: _HOST_RUNFRAME
+	//-------------------------------------------------------------------------
+	_Host_RunFrame.Offset(0xFB0).Patch({ 0x90, 0x90, 0x90, 0x90, 0x90 });    // CAL --> NOP | NOP call to unused VGUI code to prevent crash at SIGNONSTATE_PRESPAWN.
+	_Host_RunFrame.Offset(0x1023).Patch({ 0x90, 0x90, 0x90 });               // CAL --> NOP | NOP NULL call as client is never initialized.
+
 	//-------------------------------------------------------------------------
 	// RUNTIME: EBISUSDK
 	//-------------------------------------------------------------------------
-	Origin_Init.Offset(0x0B).Patch({ 0xE9, 0x63, 0x02, 0x00, 0x00, 0x00 }); // JNZ --> JMP | Prevent EbisuSDK from initializing on the engine and server.
-	Origin_SetState.Offset(0x0E).Patch({ 0xE9, 0xCB, 0x03, 0x00, 0x00 });   // JNZ --> JMP | Prevent EbisuSDK from initializing on the engine and server.
+	p_EbisuSDK_Init_Tier0.Offset(0x0B).Patch({ 0xE9, 0x63, 0x02, 0x00, 0x00, 0x00 }); // JNZ --> JMP | Prevent EbisuSDK from initializing on the engine and server.
+	p_EbisuSDK_SetState.Offset(0x0E).Patch({ 0xE9, 0xCB, 0x03, 0x00, 0x00 });         // JNZ --> JMP | Prevent EbisuSDK from initializing on the engine and server.
 
 	//-------------------------------------------------------------------------
 	// RUNTIME: FAIRFIGHT
@@ -127,86 +137,46 @@ void Dedicated_Init()
 	//-------------------------------------------------------------------------
 	// RUNTIME: BSP_LUMP
 	//-------------------------------------------------------------------------
-	gBSP_LUMP_INIT.Offset(0x41).Patch({ 0xE9, 0x4F, 0x04, 0x00, 0x00 });  // JNE --> NOP | SKYLIGHTS.
-	gBSP_LUMP_INIT.Offset(0x974).Patch({ 0x90, 0x90 });                   // JE  --> NOP | VERTNORMALS.
-	gBSP_LUMP_INIT.Offset(0xA55).Patch({ 0x90, 0x90, 0x90, 0x90, 0x90 }); // CAL --> NOP | MATERIALSORTS.
-	gBSP_LUMP_INIT.Offset(0xA62).Patch({ 0x90, 0x90, 0x90, 0x90, 0x90 }); // CAL --> NOP | MESHBOUNDS.
-	gBSP_LUMP_INIT.Offset(0xA83).Patch({ 0x90, 0x90, 0x90, 0x90, 0x90 }); // CAL --> NOP | MESHVERTS.
-	gBSP_LUMP_INIT.Offset(0xAC0).Patch({ 0x90, 0x90 });                   // JE  --> NOP | INDICES.
-	gBSP_LUMP_INIT.Offset(0xBF2).Patch({ 0x90, 0x90 });                   // JE  --> NOP | WORLDLIGHTS.
-	gBSP_LUMP_INIT.Offset(0xDA9).Patch({ 0x90, 0x90 });                   // JE  --> NOP | TWEAKLIGHTS.
-	gBSP_LUMP_INIT.Offset(0xEEB).Patch({ 0xE9, 0x3D, 0x01, 0x00, 0x00 });
-	//gBSP_LUMP_INIT.Offset(0x61B).Patch({ 0xE9, 0xE2, 0x02, 0x00, 0x00 });
+	CollisionBSPData_LoadAllLumps.Offset(0x41).Patch({ 0xE9, 0x4F, 0x04, 0x00, 0x00 });   // JNE --> NOP | SKYLIGHTS.
+	CollisionBSPData_LoadAllLumps.Offset(0x974).Patch({ 0x90, 0x90 });                    // JE  --> NOP | VERTNORMALS.
+	CollisionBSPData_LoadAllLumps.Offset(0xA55).Patch({ 0x90, 0x90, 0x90, 0x90, 0x90 });  // CAL --> NOP | MATERIALSORTS.
+	CollisionBSPData_LoadAllLumps.Offset(0xA62).Patch({ 0x90, 0x90, 0x90, 0x90, 0x90 });  // CAL --> NOP | MESHBOUNDS.
+	CollisionBSPData_LoadAllLumps.Offset(0xA83).Patch({ 0x90, 0x90, 0x90, 0x90, 0x90 });  // CAL --> NOP | MESHVERTS.
+	CollisionBSPData_LoadAllLumps.Offset(0xAC0).Patch({ 0x90, 0x90 });                    // JE  --> NOP | INDICES.
+	CollisionBSPData_LoadAllLumps.Offset(0xBF2).Patch({ 0x90, 0x90 });                    // JE  --> NOP | WORLDLIGHTS.
+	CollisionBSPData_LoadAllLumps.Offset(0xDA9).Patch({ 0x90, 0x90 });                    // JE  --> NOP | TWEAKLIGHTS.
+	CollisionBSPData_LoadAllLumps.Offset(0xEEB).Patch({ 0xE9, 0x3D, 0x01, 0x00, 0x00 });  // JLE --> JMP | Exception 0x57 in while trying to dereference [R15 + R14 *8 + 0x10].
+	CollisionBSPData_LoadAllLumps.Offset(0x61B).Patch({ 0xE9, 0xE2, 0x02, 0x00, 0x00 });  // JZ  --> JMP | Prevent call to 'CMod_LoadTextures()'.
+	CollisionBSPData_LoadAllLumps.Offset(0x1045).Patch({ 0x90, 0x90, 0x90, 0x90, 0x90 }); // CAL --> NOP | Prevent call to 'Mod_LoadCubemapSamples()'.
+
+	CollisionBSPData_LinkPhysics.Offset(0x129).Patch({ 0x90, 0x90, 0x90 });               // MOV --> NOP | RCX is nullptr during dereference since shadersystem isn't initialized. Exception 'C0000005'.
+	CollisionBSPData_LinkPhysics.Offset(0x12C).Patch({ 0x90, 0x90, 0x90 });               // CAL --> NOP | Virtual call to 'CTexture' class member in RAX + 0x78 fails. Previous instruction could not dereference.
 
 	//-------------------------------------------------------------------------
-	// RUNTIME: RENDERING
+	// RUNTIME: PROP_STATIC
 	//-------------------------------------------------------------------------
-	r0.Patch({ 0xC3 });                                       // FUN --> RET | Called from CEngineClient and CEngineVGUI (Init()?).
-	gMatSync.Patch({ 0xC3 });                                 // FUN --> RET | Skip Matsync. Called from CMaterialSystem. TODO: Return in root caller.
-	r4.Patch({ 0xC3 });                                       // FUN --> RET | Clear render buffer? Called from CMatRenderContext and CTexture.
-	r5.Patch({ 0xC3 });                                       // FUN --> RET | Heavy render stuff. Called from CMatRenderContext.
-	r6.Patch({ 0xC3 });                                       // FUN --> RET | Set shader resource.
-	r7.Patch({ 0xC3, 0x90, 0x90, 0x90, 0x90 });               // FUN --> RET | Return early in lightmap and post processing code.
-	r8.Patch({ 0xC3, 0x90, 0x90, 0x90, 0x90, 0x90 });         // FUN --> RET | Return early.
-	e9.Offset(0x4AB).Patch({ 0x90, 0x90, 0x90, 0x90, 0x90 }); // CAL --> NOP | NOP call to prevent texture creation.
-	e9.Offset(0x4B5).Patch({ 0xC3 });                         // JMP --> RET | RET early to prevent 'PIXVIS' code execution.
+	// Note: At [14028F3B0 + 0x5C7] RSP seems to contain a block of pointers to data for the static prop rmdl in question. [RSP + 0x70] is a pointer to (what seems to be) shader/material data. The pointer will be NULL without a shader system.
+	p_CalcPropStaticFrustumCulling.Offset(0x5E0).Patch({ 0x90, 0x90, 0x90, 0x90, 0x90 });        // MOV --> NOP | RSP + 0x70 is a nullptr which gets moved to R13, R13 gets used here resulting in exception 'C0000005'.
+	p_CalcPropStaticFrustumCulling.Offset(0x5EB).Patch({ 0x90, 0x90, 0x90, 0x90, 0x90, 0x90 });  // CAL --> NOP | RAX is nullptr during virtual call resulting in exception 'C0000005'.
 
 	//-------------------------------------------------------------------------
-	// RUNTIME: USERINTERFACE
-	//-------------------------------------------------------------------------
-	SCR_BeginLoadingPlaque.Offset(0x427).Patch({ 0xEB, 0x09 }); // JNE --> JMP | Skip call to VGUI 'SCR_BeginLoadingPlaque'.
-
-	//-------------------------------------------------------------------------
-	// RUNTIME: RPAK_DISPATCH
-	//-------------------------------------------------------------------------
-	//gShaderDispatch.Offset(0x25).Patch({ 0x90, 0x90, 0x90, 0x90, 0x90 });
-	gShaderDispatch.Offset(0x3C).Patch({ 0x90, 0x90, 0x90, 0x90, 0x90 }); // CAL --> NOP | Prevent memory allocation and population for shader assets.
-	gShaderDispatch.Offset(0x48).Patch({ 0x90, 0x90, 0x90, 0x90, 0x90 }); // CAL --> NOP | Prevent memory allocation and population for shader assets.
-	gShaderDispatch.Offset(0x56).Patch({ 0x90, 0x90, 0x90, 0x90, 0x90 }); // CAL --> NOP | Prevent memory allocation and population for shader assets.
-	gShaderDispatch.Offset(0x62).Patch({ 0x90, 0x90, 0x90, 0x90, 0x90 }); // CAL --> NOP | Prevent memory allocation and population for shader assets.
-
-	// UNKNOWN ----------------------------------------------------------------
-	ADDRESS t8 = 0x00000001403C0480;
-	t8.Patch({ 0xC3 }); // Return from unknown call during ChangeLevel. [LATE]
-	ADDRESS t9 = 0x00000001403EE420;
-	t9.Patch({ 0xC3 }); // Return from unknown call during ChangeLevel. [EARLY]
-	//-------------------------------------------------------------------------
-	// RUNTIME BLOCK
-	//-------------------------------------------------------------------------
-	ADDRESS t0 = 0x00000001401D71E0;
-	//t0.Patch({ 0xC3 });                                               // RPak unload?
-	ADDRESS t1 = 0x0000000140456B50;
-	t1.Offset(0x292).Patch({ 0xE9, 0xEE, 0x00, 0x00, 0x00 });
-	ADDRESS t2 = 0x0000000140238DA0;
-	t2.Offset(0x4E0).Patch({ 0x90, 0x90, 0x90, 0x90, 0x90 });
-	ADDRESS t3 = 0x0000000140312D80;
-	//t3.Offset(0xB3).Patch({ 0x90, 0x90, 0x90, 0x90, 0x90 });
-	ADDRESS t4 = 0x0000000140312D80; // Patch Additional shader preloading.
-	//t4.Offset(0xB3).Patch({ 0x90, 0x90, 0x90, 0x90, 0x90 });
-	ADDRESS t5 = 0x00000001403BBFD0;
-	t5.Offset(0x7D8).Patch({ 0x90, 0x90, 0x90, 0x90, 0x90 });
-	//-------------------------------------------------------------------------
-	// END RUNTIME BLOCK
+	// RUNTIME: GL_SCREEN
 	//-------------------------------------------------------------------------
+	SCR_BeginLoadingPlaque.Offset(0x82).Patch({ 0x90, 0x90, 0x90, 0x90, 0x90, 0x90 }); // JNE --> JMP | virtual call to 'CHLClient::CHudMessage'.
+	SCR_BeginLoadingPlaque.Offset(0xA4).Patch({ 0x90, 0x90, 0x90, 0x90, 0x90, 0x90 }); // JNE --> JMP | virtual call to 'CEngineVGui::OnLevelLoadingStarted'.
+	SCR_BeginLoadingPlaque.Offset(0x1D6).Patch({ 0xEB, 0x27 });                        // JNE --> JMP | Prevent connect command from crashing by invalid call to UI function.
 }
 #endif // DEDICATED
 
 void RuntimePtc_Init() /* .TEXT */
 {
-#ifdef DEDICATED
-	//-------------------------------------------------------------------------
-	// JNZ --> JMP | Prevent OriginSDK from initializing on the server
-	Origin_Init.Offset(0x0B).Patch({ 0xE9, 0x63, 0x02, 0x00, 0x00, 0x00 });
-	Origin_SetState.Offset(0x0E).Patch({ 0xE9, 0xCB, 0x03, 0x00, 0x00, 0x00 });
-#endif // DEDICATED
+	SCR_BeginLoadingPlaque.Offset(0x1D6).Patch({ 0xEB, 0x27 });                       // JNE --> JMP | Prevent connect command from crashing by invalid call to UI function.
 	//-------------------------------------------------------------------------
 	// JNE --> JMP | Allow games to be loaded without the optional texture streaming file
 	//WriteProcessMemory(GameProcess, LPVOID(dst002 + 0x8E5), "\xEB\x19", 2, NULL);
 	//-------------------------------------------------------------------------
-	// JNE --> JMP | Prevent connect command from crashing by invalid call to UI function
-	dst003.Offset(0x1D6).Patch({ 0xEB, 0x27 });
 	//-------------------------------------------------------------------------
-	// JA  --> JMP | Prevent FairFight anti-cheat from initializing on the 
+	// JA  --> JMP | Prevent FairFight anti-cheat from initializing on the server.
 	FairFight_Init.Offset(0x61).Patch({ 0xE9, 0xED, 0x00, 0x00, 0x00, 0x00 });
 }
 
@@ -218,14 +188,9 @@ void RuntimePtc_Toggle() /* .TEXT */
 	{
 		//-------------------------------------------------------------------------
 		// CALL --> NOP | Allow some maps to be loaded by nopping out a call in LoadProp function
-		//WriteProcessMemory(GameProcess, LPVOID(dst007 + 0x5E8), "\x90\x90\x90\x90\x90\x90\x90\x90\x90\x90\x90", 11, NULL);
-
 		dst007.Offset(0x5E8).Patch({ 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90 });
-
-
 		//-------------------------------------------------------------------------
 		// CALL --> NOP | Disable the viewmodel rendered to avoid a crash from a certain entity in desertlands_mu1
-		//WriteProcessMemory(GameProcess, LPVOID(dst008 + 0x67), "\x90\x90\x90\x90\x90", 5, NULL);
 		dst008.Offset(0x67).Patch({ 0x90, 0x90, 0x90, 0x90, 0x90 });
 
 
@@ -239,12 +204,9 @@ void RuntimePtc_Toggle() /* .TEXT */
 	{
 		//-------------------------------------------------------------------------
 		// NOP --> CALL | Recover function DST007
-		//WriteProcessMemory(GameProcess, LPVOID(dst007 + 0x5E8), "\x48\x8B\x03\xFF\x90\xB0\x02\x00\x00\x84\xC0", 11, NULL);
-
 		dst007.Offset(0x5E8).Patch({ 0x48, 0x8B, 0x03, 0xFF, 0x90, 0xB0, 0x02, 0x00, 0x00, 0x84, 0xC0 });
 		//-------------------------------------------------------------------------
 		// NOP --> CALL | Recover function DST008
-		//WriteProcessMemory(GameProcess, LPVOID(dst008 + 0x67), "\xE8\x54\xD8\xFF\xFF", 5, NULL);
 		dst008.Offset(0x67).Patch({ 0xE8, 0x54, 0xD8, 0xFF, 0xFF });
 
 		printf("\n");
diff --git a/r5dev/common/opcodes.h b/r5dev/common/opcodes.h
index db361103..dc4fc2ba 100644
--- a/r5dev/common/opcodes.h
+++ b/r5dev/common/opcodes.h
@@ -1,7 +1,12 @@
 #pragma once
-#include <iostream>
-#include <iomanip>
-#include "public/include/utility.h"
+namespace
+{
+#ifdef DEDICATED
+	const char* g_szGameDll = "r5apex_ds.exe";
+#else
+	const char* g_szGameDll = "r5apex.exe";
+#endif // DEDICATED
+}
 
 void Dedicated_Init();
 void RuntimePtc_Init();
@@ -9,110 +14,171 @@ void RuntimePtc_Toggle();
 
 namespace
 {
-	///* -------------- ORIGIN ------------------------------------------------------------------------------------------------------------------------------------------------ */
-	ADDRESS Origin_Init = /*0x14032EEA0*/ FindPatternSIMD("r5apex.exe", (const unsigned char*)"\x48\x83\xEC\x28\x80\x3D\x00\x00\x00\x23\x00\x0F\x85\x00\x02\x00", "xxxxxx???xxxx?xx");
-	ADDRESS Origin_SetState = /*0x140330290*/ FindPatternSIMD("r5apex.exe", (const unsigned char*)"\x48\x81\xEC\x58\x04\x00\x00\x80\x3D\x00\x00\x00\x00\x00\x0F\x84", "xxxxxxxxx????xxx");
-
-	///* -------------- ENGINE ------------------------------------------------------------------------------------------------------------------------------------------------ */
-	//ADDRESS dst002 = /*0x14043FB90*/ FindPatternSIMD("r5apex.exe", (const unsigned char*)"\x48\x89\x4C\x24\x08\x56\x41\x55\x48\x81\xEC\x68\x03\x00\x00\x4C", "xxxx?xxxxxxxxxxx");
-	ADDRESS dst003 = /*0x14022A4A0*/ FindPatternSIMD("r5apex.exe", (const unsigned char*)"\x48\x83\xEC\x38\x0F\x29\x74\x24\x20\x48\x89\x5C\x24\x40\x48\x8B", "xxxxxxxxxxxxxxxx");
-	ADDRESS Host_NewGame = /*0x140238DA0*/ FindPatternSIMD("r5apex.exe", (const unsigned char*)"\x48\x8B\xC4\x00\x41\x54\x41\x00\x48\x81\xEC\x00\x00\x00\x00\xF2", "xxx?xxx?xxx??xxx");
-
-	///* -------------- NETCHAN ----------------------------------------------------------------------------------------------------------------------------------------------- */
-	//ADDRESS CServer_Auth = /*0x14030D000*/ FindPatternSIMD("r5apex.exe", (const unsigned char*)"\x40\x55\x57\x41\x55\x41\x57\x48\x8D\xAC\x24\x28\xFF\xFF\xFF\x48", "xxxxxxxxxxxxxxxx");
-
-	///* -------------- FAIRFIGHT --------------------------------------------------------------------------------------------------------------------------------------------- */
-	ADDRESS FairFight_Init = /*0x140303AE0*/ FindPatternSIMD("r5apex.exe", (const unsigned char*)"\x40\x53\x48\x83\xEC\x20\x8B\x81\xB0\x03\x00\x00\x48\x8B\xD9\xC6", "xxxxxxxxxxxxxxxx");
-
-	///* -------------- OTHER ------------------------------------------------------------------------------------------------------------------------------------------------- */
-	ADDRESS dst007 = /*0x14028F3B0*/ FindPatternSIMD("r5apex.exe", (const unsigned char*)"\x48\x8B\xC4\x44\x89\x40\x18\x48\x89\x50\x10\x55\x53\x56\x57\x41", "xxxxxxxxxxxxxxxx");
-	ADDRESS dst008 = /*0x140E3E110*/ FindPatternSIMD("r5apex.exe", (const unsigned char*)"\x48\x83\xEC\x78\x48\x8B\x84\x24\x00\x00\x00\x00\x4D\x8B\xD8\x00", "xxxxxxxx????xxx?");
-
-	//ADDRESS dst009 = FindPatternSIMD("r5apex.exe", (const unsigned char*)"\x48\x8B\xC4\x55\x41\x54\x41\x55\x41\x56\x41\x57\x48\x8B\xEC\x48\x83\xEC\x60", "xxxxxxxxxxxxxxxxxxx");
-
-	///* -------------- ------- ----------------------------------------------------------------------------------------------------------------------------------------------- */
+	/* -------------- OTHER ------------------------------------------------------------------------------------------------------------------------------------------------- */
+	ADDRESS dst007 = /*0x14028F3B0*/ FindPatternSIMD(g_szGameDll, (const unsigned char*)"\x48\x8B\xC4\x44\x89\x40\x18\x48\x89\x50\x10\x55\x53\x56\x57\x41", "xxxxxxxxxxxxxxxx");
+	ADDRESS dst008 = /*0x140E3E110*/ FindPatternSIMD(g_szGameDll, (const unsigned char*)"\x48\x83\xEC\x78\x48\x8B\x84\x24\x00\x00\x00\x00\x4D\x8B\xD8\x00", "xxxxxxxx????xxx?");
+	/* -------------- ------- ----------------------------------------------------------------------------------------------------------------------------------------------- */
 
 	namespace
 	{
-		// TODO: create patterns instead and rename to function names.
-		// Renderer
-		ADDRESS r0 = 0x00000001402FE280; //
-		ADDRESS gCShaderGlue__Init = 0x00000001403B3A50; //
-		ADDRESS gMatSync = 0x00000001403DEE90; //
-		ADDRESS gCMaterialSystem__MatsysMode_Init = 0x00000001403BD120; //
-		ADDRESS r4 = 0x0000000140404380; //
-		ADDRESS r5 = 0x000000014040D850; //
-		ADDRESS r6 = 0x0000000140413260; //
-		ADDRESS r7 = 0x00000001404093F0; //
-		ADDRESS r8 = 0x00000001403D2E60; //
-		ADDRESS d3d11init = 0x000000014043CDF0; //
+	//-------------------------------------------------------------------------
+	// CGAME
+	//-------------------------------------------------------------------------
+		ADDRESS CVideoMode_Common__CreateGameWindow = g_mGameDll.FindPatternSIMD((std::uint8_t*)"\x40\x56\x57\x48\x83\xEC\x28\x48\x8B\xF9\xE8\x00\x00\x00\x00\x48\x8B\xF0", "xxxxxxxxxxx????xxx");
+		// 0x140299100 // 40 56 57 48 83 EC 28 48 8B F9 E8 ? ? ? ? 48 8B F0 //
 
-		// Engine
-		ADDRESS gHost_Init_0 = 0x0000000140236E40; // main Host_Init()?
-		ADDRESS e1 = 0x0000000140FB2F10; // also used by CServerGameDLL
-		ADDRESS addr_CEngine_Frame = 0x00000001402970E0;
-		ADDRESS e3 = 0x0000000140231C00;
-		ADDRESS e4 = 0x0000000140BE1970;
-		ADDRESS e5 = 0x0000000140DBBAF0;
-		ADDRESS e6 = 0x0000000140DBE610;
-		ADDRESS e7 = 0x000000014044AFA0;
-		ADDRESS e8 = 0x000000014027EC50; // RenderFrame?
-		ADDRESS gCEngineAPI__Init = 0x0000000140342FB0; //
-		ADDRESS gCEngineAPI__ModInit = 0x0000000140343DE0; //
-		ADDRESS gCEngineAPI__Connect = 0x0000000140342BA0; //
-		ADDRESS gCEngineAPI__OnStartup = 0x0000000140343860; //
-		ADDRESS gCSourceAppSystemGroup__Create = 0x000000014044AFA0; //
-		ADDRESS gCShaderSystem__Init = 0x00000001403DF870; //
-		ADDRESS gInitMaterialSystem = 0x000000014024B390; //
-		ADDRESS gCVideoMode_Common__DrawStartupGraphic = 0x000000014027F0F0; //
-		ADDRESS gShaderDispatch = 0x00000001403EE5C0;
-		ADDRESS gShaderCreate = 0x00000001403ECD00; //
-		ADDRESS gTextureCreate = 0x00000001403EDCD0;
+	//-------------------------------------------------------------------------
+	// CHLClIENT
+	//-------------------------------------------------------------------------
+		ADDRESS gCHLClient__1000 = g_mGameDll.FindPatternSIMD((std::uint8_t*)"\x48\x83\xEC\x28\x0F\xB6\x0D\x00\x00\x00\x00\x88\x15\x00\x00\x00\x00", "xxxxxxx????xx????"); // CHLClient + 1000
+		// 0x1405C27B0 // 48 83 EC 28 0F B6 0D ? ? ? ? 88 15 ? ? ? ? //
 
-		ADDRESS gCShaderSystem__9 = 0x00000001403DFC30;
-		ADDRESS gBSP_LUMP_INIT = 0x00000001402546F0; // BSP.
+	//-------------------------------------------------------------------------
+	// CSOURCEAPPSYSTEMGROUP
+	//-------------------------------------------------------------------------
+		ADDRESS gCSourceAppSystemGroup__Create = g_mGameDll.FindPatternSIMD((std::uint8_t*)"\x48\x89\x5C\x24\x00\x48\x89\x74\x24\x00\x57\x48\x83\xEC\x20\x48\x8B\xF9\xE8\x00\x00\x00\x00\x33\xC9", "xxxx?xxxx?xxxxxxxxx????xx");
+		// 0x14044AFA0 // 48 89 5C 24 ? 48 89 74 24 ? 57 48 83 EC 20 48 8B F9 E8 ? ? ? ? 33 C9 //
+
+	//-------------------------------------------------------------------------
+	// MM_HEARTBEAT
+	//-------------------------------------------------------------------------
+		ADDRESS MM_Heartbeat__ToString = g_mGameDll.FindPatternSIMD((std::uint8_t*)"\x48\x83\xEC\x38\xE8\x00\x00\x00\x00\x3B\x05\x00\x00\x00\x00", "xxxxx????xx????"); // server HeartBeat? (baseserver.cpp).
+		// 0x1402312A0 // 48 83 EC 38 E8 ? ? ? ? 3B 05 ? ? ? ? //
+
+	//-------------------------------------------------------------------------
+	// RUNTIME: SYS_INITGAME
+	//-------------------------------------------------------------------------
+		ADDRESS Sys_InitGame = g_mGameDll.FindPatternSIMD((std::uint8_t*)"\x48\x89\x5C\x24\x00\x57\x48\x81\xEC\x00\x00\x00\x00\x80\x3D\x00\x00\x00\x00\x00\x41\x8B\xD8", "xxxx?xxxx????xx?????xxx");
+		// 0x1402958D0 // 48 89 5C 24 ? 57 48 81 EC ? ? ? ? 80 3D ? ? ? ? ? 41 8B D8 //
+
+	//-------------------------------------------------------------------------
+	// CSHADERSYSTEM
+	//-------------------------------------------------------------------------
+		ADDRESS CShaderSystem__Init = g_mGameDll.FindPatternSIMD((std::uint8_t*)"\x48\x89\x5C\x24\x00\x48\x89\x74\x24\x00\x57\x48\x83\xEC\x20\xC6\x41\x10\x00", "xxxx?xxxx?xxxxxxxxx");
+		// 0x1403DF870 // 48 89 5C 24 ? 48 89 74 24 ? 57 48 83 EC 20 C6 41 10 00 //
+
+	//-------------------------------------------------------------------------
+	// CMATERIALSYSTEM
+	//-------------------------------------------------------------------------
+		ADDRESS CMaterialSystem__Init = g_mGameDll.FindPatternSIMD((std::uint8_t*)"\x48\x89\x5C\x24\x00\x55\x56\x57\x41\x54\x41\x55\x41\x56\x41\x57\x48\x83\xEC\x70\x48\x83\x3D\x00\x00\x00\x00\x00", "xxxx?xxxxxxxxxxxxxxxxxx?????");
+		// 0x1403BBFD0 // 48 89 5C 24 ? 55 56 57 41 54 41 55 41 56 41 57 48 83 EC 70 48 83 3D ? ? ? ? ? //
+
+		ADDRESS InitMaterialSystem = g_mGameDll.FindPatternSIMD((std::uint8_t*)"\x48\x83\xEC\x28\x48\x8B\x0D\x00\x00\x00\x00\x48\x8D\x15\x00\x00\x00\x00\x48\x8B\x01\xFF\x90\x00\x00\x00\x00\x48\x8B\x0D\x00\x00\x00\x00\x48\x8D\x15\x00\x00\x00\x00\x48\x8B\x01\xFF\x90\x00\x00\x00\x00", "xxxxxxx????xxx????xxxxx????xxx????xxx????xxxxx????"); //
+		// 0x14024B390 // 48 83 EC 28 48 8B 0D ? ? ? ? 48 8D 15 ? ? ? ? 48 8B 01 FF 90 ? ? ? ? 48 8B 0D ? ? ? ? 48 8D 15 ? ? ? ? 48 8B 01 FF 90 ? ? ? ? //
+
+	//-------------------------------------------------------------------------
+	// RUNTIME: BSP_LUMP
+	//-------------------------------------------------------------------------
+		ADDRESS CollisionBSPData_LoadAllLumps = g_mGameDll.FindPatternSIMD((std::uint8_t*)"\x48\x89\x54\x24\x00\x48\x89\x4C\x24\x00\x55\x53\x56\x57\x41\x54\x41\x55\x41\x57", "xxxx?xxxx?xxxxxxxxxx"); // BSP.
+		// 0x1402546F0 // 48 89 54 24 ? 48 89 4C 24 ? 55 53 56 57 41 54 41 55 41 57 //
+
+		ADDRESS CollisionBSPData_LinkPhysics = g_mGameDll.FindPatternSIMD((std::uint8_t*)"\x48\x89\x5C\x24\x00\x48\x89\x6C\x24\x00\x57\x48\x81\xEC\x00\x00\x00\x00\x48\x8B\xF9\x33\xED", "xxxx?xxxx?xxxx????xxxxx"); // case 1: only gets called on changelevel, needs more research, function gets called by CModelLoader virtual function.
+		// 0x140256480 // 48 89 5C 24 ? 48 89 6C 24 ? 57 48 81 EC ? ? ? ? 48 8B F9 33 ED //
 
 
-		ADDRESS e9 = 0x00000001404066E0;
-		ADDRESS e10 = 0x00000001403B49E0; // CMaterialGlue?
+	//-------------------------------------------------------------------------
+	// CSTUDIORENDERCONTEXT
+	//-------------------------------------------------------------------------
+		ADDRESS CStudioRenderContext__LoadModel = g_mGameDll.FindPatternSIMD((std::uint8_t*)"\x4C\x89\x44\x24\x00\x48\x89\x54\x24\x00\x48\x89\x4C\x24\x00\x53\x55\x56\x57\x48\x83\xEC\x78", "xxxx?xxxx?xxxx?xxxxxxxx");
+		// 0x1404554C0 // 4C 89 44 24 ? 48 89 54 24 ? 48 89 4C 24 ? 53 55 56 57 48 83 EC 78 //
 
-		// SERVER
-		ADDRESS gHost_Init_1 = 0x0000000140237B00; // server Host_Init()?
-		ADDRESS s1 = 0x0000000140231C00; // _Host_RunFrame() with inlined CFrameTimer::MarkFrame()?
-		ADDRESS s2 = 0x00000001402312A0; // server HeartBeat? (baseserver.cpp)
-		ADDRESS s3 = 0x0000000140FB36D0; // TEMP??
+		ADDRESS CStudioRenderContext__LoadMaterials = g_mGameDll.FindPatternSIMD((std::uint8_t*)"\x48\x8B\xC4\x4C\x89\x40\x18\x55\x56\x41\x55", "xxxxxxxxxxx");
+		// 0x140456B50 // 48 8B C4 4C 89 40 18 55 56 41 55 //
 
-		// CLIENT
-		ADDRESS gHost_Init_2 = 0x0000000140236640; // client Host_Init()?
-		ADDRESS gCGame__CreateGameWindow = 0x0000000140299100; //
-		ADDRESS c2 = 0x00000001403F4360; // 1403DF870 --> 1403F4360
-		ADDRESS c3 = 0x00000001403F8A80; // 1403DF870 --> 1403F8A40
-		ADDRESS gCHLClient__1000 = 0x00000001405C27B0; // CHLClient + 1000
-		ADDRESS gCHLClient__HudMessage = 0x00000001405BAC00; // CHudMessage
-		ADDRESS c6 = 0x00000001403CA2D0; //
+	//-------------------------------------------------------------------------
+	// CMODELLOADER
+	//-------------------------------------------------------------------------
+		ADDRESS CModelLoader__FindModel = g_mGameDll.FindPatternSIMD((std::uint8_t*)"\x40\x55\x41\x57\x48\x83\xEC\x48\x80\x3A\x2A", "xxxxxxxxxxx");
+		// 0x140253530 // 40 55 41 57 48 83 EC 48 80 3A 2A //
 
-		// VGUI
-		ADDRESS gCEngineVGui__Init = 0x0000000140282E40; // jumptable
-		ADDRESS gCEngineVGui__OnLevelLoadingStarted = 0x00000001402830D0;
-		ADDRESS SCR_BeginLoadingPlaque = 0x000000014023E870;
-	}
+		ADDRESS CModelLoader__LoadModel = g_mGameDll.FindPatternSIMD((std::uint8_t*)"\x40\x53\x57\x41\x57\x48\x81\xEC\x00\x00\x00\x00\x48\x8B\x05\x00\x00\x00\x00", "xxxxxxxx????xxx????");
+		// 0x140253810 // 40 53 57 41 57 48 81 EC ? ? ? ? 48 8B 05 ? ? ? ? //
 
-	void PrintOAddress() // Test the sigscan results
-	{
-		std::cout << "+--------------------------------------------------------+" << std::endl;
-		std::cout << "| Origin_Init              : " << std::hex << std::uppercase << Origin_Init.GetPtr() << std::setw(20) << " |" << std::endl;
-		std::cout << "| Origin_SetState          : " << std::hex << std::uppercase << Origin_SetState.GetPtr() << std::setw(20) << " |" << std::endl;
-		std::cout << "+--------------------------------------------------------+" << std::endl;
-		//std::cout << "| dst002                   : " << std::hex << std::uppercase << dst002.GetPtr() << std::setw(20) << " |" << std::endl;
-		std::cout << "| dst003                   : " << std::hex << std::uppercase << dst003.GetPtr() << std::setw(20) << " |" << std::endl;
-		//std::cout << "| Host_NewGame             : " << std::hex << std::uppercase << Host_NewGame.GetPtr() << std::setw(20) << " |" << std::endl;
-		std::cout << "+--------------------------------------------------------+" << std::endl;
-		//std::cout << "| CServer_Auth             : " << std::hex << std::uppercase << CServer_Auth.GetPtr() << std::setw(20) << " |" << std::endl;
-		std::cout << "+--------------------------------------------------------+" << std::endl;
-		std::cout << "| FairFight_Init           : " << std::hex << std::uppercase << FairFight_Init.GetPtr() << std::setw(20) << " |" << std::endl;
-		std::cout << "+--------------------------------------------------------+" << std::endl;
-		std::cout << "| dst007                   : " << std::hex << std::uppercase << dst007.GetPtr() << std::setw(20) << " |" << std::endl;
-		std::cout << "| dst008                   : " << std::hex << std::uppercase << dst008.GetPtr() << std::setw(20) << " |" << std::endl;
-		std::cout << "+--------------------------------------------------------+" << std::endl;
+		ADDRESS CModelLoader__Studio_LoadModel = g_mGameDll.FindPatternSIMD((std::uint8_t*)"\x48\x89\x5C\x24\x00\x55\x56\x57\x41\x54\x41\x57\x48\x81\xEC\x00\x00\x00\x00", "xxxx?xxxxxxxxxx????");
+		// 0x140252F10 // 48 89 5C 24 ? 55 56 57 41 54 41 57 48 81 EC ? ? ? ? //
+
+	//-------------------------------------------------------------------------
+	// CGAMESERVER
+	//-------------------------------------------------------------------------
+		ADDRESS CGameServer__SpawnServer = g_mGameDll.FindPatternSIMD((std::uint8_t*)"\x48\x8B\xC4\x53\x55\x56\x57\x41\x54\x41\x55\x41\x57", "xxxxxxxxxxxxx");
+		// 0x140312D80 // 48 8B C4 53 55 56 57 41 54 41 55 41 57 //
+
+	//-------------------------------------------------------------------------
+	// RUNTIME: FAIRFIGHT
+	//-------------------------------------------------------------------------
+		ADDRESS FairFight_Init = g_mGameDll.FindPatternSIMD((std::uint8_t*)"\x40\x53\x48\x83\xEC\x20\x8B\x81\xB0\x03\x00\x00\x48\x8B\xD9\xC6", "xxxxxxxxxxxxxxxx");
+		// 0x140303AE0 // 40 53 48 83 EC 20 8B 81 ? ? ? ? 48 8B D9 C6 81 ? ? ? ? ? //
+
+	//-------------------------------------------------------------------------
+	// RUNTIME: HOST_INIT
+	//-------------------------------------------------------------------------
+		ADDRESS gHost_Init_0 = g_mGameDll.FindPatternSIMD((std::uint8_t*)"\x48\x89\x5C\x24\x00\x48\x89\x74\x24\x00\x48\x89\x7C\x24\x00\x55\x41\x54\x41\x55\x41\x56\x41\x57\x48\x8D\xAC\x24\x00\x00\x00\x00\xB8\x00\x00\x00\x00\xE8\x00\x00\x00\x00\x48\x2B\xE0\x48\x8B\xD9", "xxxx?xxxx?xxxx?xxxxxxxxxxxxx????x????x????xxxxxx"); // main Host_Init()?
+		// 0x140236E40 // 48 89 5C 24 ? 48 89 74 24 ? 48 89 7C 24 ? 55 41 54 41 55 41 56 41 57 48 8D AC 24 ? ? ? ? B8 ? ? ? ? E8 ? ? ? ? 48 2B E0 48 8B D9 //
+
+		ADDRESS gHost_Init_1 = g_mGameDll.FindPatternSIMD((std::uint8_t*)"\x48\x8B\xC4\x41\x56\x48\x81\xEC\x00\x00\x00\x00\x45\x33\xF6", "xxxxxxxx????xxx"); // server Host_Init()?
+		// 0x140237B00 // 48 8B C4 41 56 48 81 EC ? ? ? ? 45 33 F6 //
+
+		ADDRESS gHost_Init_2 = g_mGameDll.FindPatternSIMD((std::uint8_t*)"\x88\x4C\x24\x08\x53\x55\x56\x57\x48\x83\xEC\x68", "xxxxxxxxxxxx"); // client Host_Init()?
+		// 0x140236640 // 88 4C 24 08 53 55 56 57 48 83 EC 68 //
+
+	//-------------------------------------------------------------------------
+	// RUNTIME: _HOST_RUNFRAME
+	//-------------------------------------------------------------------------
+		ADDRESS _Host_RunFrame = g_mGameDll.FindPatternSIMD((std::uint8_t*)"\x48\x8B\xC4\x48\x89\x58\x18\x48\x89\x70\x20\xF3\x0F\x11\x48\x00", "xxxxxxxxxxxxxxx?"); // _Host_RunFrame() with inlined CFrameTimer::MarkFrame()?
+		// 0x140231C00 // 48 8B C4 48 89 58 18 48 89 70 20 F3 0F 11 48 ? //
+
+	//-------------------------------------------------------------------------
+	// RUNTIME: HOST_NEWGAME
+	//-------------------------------------------------------------------------
+		ADDRESS Host_NewGame = g_mGameDll.FindPatternSIMD((std::uint8_t*)"\x48\x8B\xC4\x00\x41\x54\x41\x00\x48\x81\xEC\x00\x00\x00\x00\xF2", "xxx?xxx?xxx??xxx");
+		// 0x140238DA0 // 48 8B C4 ?? 41 54 41 ?? 48 81 EC ?? ?? 00 00 F2 //
+
+	//-------------------------------------------------------------------------
+	// RUNTIME: GL_SCREEN
+	//-------------------------------------------------------------------------
+		ADDRESS SCR_BeginLoadingPlaque = g_mGameDll.FindPatternSIMD((std::uint8_t*)"\x48\x83\xEC\x38\x0F\x29\x74\x24\x00\x48\x89\x5C\x24\x00", "xxxxxxxx?xxxx?");
+		// 0x14022A4A0 // 48 83 EC 38 0F 29 74 24 ? 48 89 5C 24 ? //
 	}
 }
+
+///////////////////////////////////////////////////////////////////////////////
+class HOpcodes : public IDetour
+{
+	virtual void debugp()
+	{
+		std::cout << "| FUN: CVideoMode_Common::CreateGameWindow  : 0x" << std::hex << std::uppercase << CVideoMode_Common__CreateGameWindow.GetPtr() << std::setw(npad) << " |" << std::endl;
+		std::cout << "| FUN: CHLClient::Unk1000                   : 0x" << std::hex << std::uppercase << gCHLClient__1000.GetPtr()                    << std::setw(npad) << " |" << std::endl;
+		std::cout << "| FUN: MM_Heartbeat::ToString               : 0x" << std::hex << std::uppercase << MM_Heartbeat__ToString.GetPtr()              << std::setw(npad) << " |" << std::endl;
+		std::cout << "| FUN: Sys_InitGame                         : 0x" << std::hex << std::uppercase << Sys_InitGame.GetPtr()                        << std::setw(npad) << " |" << std::endl;
+		std::cout << "+----------------------------------------------------------------+" << std::endl;
+		std::cout << "| FUN: CShaderSystem::Init                  : 0x" << std::hex << std::uppercase << CShaderSystem__Init.GetPtr()                 << std::setw(npad) << " |" << std::endl;
+		std::cout << "+----------------------------------------------------------------+" << std::endl;
+		std::cout << "| FUN: CMaterialSystem::Init                : 0x" << std::hex << std::uppercase << CMaterialSystem__Init.GetPtr()               << std::setw(npad) << " |" << std::endl;
+		std::cout << "| FUN: InitMaterialSystem                   : 0x" << std::hex << std::uppercase << InitMaterialSystem.GetPtr()                  << std::setw(npad) << " |" << std::endl;
+		std::cout << "+----------------------------------------------------------------+" << std::endl;
+		std::cout << "| FUN: CollisionBSPData_LoadAllLumps        : 0x" << std::hex << std::uppercase << CollisionBSPData_LoadAllLumps.GetPtr()       << std::setw(npad) << " |" << std::endl;
+		std::cout << "| FUN: CollisionBSPData_LinkPhysics         : 0x" << std::hex << std::uppercase << CollisionBSPData_LinkPhysics.GetPtr()        << std::setw(npad) << " |" << std::endl;
+		std::cout << "+----------------------------------------------------------------+" << std::endl;
+		std::cout << "| FUN: CStudioRenderContext::LoadModel      : 0x" << std::hex << std::uppercase << CStudioRenderContext__LoadModel.GetPtr()     << std::setw(npad) << " |" << std::endl;
+		std::cout << "| FUN: CStudioRenderContext::LoadMaterials  : 0x" << std::hex << std::uppercase << CStudioRenderContext__LoadMaterials.GetPtr() << std::setw(npad) << " |" << std::endl;
+		std::cout << "+----------------------------------------------------------------+" << std::endl;
+		std::cout << "| FUN: CModelLoader::FindModel              : 0x" << std::hex << std::uppercase << CModelLoader__FindModel.GetPtr()             << std::setw(npad) << " |" << std::endl;
+		std::cout << "| FUN: CModelLoader::LoadModel              : 0x" << std::hex << std::uppercase << CModelLoader__LoadModel.GetPtr()             << std::setw(npad) << " |" << std::endl;
+		std::cout << "| FUN: CModelLoader::Studio_LoadModel       : 0x" << std::hex << std::uppercase << CModelLoader__Studio_LoadModel.GetPtr()      << std::setw(npad) << " |" << std::endl;
+		std::cout << "+----------------------------------------------------------------+" << std::endl;
+		std::cout << "| FUN: CGameServer::SpawnServer             : 0x" << std::hex << std::uppercase << CGameServer__SpawnServer.GetPtr()            << std::setw(npad) << " |" << std::endl;
+		std::cout << "| FUN: FairFight_Init                       : 0x" << std::hex << std::uppercase << FairFight_Init.GetPtr()                      << std::setw(npad) << " |" << std::endl;
+		std::cout << "+----------------------------------------------------------------+" << std::endl;
+		std::cout << "| FUN: Host_Init_0                          : 0x" << std::hex << std::uppercase << gHost_Init_0.GetPtr()                        << std::setw(npad) << " |" << std::endl;
+		std::cout << "| FUN: Host_Init_1                          : 0x" << std::hex << std::uppercase << gHost_Init_1.GetPtr()                        << std::setw(npad) << " |" << std::endl;
+		std::cout << "| FUN: Host_Init_2                          : 0x" << std::hex << std::uppercase << gHost_Init_2.GetPtr()                        << std::setw(npad) << " |" << std::endl;
+		std::cout << "| FUN: _Host_RunFrame                       : 0x" << std::hex << std::uppercase << _Host_RunFrame.GetPtr()                      << std::setw(npad) << " |" << std::endl;
+		std::cout << "| FUN: Host_NewGame                         : 0x" << std::hex << std::uppercase << Host_NewGame.GetPtr()                        << std::setw(npad) << " |" << std::endl;
+		std::cout << "+----------------------------------------------------------------+" << std::endl;
+		std::cout << "| FUN: SCR_BeginLoadingPlaque               : 0x" << std::hex << std::uppercase << SCR_BeginLoadingPlaque.GetPtr()              << std::setw(npad) << " |" << std::endl;
+		std::cout << "+----------------------------------------------------------------+" << std::endl;
+	}
+};
+///////////////////////////////////////////////////////////////////////////////
+
+REGISTER(HOpcodes);
diff --git a/r5dev/core/dllmain.cpp b/r5dev/core/dllmain.cpp
index fd6f8e8e..c6627918 100644
--- a/r5dev/core/dllmain.cpp
+++ b/r5dev/core/dllmain.cpp
@@ -7,6 +7,7 @@
 #include "windows/input.h"
 #endif // !DEDICATED
 #include "windows/console.h"
+#include "windows/system.h"
 
 //#############################################################################
 // INITIALIZATION
@@ -16,6 +17,7 @@ void R5Dev_Init()
 {
     Console_Init();
     Systems_Init();
+    WinSys_Attach();
 
 #ifndef DEDICATED
     Input_Init();
@@ -32,6 +34,7 @@ void R5Dev_Init()
 void R5Dev_Shutdown()
 {
     Systems_Shutdown();
+    WinSys_Detach();
 
 #ifndef DEDICATED
     Input_Shutdown();
diff --git a/r5dev/core/init.cpp b/r5dev/core/init.cpp
index fe4f928b..6415b139 100644
--- a/r5dev/core/init.cpp
+++ b/r5dev/core/init.cpp
@@ -47,7 +47,6 @@
 #endif // !DEDICATED
 
 
-
 /////////////////////////////////////////////////////////////////////////////////////////////////
 //
 // ██╗███╗   ██╗██╗████████╗██╗ █████╗ ██╗     ██╗███████╗ █████╗ ████████╗██╗ ██████╗ ███╗   ██╗
diff --git a/r5dev/core/stdafx.h b/r5dev/core/stdafx.h
index 1de1db21..0688b919 100644
--- a/r5dev/core/stdafx.h
+++ b/r5dev/core/stdafx.h
@@ -50,7 +50,11 @@
 #ifndef SDKLAUNCHER
 namespace
 {
-	MODULE g_mGameDll            = MODULE("r5apex.exe");
+#ifdef DEDICATED
+	MODULE g_mGameDll = MODULE("r5apex_ds.exe");
+#else
+	MODULE g_mGameDll = MODULE("r5apex.exe");
+#endif // DEDICATED
 	MODULE g_mRadVideoToolsDll   = MODULE("bink2w64.dll");
 	MODULE g_mRadAudioDecoderDll = MODULE("binkawin64.dll");
 	MODULE g_mRadAudioSystemDll  = MODULE("mileswin64.dll");
diff --git a/r5dev/dedicated.vcxproj b/r5dev/dedicated.vcxproj
index a5aa1bae..c8745802 100644
--- a/r5dev/dedicated.vcxproj
+++ b/r5dev/dedicated.vcxproj
@@ -324,6 +324,7 @@
     <ClInclude Include="vphysics\QHull.h" />
     <ClInclude Include="vpklib\packedstore.h" />
     <ClInclude Include="windows\console.h" />
+    <ClInclude Include="windows\system.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="bsplib\bsplib.cpp" />
@@ -371,6 +372,7 @@
     <ClCompile Include="vphysics\QHull.cpp" />
     <ClCompile Include="vpklib\packedstore.cpp" />
     <ClCompile Include="windows\console.cpp" />
+    <ClCompile Include="windows\system.cpp" />
   </ItemGroup>
   <ItemGroup>
     <None Include="r5dev.def" />
diff --git a/r5dev/dedicated.vcxproj.filters b/r5dev/dedicated.vcxproj.filters
index b4c53d81..6c025bbc 100644
--- a/r5dev/dedicated.vcxproj.filters
+++ b/r5dev/dedicated.vcxproj.filters
@@ -564,6 +564,9 @@
     <ClInclude Include="rtech\rtech_game.h">
       <Filter>sdk\rtech</Filter>
     </ClInclude>
+    <ClInclude Include="windows\system.h">
+      <Filter>windows</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="client\IVEngineClient.cpp">
@@ -692,6 +695,9 @@
     <ClCompile Include="rtech\rtech_game.cpp">
       <Filter>sdk\rtech</Filter>
     </ClCompile>
+    <ClCompile Include="windows\system.cpp">
+      <Filter>windows</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="r5dev.def" />
diff --git a/r5dev/ebisusdk/EbisuSDK.h b/r5dev/ebisusdk/EbisuSDK.h
index 41157b8e..4b8bb1e2 100644
--- a/r5dev/ebisusdk/EbisuSDK.h
+++ b/r5dev/ebisusdk/EbisuSDK.h
@@ -11,9 +11,9 @@ namespace
 
 	ADDRESS p_EbisuSDK_CVar_Init = g_mGameDll.FindPatternSIMD((std::uint8_t*)"\x40\x57\x48\x83\xEC\x40\x83\x3D", "xxxxxxxx");
 	void(*EbisuSDK_CVar_Init) = (void(*))p_EbisuSDK_CVar_Init.GetPtr(); /*40 57 48 83 EC 40 83 3D*/
-#else
-	ADDRESS p_OriginGetErrorDescription = g_mGameDll.FindPatternSIMD((std::uint8_t*)"\x40\x53\x48\x83\xEC\x20\x8B\xD9\x48\x8D\x15\x00\x00\x00\x00", "xxxxxxxxxxx????").GetPtr();
-	void(*OriginGetErrorDescription) = (void(*))p_OriginGetErrorDescription.GetPtr(); /*40 53 48 83 EC 20 8B D9 48 8D 15 ?? ?? ?? ??*/
+
+	ADDRESS p_EbisuSDK_SetState = g_mGameDll.FindPatternSIMD((std::uint8_t*)"\x48\x81\xEC\x00\x00\x00\x00\x80\x3D\x00\x00\x00\x00\x00\x0F\x84\x00\x00\x00\x00\x80\x3D\x00\x00\x00\x00\x00\x74\x5B", "xxx????xx?????xx????xx?????xx");
+	void(*EbisuSDK_SetState) = (void(*))p_EbisuSDK_SetState.GetPtr(); /* 48 81 EC ? ? ? ? 80 3D ? ? ? ? ? 0F 84 ? ? ? ? 80 3D ? ? ? ? ? 74 5B  */
 #endif
 }
 
@@ -22,15 +22,15 @@ namespace
 #ifdef DEDICATED
 #if defined (GAMEDLL_S1)
 	ADDRESS g_bEbisuSDKInitialized = p_EbisuSDK_Init_Tier0.FindPatternSelf("80 3D ?? ?? ?? ?? 00", ADDRESS::Direction::DOWN, 150).ResolveRelativeAddressSelf(0x2, 0x7).GetPtr();
-	ADDRESS g_bEbisuSDKCvarInitialized = p_Map_Callback.FindPatternSelf("80 3D 8F 7C 1E 22 00", ADDRESS::Direction::DOWN, 150).ResolveRelativeAddressSelf(0x2, 0x7).GetPtr();
+	ADDRESS g_bEbisuSDKCvarInitialized = p_Host_Map_f_CompletionFunc.FindPatternSelf("80 3D 8F 7C 1E 22 00", ADDRESS::Direction::DOWN, 150).ResolveRelativeAddressSelf(0x2, 0x7).GetPtr();
 	ADDRESS g_qEbisuSDKCvarInitialized = p_EbisuSDK_CVar_Init.FindPatternSelf("4C 89 05 C4 2B 0E 22", ADDRESS::Direction::DOWN, 150).ResolveRelativeAddressSelf(0x3, 0x7).GetPtr();
 #elif defined (GAMEDLL_S2)
 	ADDRESS g_bEbisuSDKInitialized = p_EbisuSDK_Init_Tier0.FindPatternSelf("80 3D ?? ?? ?? ?? 00", ADDRESS::Direction::DOWN, 150).ResolveRelativeAddressSelf(0x2, 0x7).GetPtr();
-	ADDRESS g_bEbisuSDKCvarInitialized = p_Map_Callback.FindPatternSelf("80 3D 43 2D 41 22 00", ADDRESS::Direction::DOWN, 150).ResolveRelativeAddressSelf(0x2, 0x7).GetPtr();
+	ADDRESS g_bEbisuSDKCvarInitialized = p_Host_Map_f_CompletionFunc.FindPatternSelf("80 3D 43 2D 41 22 00", ADDRESS::Direction::DOWN, 150).ResolveRelativeAddressSelf(0x2, 0x7).GetPtr();
 	ADDRESS g_qEbisuSDKCvarInitialized = p_EbisuSDK_CVar_Init.FindPatternSelf("4C 89 05 74 2D 32 22", ADDRESS::Direction::DOWN, 150).ResolveRelativeAddressSelf(0x3, 0x7).GetPtr();
 #elif defined (GAMEDLL_S3)
 	ADDRESS g_bEbisuSDKInitialized = p_EbisuSDK_Init_Tier0.FindPatternSelf("80 3D ?? ?? ?? ?? 00", ADDRESS::Direction::DOWN, 150).ResolveRelativeAddressSelf(0x2, 0x7).GetPtr();
-	ADDRESS g_bEbisuSDKCvarInitialized = p_Map_Callback.FindPatternSelf("80 3D 23 54 2B 23 00", ADDRESS::Direction::DOWN, 150).ResolveRelativeAddressSelf(0x2, 0x7).GetPtr();
+	ADDRESS g_bEbisuSDKCvarInitialized = p_Host_Map_f_CompletionFunc.FindPatternSelf("80 3D 23 54 2B 23 00", ADDRESS::Direction::DOWN, 150).ResolveRelativeAddressSelf(0x2, 0x7).GetPtr();
 	ADDRESS g_qEbisuSDKCvarInitialized = p_EbisuSDK_CVar_Init.FindPatternSelf("4C 89 05 B4 2C 1C 23", ADDRESS::Direction::DOWN, 150).ResolveRelativeAddressSelf(0x3, 0x7).GetPtr();
 #endif // GAMEDLL_*
 #endif // DEDICATED
@@ -50,13 +50,12 @@ class HEbisuSDK : public IDetour
 #ifdef DEDICATED
 		std::cout << "| FUN: EbisuSDK_Init_Tier0                  : 0x" << std::hex << std::uppercase << p_EbisuSDK_Init_Tier0.GetPtr()       << std::setw(npad) << " |" << std::endl;
 		std::cout << "| FUN: EbisuSDK_CVar_Init                   : 0x" << std::hex << std::uppercase << p_EbisuSDK_CVar_Init.GetPtr()        << std::setw(npad) << " |" << std::endl;
+		std::cout << "| FUN: EbisuSDK_SetState                    : 0x" << std::hex << std::uppercase << p_EbisuSDK_SetState.GetPtr()        << std::setw(npad) << " |" << std::endl;
 		std::cout << "| VAR: g_bEbisuSDKInitialized               : 0x" << std::hex << std::uppercase << g_bEbisuSDKInitialized.GetPtr()      << std::setw(npad) << " |" << std::endl;
 		std::cout << "| VAR: g_bEbisuSDKCvarInitialized           : 0x" << std::hex << std::uppercase << g_bEbisuSDKCvarInitialized.GetPtr()  << std::setw(npad) << " |" << std::endl;
 		std::cout << "| VAR: g_qEbisuSDKCvarInitialized           : 0x" << std::hex << std::uppercase << g_qEbisuSDKCvarInitialized.GetPtr()  << std::setw(npad) << " |" << std::endl;
-#else
-		std::cout << "| FUN: OriginGetErrorDescription            : 0x" << std::hex << std::uppercase << p_OriginGetErrorDescription.GetPtr() << std::setw(npad) << " |" << std::endl;
-#endif // DEDICATED
 		std::cout << "+----------------------------------------------------------------+" << std::endl;
+#endif // DEDICATED
 	}
 };
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/r5dev/engine/net_chan.cpp b/r5dev/engine/net_chan.cpp
index 77d65813..4bbc81b6 100644
--- a/r5dev/engine/net_chan.cpp
+++ b/r5dev/engine/net_chan.cpp
@@ -22,7 +22,7 @@
 //-----------------------------------------------------------------------------
 void HNET_ShutDown(void* thisptr, const char* szReason, std::uint8_t a1, char a2)
 {
-	DownloadPlaylists_Callback(); // Re-load playlist from disk after getting disconnected from the server.
+	DownloadPlaylists_f_CompletionFunc(); // Re-load playlist from disk after getting disconnected from the server.
 	NET_Shutdown(thisptr, szReason, a1, a2);
 }
 
diff --git a/r5dev/launcher/IApplication.cpp b/r5dev/launcher/IApplication.cpp
index 5d5f5ee0..e545e12d 100644
--- a/r5dev/launcher/IApplication.cpp
+++ b/r5dev/launcher/IApplication.cpp
@@ -16,6 +16,10 @@ void* HIApplication_Main(void* a1, void* a2)
 //-----------------------------------------------------------------------------
 bool HIApplication_Create(void* a1)
 {
+#ifdef DEDICATED
+	// TODO: Don't hardcode!
+	* (uintptr_t*)0x162C61208 = 0x1; // g_bDedicated
+#endif // DEDICATED
 	return IAppSystem_Create(a1);
 }
 
diff --git a/r5dev/r5dev.vcxproj b/r5dev/r5dev.vcxproj
index 2cd5b4ee..5391889e 100644
--- a/r5dev/r5dev.vcxproj
+++ b/r5dev/r5dev.vcxproj
@@ -109,6 +109,7 @@
     <ClCompile Include="windows\console.cpp" />
     <ClCompile Include="windows\id3dx.cpp" />
     <ClCompile Include="windows\input.cpp" />
+    <ClCompile Include="windows\system.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="bsplib\bsplib.h" />
@@ -289,6 +290,7 @@
     <ClInclude Include="windows\console.h" />
     <ClInclude Include="windows\id3dx.h" />
     <ClInclude Include="windows\input.h" />
+    <ClInclude Include="windows\system.h" />
   </ItemGroup>
   <ItemGroup>
     <None Include="r5dev.def" />
diff --git a/r5dev/r5dev.vcxproj.filters b/r5dev/r5dev.vcxproj.filters
index 23bee5a2..dce575b1 100644
--- a/r5dev/r5dev.vcxproj.filters
+++ b/r5dev/r5dev.vcxproj.filters
@@ -300,6 +300,9 @@
     <ClCompile Include="engine\host_cmd.cpp">
       <Filter>sdk\engine</Filter>
     </ClCompile>
+    <ClCompile Include="windows\system.cpp">
+      <Filter>windows</Filter>
+    </ClCompile>
     <ClCompile Include="IDevPallete.cpp">
       <Filter>sdk\gameui</Filter>
     </ClCompile>
@@ -833,6 +836,9 @@
     <ClInclude Include="engine\host_cmd.h">
       <Filter>sdk\engine</Filter>
     </ClInclude>
+    <ClInclude Include="windows\system.h">
+      <Filter>windows</Filter>
+      </ClInclude>
     <ClInclude Include="networksystem\net_structs.h">
       <Filter>sdk\networksystem</Filter>
     </ClInclude>
diff --git a/r5dev/resource/sdklauncher.rc b/r5dev/resource/sdklauncher.rc
index 50453c05..0c0799d7 100644
--- a/r5dev/resource/sdklauncher.rc
+++ b/r5dev/resource/sdklauncher.rc
@@ -1,7 +1,7 @@
 // Microsoft Visual C++ generated resource script.
 //
 #define USE_RES
-
+#define RELEASE
 #ifdef USE_RES
 #include "sdklauncher/sdklauncher_res.h"
 
diff --git a/r5dev/rtech/rtech_game.cpp b/r5dev/rtech/rtech_game.cpp
index 321a7d61..944eb1d3 100644
--- a/r5dev/rtech/rtech_game.cpp
+++ b/r5dev/rtech/rtech_game.cpp
@@ -40,7 +40,7 @@ void HRtech_AsyncLoad(std::string svPakFileName)
 
 		if (results == 0xFFFFFFFF)
 		{
-			DevMsg(eDLL_T::RTECH, "RTech AsyncLoad failed read '%s' results '%u'\n", svPakFileName, results);
+			DevMsg(eDLL_T::RTECH, "RTech AsyncLoad failed read '%s' results '%u'\n", svPakFileName.c_str(), results);
 		}
 	}
 	else
diff --git a/r5dev/sdklauncher/sdklauncher.cpp b/r5dev/sdklauncher/sdklauncher.cpp
index 7e36fb69..5f180795 100644
--- a/r5dev/sdklauncher/sdklauncher.cpp
+++ b/r5dev/sdklauncher/sdklauncher.cpp
@@ -107,8 +107,8 @@ bool LaunchR5Apex(LAUNCHMODE lMode, LAUNCHSTATE lState)
             cfgFile.close(); // Close cfg file.
 
             WorkerDll          = currentDirectory + "\\dedicated.dll";                      // Get path to worker dll.
-            GameDirectory      = currentDirectory + "\\r5apex.exe";                         // Get path to game executeable.
-            StartupCommandLine = currentDirectory + "\\r5apex.exe " + CommandLineArguments; // Setup startup command line string.
+            GameDirectory      = currentDirectory + "\\r5apex_ds.exe";                         // Get path to game executeable.
+            StartupCommandLine = currentDirectory + "\\r5apex_ds.exe " + CommandLineArguments; // Setup startup command line string.
 
             spdlog::info("*** LAUNCHING GAME [DEDICATED] ***\n");
             break;
diff --git a/r5dev/squirrel/sqvm.h b/r5dev/squirrel/sqvm.h
index b14c5c07..199f1977 100644
--- a/r5dev/squirrel/sqvm.h
+++ b/r5dev/squirrel/sqvm.h
@@ -42,7 +42,7 @@ namespace
 	ADDRESS p_SQVM_LoadScript = g_mGameDll.FindPatternSIMD((std::uint8_t*)"\x48\x89\x5C\x24\x10\x48\x89\x74\x24\x18\x48\x89\x7C\x24\x20\x48\x89\x4C\x24\x08\x55\x41\x54\x41\x55\x41\x56\x41\x57\x48\x8D\x6C", "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx");
 	bool (*SQVM_LoadScript)(void* sqvm, const char* szScriptPath, const char* szScriptName, int nFlag) = (bool (*)(void*, const char*, const char*, int))p_SQVM_LoadScript.GetPtr(); /*48 89 5C 24 10 48 89 74 24 18 48 89 7C 24 20 48 89 4C 24 08 55 41 54 41 55 41 56 41 57 48 8D 6C*/
 #elif defined (GAMEDLL_S2) || defined (GAMEDLL_S3)
-	ADDRESS p_SQVM_LoadScript = FindPatternSIMD("r5apex.exe", (const unsigned char*)"\x48\x8B\xC4\x48\x89\x48\x08\x55\x41\x56\x48\x8D\x68", "xxxxxxxxxxxxx"); /*48 8B C4 48 89 48 08 55 41 56 48 8D 68*/
+	ADDRESS p_SQVM_LoadScript = g_mGameDll.FindPatternSIMD((std::uint8_t*)"\x48\x8B\xC4\x48\x89\x48\x08\x55\x41\x56\x48\x8D\x68", "xxxxxxxxxxxxx"); /*48 8B C4 48 89 48 08 55 41 56 48 8D 68*/
 	bool (*SQVM_LoadScript)(void* sqvm, const char* szScriptPath, const char* szScriptName, int nFlag) = (bool (*)(void*, const char*, const char*, int))p_SQVM_LoadScript.GetPtr();
 #endif
 	ADDRESS p_SQVM_LoadRson = g_mGameDll.FindPatternSIMD((std::uint8_t*)"\x4C\x8B\xDC\x49\x89\x5B\x08\x57\x48\x81\xEC\xA0\x00\x00\x00\x33", "xxxxxxxxxxxxxxxx");
diff --git a/r5dev/tier0/completion.h b/r5dev/tier0/completion.h
index 839f5928..134b718e 100644
--- a/r5dev/tier0/completion.h
+++ b/r5dev/tier0/completion.h
@@ -5,14 +5,14 @@ namespace
 {
 	/* ==== CONCOMMANDCALLBACK ============================================================================================================================================== */
 #if defined (GAMEDLL_S1)
-	ADDRESS p_Map_Callback = g_mGameDll.FindPatternSIMD((std::uint8_t*)"\x48\x89\x5C\x24\x18\x55\x41\x56\x41\x00\x00\x00\x00\x40\x02", "xxxxxxxxx????xx");
-	void (*Map_Callback)(CCommand* cmd, char a2) = (void (*)(CCommand*, char))p_Map_Callback.GetPtr(); /*48 89 5C 24 18 55 41 56 41 ?? ?? ?? ?? 40 02*/
+	ADDRESS p_Host_Map_f_CompletionFunc = g_mGameDll.FindPatternSIMD((std::uint8_t*)"\x48\x89\x5C\x24\x18\x55\x41\x56\x41\x00\x00\x00\x00\x40\x02", "xxxxxxxxx????xx");
+	void (*Host_Map_f_CompletionFunc)(CCommand* cmd, char a2) = (void (*)(CCommand*, char))p_Host_Map_f_CompletionFunc.GetPtr(); /*48 89 5C 24 18 55 41 56 41 ?? ?? ?? ?? 40 02*/
 #elif defined (GAMEDLL_S2) || defined (GAMEDLL_S3)
-	ADDRESS p_Map_Callback = g_mGameDll.FindPatternSIMD((std::uint8_t*)"\x40\x55\x41\x56\x41\x57\x48\x81\xEC\x00\x00\x00\x00\x83\x3D", "xxxxxxxxx????xx");
-	void (*Map_Callback)(CCommand* cmd, char a2) = (void (*)(CCommand*, char))p_Map_Callback.GetPtr(); /*40 55 41 56 41 57 48 81 EC ?? ?? ?? ?? 83 3D*/
+	ADDRESS p_Host_Map_f_CompletionFunc = g_mGameDll.FindPatternSIMD((std::uint8_t*)"\x40\x55\x41\x56\x41\x57\x48\x81\xEC\x00\x00\x00\x00\x83\x3D", "xxxxxxxxx????xx");
+	void (*Host_Map_f_CompletionFunc)(CCommand* cmd, char a2) = (void (*)(CCommand*, char))p_Host_Map_f_CompletionFunc.GetPtr(); /*40 55 41 56 41 57 48 81 EC ?? ?? ?? ?? 83 3D*/
 #endif
-	ADDRESS p_DownloadPlaylists_Callback = g_mGameDll.FindPatternSIMD((std::uint8_t*)"\x33\xC9\xC6\x05\x00\x00\x00\x00\x00\xE9\x00\x00\x00\x00", "xxxx?????x????");
-	void (*DownloadPlaylists_Callback)() = (void(*)())p_DownloadPlaylists_Callback.GetPtr(); /*33 C9 C6 05 ?? ?? ?? ?? ?? E9 ?? ?? ?? ??*/
+	ADDRESS p_DownloadPlaylists_f_CompletionFunc = g_mGameDll.FindPatternSIMD((std::uint8_t*)"\x33\xC9\xC6\x05\x00\x00\x00\x00\x00\xE9\x00\x00\x00\x00", "xxxx?????x????");
+	void (*DownloadPlaylists_f_CompletionFunc)() = (void(*)())p_DownloadPlaylists_f_CompletionFunc.GetPtr(); /*33 C9 C6 05 ?? ?? ?? ?? ?? E9 ?? ?? ?? ??*/
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -40,8 +40,8 @@ class HCompletion : public IDetour
 {
 	virtual void debugp()
 	{
-		std::cout << "| FUN: Map_Callback                         : 0x" << std::hex << std::uppercase << p_Map_Callback.GetPtr()               << std::setw(npad) << " |" << std::endl;
-		std::cout << "| FUN: DownloadPlaylists_Callback           : 0x" << std::hex << std::uppercase << p_DownloadPlaylists_Callback.GetPtr() << std::setw(npad) << " |" << std::endl;
+		std::cout << "| FUN: Host_Map_f_CompletionFunc            : 0x" << std::hex << std::uppercase << p_Host_Map_f_CompletionFunc.GetPtr()               << std::setw(npad) << " |" << std::endl;
+		std::cout << "| FUN: DownloadPlaylist_f_CompletionFunc    : 0x" << std::hex << std::uppercase << p_DownloadPlaylists_f_CompletionFunc.GetPtr() << std::setw(npad) << " |" << std::endl;
 		std::cout << "+----------------------------------------------------------------+" << std::endl;
 	}
 };
diff --git a/r5dev/windows/console.cpp b/r5dev/windows/console.cpp
index 41af100d..5806a784 100644
--- a/r5dev/windows/console.cpp
+++ b/r5dev/windows/console.cpp
@@ -84,7 +84,7 @@ DWORD __stdcall ProcessConsoleWorker(LPVOID)
 
 		///////////////////////////////////////////////////////////////////////
 		// Debug toggles
-		if (sCommand == "pattern test") { PrintHAddress(); PrintOAddress(); continue; }
+		if (sCommand == "pattern test") { PrintHAddress(); continue; }
 		if (sCommand == "opcodes test") { RuntimePtc_Toggle(); continue; }
 		///////////////////////////////////////////////////////////////////////
 		// Execute the command in the r5 SQVM
diff --git a/r5dev/windows/input.cpp b/r5dev/windows/input.cpp
index 9998e92f..4b7d8ec0 100644
--- a/r5dev/windows/input.cpp
+++ b/r5dev/windows/input.cpp
@@ -25,7 +25,7 @@ extern BOOL                     g_bBlockInput               = false;
 // INITIALIZATION
 //#############################################################################
 
-void SetupIPHooks()
+void Input_Setup()
 {
 	g_oSetCursorPos = (ISetCursorPos)DetourFindFunction("user32.dll", "SetCursorPos");
 	g_oClipCursor   = (IClipCursor  )DetourFindFunction("user32.dll", "ClipCursor"  );
@@ -87,7 +87,7 @@ BOOL WINAPI HShowCursor(BOOL bShow)
 
 void Input_Init()
 {
-	SetupIPHooks();
+	Input_Setup();
 	///////////////////////////////////////////////////////////////////////////
 	DetourTransactionBegin();
 	DetourUpdateThread(GetCurrentThread());
diff --git a/r5dev/windows/system.cpp b/r5dev/windows/system.cpp
new file mode 100644
index 00000000..b531a30e
--- /dev/null
+++ b/r5dev/windows/system.cpp
@@ -0,0 +1,56 @@
+#include "core/stdafx.h"
+#include "windows/system.h"
+
+///////////////////////////////////////////////////////////////////////////////
+typedef BOOL(WINAPI* IGetVersionExA)(_Inout_ LPOSVERSIONINFOA lpVersionInformation);
+static IGetVersionExA                                    g_oGetVersionExA = nullptr;
+
+//#############################################################################
+// SYSTEM HOOKS
+//#############################################################################
+
+BOOL WINAPI HGetVersionExA(_Inout_ LPOSVERSIONINFOA lpVersionInformation)
+{
+#ifdef DEDICATED
+	// Return false for dedicated to skip 'SetPRocessDpiAwareness' in 'CEngineAPI:OnStartup()'.
+	return NULL;
+#else
+	return g_oGetVersionExA(lpVersionInformation);
+#endif // DEDICATED
+}
+
+//#############################################################################
+// MANAGEMENT
+//#############################################################################
+
+void WinSys_Init()
+{
+	g_oGetVersionExA = (IGetVersionExA)DetourFindFunction("KERNEL32.dll", "GetVersionExA");
+}
+
+void WinSys_Attach()
+{
+	WinSys_Init();
+	///////////////////////////////////////////////////////////////////////////
+	DetourTransactionBegin();
+	DetourUpdateThread(GetCurrentThread());
+
+	///////////////////////////////////////////////////////////////////////////
+	DetourAttach(&(LPVOID&)g_oGetVersionExA, (PBYTE)HGetVersionExA);
+
+	///////////////////////////////////////////////////////////////////////////
+	DetourTransactionCommit();
+}
+
+void WinSys_Detach()
+{
+	///////////////////////////////////////////////////////////////////////////
+	DetourTransactionBegin();
+	DetourUpdateThread(GetCurrentThread());
+
+	///////////////////////////////////////////////////////////////////////////
+	DetourDetach(&(LPVOID&)g_oGetVersionExA, (PBYTE)HGetVersionExA);
+
+	///////////////////////////////////////////////////////////////////////////
+	DetourTransactionCommit();
+}
diff --git a/r5dev/windows/system.h b/r5dev/windows/system.h
new file mode 100644
index 00000000..a1622c31
--- /dev/null
+++ b/r5dev/windows/system.h
@@ -0,0 +1,4 @@
+#pragma once
+
+void WinSys_Attach();
+void WinSys_Detach();