conceptualizing

testing iteration
try to fix CI failures on Windows and MacOS
2026-06-13 18:24:20 +00:00 · 2024-12-24 00:41:37 -06:00 · 2024-12-17 22:06:41 -06:00 · 2024-12-17 01:10:17 -06:00 · 2024-12-17 01:02:30 -06:00 · 2024-12-17 00:57:25 -06:00
149 changed files with 1450 additions and 2605 deletions
--- a/.env.example
+++ b/.env.example
@@ -7,16 +7,8 @@ NET_VERSION=171022
 ACCOUNT_MANAGER_SECRET=
 # Should be the externally facing IP of your server host
 EXTERNAL_IP=localhost
-
-# The database type that will be used.
-# Acceptable values are `sqlite`, `mysql`, `mariadb`, `maria`.
-# Case insensitive.
-DATABASE_TYPE=mariadb
-SQLITE_DATABASE_PATH=resServer/dlu.sqlite
-
 # Database values
 # Be careful with special characters here. It is more safe to use normal characters and/or numbers.
 MARIADB_USER=darkflame
 MARIADB_PASSWORD=
 MARIADB_DATABASE=darkflame
-SKIP_ACCOUNT_CREATION=1
--- a/.github/workflows/build-and-push-docker.yml
+++ b/.github/workflows/build-and-push-docker.yml
@@ -1,4 +1,4 @@
-name: Build and Update Docker 
+name: CI

 on:
  push:
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -1,4 +1,4 @@
-name: Build And Test
+name: CI

 on:
  push:
@@ -14,13 +14,6 @@ jobs:
    strategy:
      matrix:
        os: [ windows-2022, ubuntu-22.04, macos-13 ]
-        include:
-          - os: windows-2022
-            configureType: windows-msvc
-          - os: ubuntu-22.04
-            configureType: linux-gnu
-          - os: macos-13
-            configureType: macos

    steps:
    - uses: actions/checkout@v4
@@ -40,13 +33,20 @@ jobs:
    - name: cmake
      uses: lukka/run-cmake@v10
      with:
-        configurePreset: "${{matrix.configureType}}"
-        buildPreset: "ci-${{matrix.os}}"
-        testPreset: "ci-${{matrix.os}}"
-
+        workflowPreset: "ci-${{matrix.os}}"
    - name: artifacts
      uses: actions/upload-artifact@v4
      with:
        name: build-${{matrix.os}}
        path: |
-          build/*
+          build/*/*Server*
+          build/*/*.ini
+          build/*/*.so
+          build/*/*.dll
+          build/*/*.dylib
+          build/*/vanity/
+          build/*/navmeshes/
+          build/*/migrations/
+          build/*/*.dcf
+          !build/*/*.pdb
+          !build/*/d*/
--- a/.gitignore
+++ b/.gitignore
@@ -4,8 +4,10 @@ RelWithDebInfo/
 docker/configs

 # Third party libraries
+thirdparty/magic_enum
 thirdparty/mysql/
 thirdparty/mysql_linux/
+CMakeVariables.txt

 # Build folders
 build/
@@ -112,8 +114,6 @@ CMakeFiles/TargetDirectories.txt
 *.sln
 *.recipe

-CMakeUserPresets.json
-
 # clangd
 .cache
 thirdparty/zlib-1.2.11/
--- a/.gitmodules
+++ b/.gitmodules
@@ -14,6 +14,3 @@
 	path = thirdparty/mariadb-connector-cpp
 	url = https://github.com/mariadb-corporation/mariadb-connector-cpp.git
 	ignore = dirty
-[submodule "thirdparty/magic_enum"]
-	path = thirdparty/magic_enum
-	url = https://github.com/Neargye/magic_enum.git
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,14 +19,6 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON) 	# Export the compile commands for debuggi
 set(CMAKE_POLICY_DEFAULT_CMP0063 NEW) 	# Set CMAKE visibility policy to NEW on project and subprojects
 set(CMAKE_VISIBILITY_INLINES_HIDDEN ON) # Set C and C++ symbol visibility to hide inlined functions
 set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
-  
-set(CMAKE_BUILD_TYPE "RelWithDebInfo" CACHE STRING "Choose the type of build, options are: Debug, Release, RelWithDebInfo, MinSizeRel")
-
-if (${CMAKE_BUILD_TYPE} MATCHES "") # CI likes to set CMAKE_BUILD_TYPE to an empty string
-    set(CMAKE_BUILD_TYPE "RelWithDebInfo")
-endif()
-
-set(DLU_CONFIG_DIR ${CMAKE_SOURCE_DIR}/build CACHE PATH "The directory where the server configuration files are stored")

 # Read variables from file
 FILE(READ "${CMAKE_SOURCE_DIR}/CMakeVariables.txt" variables)
@@ -80,7 +72,7 @@ if(UNIX)

 	# For all except Clang and Apple Clang
 	if(NOT CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-		add_compile_options("-static-libgcc" "-lstdc++fs" "-Wno-error=implicit-function-declaration" "-Wno-error=int-conversion")
+		add_compile_options("-static-libgcc" "-lstdc++fs")
 	endif()

 	if(${DYNAMIC} AND CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
@@ -98,11 +90,10 @@ elseif(WIN32)
 	add_compile_definitions(_CRT_SECURE_NO_WARNINGS)
 endif()

-# Set the output directories
-# ./build/<platform + architecture (x64, x86, aarch64)>/<compiler>/<build_mode>/
-
-set(CMAKE_BINARY_DIR ${CMAKE_BINARY_DIR}/${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}/${CMAKE_CXX_COMPILER_ID}/${CMAKE_BUILD_TYPE})
+# Our output dir
+#set(CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE ON) # unfortunately, forces all libraries to be built in series, which will slow down the build process

+# TODO make this not have to override the build type directories
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR})
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR})
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR})
@@ -117,28 +108,43 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})

-# Get DLU config directory
-if(DEFINED ENV{DLU_CONFIG_DIR})
-	set(DLU_CONFIG_DIR $ENV{DLU_CONFIG_DIR})
-else()
-	set(DLU_CONFIG_DIR ${CMAKE_BINARY_DIR})
-endif()
-
-message(STATUS "Configuration Directory is ${DLU_CONFIG_DIR}, and the build directory is ${CMAKE_BINARY_DIR}")
-
 find_package(MariaDB)

+# Fetch third party dependencies
+set(DLU_THIRDPARTY_SOURCE_DIR ${CMAKE_SOURCE_DIR}/thirdparty)
+
+include(FetchContent)
+FetchContent_Declare(
+	magic_enum
+	SYSTEM
+	# SOURCE_DIR     ${DLU_THIRDPARTY_SOURCE_DIR}/magic_enum
+	GIT_REPOSITORY https://github.com/Neargye/magic_enum.git
+	GIT_TAG        v0.9.7
+)
+FetchContent_MakeAvailable(magic_enum)
+
+include(CMakePrintHelpers)
+cmake_print_properties(TARGETS magic_enum::magic_enum PROPERTIES
+                       INTERFACE_INCLUDE_DIRECTORIES)
+
 # Create a /resServer directory
 make_directory(${CMAKE_BINARY_DIR}/resServer)

 # Create a /logs directory
 make_directory(${CMAKE_BINARY_DIR}/logs)

+# Get DLU config directory
+if(DEFINED ENV{DLU_CONFIG_DIR})
+	set(DLU_CONFIG_DIR $ENV{DLU_CONFIG_DIR})
+else()
+	set(DLU_CONFIG_DIR ${PROJECT_BINARY_DIR})
+endif()
+message(STATUS "Variable: DLU_CONFIG_DIR = ${DLU_CONFIG_DIR}")
+
 # Copy resource files on first build
 set(RESOURCE_FILES "sharedconfig.ini" "authconfig.ini" "chatconfig.ini" "worldconfig.ini" "masterconfig.ini" "blocklist.dcf")
 message(STATUS "Checking resource file integrity")

-
 include(Utils)
 UpdateConfigOption(${DLU_CONFIG_DIR}/authconfig.ini "port" "auth_server_port")
 UpdateConfigOption(${DLU_CONFIG_DIR}/chatconfig.ini "port" "chat_server_port")
@@ -186,18 +192,16 @@ foreach(resource_file ${RESOURCE_FILES})
 				list(GET line_split 0 variable_name)

 				if(NOT ${parsed_current_file_contents} MATCHES ${variable_name})
-					# For backwards compatibility with older setup versions, dont add this option.
-					if(NOT ${variable_name} MATCHES "database_type")
-						message(STATUS "Adding missing config option " ${variable_name} " to " ${resource_file})
-						set(line_to_add ${line_to_add} ${line})
+					message(STATUS "Adding missing config option " ${variable_name} " to " ${resource_file})
+					set(line_to_add ${line_to_add} ${line})

-						foreach(line_to_append ${line_to_add})
-							file(APPEND ${DLU_CONFIG_DIR}/${resource_file} "\n" ${line_to_append})
-						endforeach()
+					foreach(line_to_append ${line_to_add})
+						file(APPEND ${DLU_CONFIG_DIR}/${resource_file} "\n" ${line_to_append})
+					endforeach()

-						file(APPEND ${DLU_CONFIG_DIR}/${resource_file} "\n")
-					endif()
+					file(APPEND ${DLU_CONFIG_DIR}/${resource_file} "\n")
 				endif()
+
 				set(line_to_add "")
 			else()
 				set(line_to_add ${line_to_add} ${line})
@@ -209,15 +213,15 @@ endforeach()
 message(STATUS "Resource file integrity check complete")

 # if navmeshes directory does not exist, create it
-if(NOT EXISTS ${CMAKE_BINARY_DIR}/navmeshes)
-	file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/navmeshes)
+if(NOT EXISTS ${PROJECT_BINARY_DIR}/navmeshes)
+	file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/navmeshes)
 endif()

 # Copy navmesh data on first build and extract it
-configure_file(${CMAKE_SOURCE_DIR}/resources/navmeshes.zip ${CMAKE_BINARY_DIR}/navmeshes.zip COPYONLY)
+configure_file(${CMAKE_SOURCE_DIR}/resources/navmeshes.zip ${PROJECT_BINARY_DIR}/navmeshes.zip COPYONLY)

-file(ARCHIVE_EXTRACT INPUT ${CMAKE_BINARY_DIR}/navmeshes.zip DESTINATION ${CMAKE_BINARY_DIR}/navmeshes)
-file(REMOVE ${CMAKE_BINARY_DIR}/navmeshes.zip)
+file(ARCHIVE_EXTRACT INPUT ${PROJECT_BINARY_DIR}/navmeshes.zip DESTINATION ${PROJECT_BINARY_DIR}/navmeshes)
+file(REMOVE ${PROJECT_BINARY_DIR}/navmeshes.zip)

 # Copy vanity files on first build
 set(VANITY_FILES "CREDITS.md" "INFO.md" "TESTAMENT.md" "root.xml" "dev-tribute.xml" "atm.xml" "demo.xml")
@@ -227,20 +231,20 @@ foreach(file ${VANITY_FILES})
 endforeach()

 # Move our migrations for MasterServer to run
-file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/migrations/dlu/)
+file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/migrations/dlu/)
 file(GLOB SQL_FILES ${CMAKE_SOURCE_DIR}/migrations/dlu/*.sql)

 foreach(file ${SQL_FILES})
 	get_filename_component(file ${file} NAME)
-	configure_file(${CMAKE_SOURCE_DIR}/migrations/dlu/${file} ${CMAKE_BINARY_DIR}/migrations/dlu/${file})
+	configure_file(${CMAKE_SOURCE_DIR}/migrations/dlu/${file} ${PROJECT_BINARY_DIR}/migrations/dlu/${file})
 endforeach()

-file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/migrations/cdserver/)
+file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/migrations/cdserver/)
 file(GLOB SQL_FILES ${CMAKE_SOURCE_DIR}/migrations/cdserver/*.sql)

 foreach(file ${SQL_FILES})
 	get_filename_component(file ${file} NAME)
-	configure_file(${CMAKE_SOURCE_DIR}/migrations/cdserver/${file} ${CMAKE_BINARY_DIR}/migrations/cdserver/${file})
+	configure_file(${CMAKE_SOURCE_DIR}/migrations/cdserver/${file} ${PROJECT_BINARY_DIR}/migrations/cdserver/${file})
 endforeach()

 # Add system specfic includes for Apple, Windows and Other Unix OS' (including Linux)
@@ -265,7 +269,6 @@ include_directories(
 	"tests/dGameTests/dComponentsTests"

 	SYSTEM
-	"thirdparty/magic_enum/include/magic_enum"
 	"thirdparty/raknet/Source"
 	"thirdparty/tinyxml2"
 	"thirdparty/recastnavigation"
@@ -316,6 +319,7 @@ file(
 # Add our library subdirectories for creation of the library object
 add_subdirectory(dCommon)
 add_subdirectory(dDatabase)
+add_subdirectory(dECS)
 add_subdirectory(dChatFilter)
 add_subdirectory(dNet)
 add_subdirectory(dScripts) # Add for dGame to use
@@ -326,7 +330,7 @@ add_subdirectory(dPhysics)
 add_subdirectory(dServer)

 # Create a list of common libraries shared between all binaries
-set(COMMON_LIBRARIES "dCommon" "dDatabase" "dNet" "raknet" "magic_enum")
+set(COMMON_LIBRARIES "dCommon" "dDatabase" "dNet" "raknet" "magic_enum::magic_enum")

 # Add platform specific common libraries
 if(UNIX)
@@ -343,10 +347,6 @@ add_subdirectory(dAuthServer)
 add_subdirectory(dChatServer)
 add_subdirectory(dMasterServer) # Add MasterServer last so it can rely on the other binaries

-if (WIN32 AND LOCAL_SERVEr)
-	add_subdirectory(dLocalServer)
-endif()
-
 target_precompile_headers(
 	dZoneManager PRIVATE
 	${HEADERS_DZONEMANAGER}
--- a/CMakePresets.json
+++ b/CMakePresets.json
@@ -11,37 +11,72 @@
 			"displayName": "Default configure step",
 			"description": "Use 'build' dir and Unix makefiles",
 			"binaryDir": "${sourceDir}/build",
-			"generator": "Unix Makefiles",
-			"hidden": true
+			"generator": "Unix Makefiles"
+		},
+		{
+			"name": "debug-config",
+			"hidden": true,
+			"cacheVariables": {
+				"CMAKE_BUILD_TYPE": "Debug"
+			}
+		},
+		{
+			"name": "relwithdebinfo-config",
+			"hidden": true,
+			"cacheVariables": {
+				"CMAKE_BUILD_TYPE": "RelWithDebInfo"
+			}
+		},
+		{
+			"name": "release-config",
+			"hidden": true,
+			"cacheVariables": {
+				"CMAKE_BUILD_TYPE": "Release"
+			}
+		},
+		{
+			"name": "clang-config",
+			"hidden": true,
+			"toolchainFile": "${sourceDir}/cmake/toolchains/linux-clang.cmake"
+		},
+		{
+			"name": "gnu-config",
+			"hidden": true,
+			"toolchainFile": "${sourceDir}/cmake/toolchains/linux-gnu.cmake"
+		},
+		{
+			"name": "windows-msvc",
+			"inherits": "default",
+			"displayName": "[Multi] Windows (MSVC)",
+			"description": "Set architecture to 64-bit (b/c RakNet)",
+			"generator": "Visual Studio 17 2022",
+			"binaryDir": "${sourceDir}/build/msvc",
+			"architecture": {
+				"value": "x64"
+			},
+			"condition": {
+				"type": "equals",
+				"lhs": "${hostSystemName}",
+				"rhs": "Windows"
+			}
 		},
 		{
 			"name": "windows-default",
-			"inherits": "default",
-			"displayName": "Windows Default Configure Settings",
+			"inherits": "windows-msvc",
+			"displayName": "Windows only Configure Settings",
 			"description": "Sets build and install directories",
-			"generator": "Visual Studio 17 2022",
+			"generator": "Ninja",
 			"condition": {
 				"type": "equals",
 				"lhs": "${hostSystemName}",
 				"rhs": "Windows"
 			},
-			"hidden": true
+			"architecture": {
+				"value": "x64"
+			}
 		},
 		{
-			"name": "windows-msvc",
-			"inherits": "windows-default",
-			"displayName": "Windows (MSVC)",
-			"description": "Create a build using MSVC"
-		},
-		{
-			"name": "windows-clang",
-			"inherits": "windows-default",
-			"displayName": "EXPERIMENTAL - Windows (Clang)",
-			"description": "Create a build using Clang",
-			"toolset": "ClangCL"
-		},
-		{
-			"name": "linux-default",
+			"name": "linux-config",
 			"inherits": "default",
 			"hidden": true,
 			"condition": {
@@ -51,74 +86,553 @@
 			}
 		},
 		{
-			"name": "linux-clang",
-			"inherits": "linux-default",
-			"toolchainFile": "${sourceDir}/cmake/toolchains/linux-clang.cmake",
-			"displayName": "Linux (Clang)",
-			"description": "Create a build using the Clang toolchain for Linux"
+			"name": "linux-clang-debug",
+			"inherits": [
+				"linux-config",
+				"clang-config",
+				"debug-config"
+			],
+			"displayName": "EXPERIMENTAL - [Debug] Linux (Clang)",
+			"description": "Create a debug build using the Clang toolchain for Linux",
+			"binaryDir": "${sourceDir}/build/clang-debug"
 		},
 		{
-			"name": "linux-gnu",
-			"inherits": "linux-default",
-			"toolchainFile": "${sourceDir}/cmake/toolchains/linux-gnu.cmake",
-			"displayName": "Linux (GNU)",
-			"description": "Create a build using the GNU toolchain for Linux"
+			"name": "linux-clang-relwithdebinfo",
+			"inherits": [
+				"linux-config",
+				"clang-config",
+				"relwithdebinfo-config"
+			],
+			"displayName": "EXPERIMENTAL - [RelWithDebInfo] Linux (Clang)",
+			"description": "Create a release build with debug info using the Clang toolchain for Linux",
+			"binaryDir": "${sourceDir}/build/clang-relwithdebinfo"
+		},
+		{
+			"name": "linux-clang-release",
+			"inherits": [
+				"linux-config",
+				"clang-config",
+				"release-config"
+			],
+			"displayName": "EXPERIMENTAL - [Release] Linux (Clang)",
+			"description": "Create a release build using the Clang toolchain for Linux",
+			"binaryDir": "${sourceDir}/build/clang-release"
+		},
+		{
+			"name": "linux-gnu-debug",
+			"inherits": [
+				"linux-config",
+				"gnu-config",
+				"debug-config"
+			],
+			"displayName": "[Debug] Linux (GNU)",
+			"description": "Create a debug build using the GNU toolchain for Linux",
+			"binaryDir": "${sourceDir}/build/gnu-debug"
+		},
+		{
+			"name": "linux-gnu-relwithdebinfo",
+			"inherits": [
+				"linux-config",
+				"gnu-config",
+				"relwithdebinfo-config"
+			],
+			"displayName": "[RelWithDebInfo] Linux (GNU)",
+			"description": "Create a release build with debug info using the GNU toolchain for Linux",
+			"binaryDir": "${sourceDir}/build/gnu-relwithdebinfo"
+		},
+		{
+			"name": "linux-gnu-release",
+			"inherits": [
+				"linux-config",
+				"gnu-config",
+				"release-config"
+			],
+			"displayName": "[Release] Linux (GNU)",
+			"description": "Create a release build using the GNU toolchain for Linux",
+			"binaryDir": "${sourceDir}/build/gnu-release"
 		},
 		{
 			"name": "macos",
 			"inherits": "default",
-			"displayName": "MacOS",
+			"displayName": "[Multi] MacOS",
 			"description": "Create a build for MacOS",
 			"condition": {
 				"type": "equals",
 				"lhs": "${hostSystemName}",
 				"rhs": "Darwin"
-			}
+			},
+			"binaryDir": "${sourceDir}/build/macos"
 		}
 	],
 	"buildPresets": [
-        { "name": "ci-ubuntu-22.04", "configurePreset": "linux-gnu"    },
-        { "name": "ci-macos-13",     "configurePreset": "macos"        },
-        { "name": "ci-windows-2022", "configurePreset": "windows-msvc" }
+		{
+			"name": "default",
+			"configurePreset": "default",
+			"displayName": "Default Build",
+			"description": "Default Build",
+			"jobs": 2
+		},
+		{
+			"name": "windows-msvc-debug",
+			"inherits": "default",
+			"configurePreset": "windows-msvc",
+			"displayName": "[Debug] Windows (MSVC)",
+			"description": "This preset is used to build in debug mode using the MSVC toolchain on Windows",
+			"configuration": "Debug"
+		},
+		{
+			"name": "windows-msvc-relwithdebinfo",
+			"inherits": "default",
+			"configurePreset": "windows-msvc",
+			"displayName": "[RelWithDebInfo] Windows (MSVC)",
+			"description": "This preset is used to build in debug mode using the MSVC toolchain on Windows",
+			"configuration": "RelWithDebInfo"
+		},
+		{
+			"name": "windows-msvc-release",
+			"inherits": "default",
+			"configurePreset": "windows-msvc",
+			"displayName": "[Release] Windows (MSVC)",
+			"description": "This preset is used to build in release mode using the MSVC toolchain on Windows",
+			"configuration": "Release"
+		},
+		{
+			"name": "linux-clang-debug",
+			"inherits": "default",
+			"configurePreset": "linux-clang-debug",
+			"displayName": "EXPERIMENTAL - [Debug] Linux (Clang)",
+			"description": "This preset is used to build in debug mode using the Clang toolchain on Linux",
+			"configuration": "Debug"
+		},
+		{
+			"name": "linux-clang-relwithdebinfo",
+			"inherits": "default",
+			"configurePreset": "linux-clang-relwithdebinfo",
+			"displayName": "EXPERIMENTAL - [RelWithDebInfo] Linux (Clang)",
+			"description": "This preset is used to build in release mode with debug info using the Clang toolchain on Linux",
+			"configuration": "RelWithDebInfo"
+		},
+		{
+			"name": "linux-clang-release",
+			"inherits": "default",
+			"configurePreset": "linux-clang-release",
+			"displayName": "EXPERIMENTAL - [Release] Linux (Clang)",
+			"description": "This preset is used to build in release mode using the Clang toolchain on Linux",
+			"configuration": "Release"
+		},
+		{
+			"name": "linux-gnu-debug",
+			"inherits": "default",
+			"configurePreset": "linux-gnu-debug",
+			"displayName": "[Debug] Linux (GNU)",
+			"description": "This preset is used to build in debug mode using the GNU toolchain on Linux",
+			"configuration": "Debug"
+		},
+		{
+			"name": "linux-gnu-relwithdebinfo",
+			"inherits": "default",
+			"configurePreset": "linux-gnu-relwithdebinfo",
+			"displayName": "[RelWithDebInfo] Linux (GNU)",
+			"description": "This preset is used to build in release mode with debug info using the GNU toolchain on Linux",
+			"configuration": "RelWithDebInfo"
+		},
+		{
+			"name": "linux-gnu-release",
+			"inherits": "default",
+			"configurePreset": "linux-gnu-release",
+			"displayName": "[Release] Linux (GNU)",
+			"description": "This preset is used to build in release mode using the GNU toolchain on Linux",
+			"configuration": "Release"
+		},
+		{
+			"name": "macos-debug",
+			"inherits": "default",
+			"configurePreset": "macos",
+			"displayName": "[Debug] MacOS",
+			"description": "This preset is used to build in debug mode on MacOS",
+			"configuration": "Debug"
+		},
+		{
+			"name": "macos-relwithdebinfo",
+			"inherits": "default",
+			"configurePreset": "macos",
+			"displayName": "[RelWithDebInfo] MacOS",
+			"description": "This preset is used to build in release mode with debug info on MacOS",
+			"configuration": "RelWithDebInfo"
+		},
+		{
+			"name": "macos-release",
+			"inherits": "default",
+			"configurePreset": "macos",
+			"displayName": "[Release] MacOS",
+			"description": "This preset is used to build in release mode on MacOS",
+			"configuration": "Release"
+		}
 	],
 	"testPresets": [
-        {
-            "name": "default",
-            "hidden": true,
-            "execution": {
-                "jobs": 2
-            },
-            "output": {
-                "outputOnFailure": true
-            }
-        },
 		{
-			"name": "ci-ubuntu-22.04",
-			"configurePreset": "linux-gnu",
-			"displayName": "CI Tests on Linux",
-			"inherits": "default"
+			"name": "default",
+			"configurePreset": "default",
+			"execution": {
+				"jobs": 2
+			},
+			"output": {
+				"outputOnFailure": true
+			}
 		},
 		{
-			"name": "ci-macos-13",
-			"configurePreset": "macos",
-			"displayName": "CI Tests on MacOS",
-			"inherits": "default"
-		},
-		{
-			"name": "ci-windows-2022",
+			"name": "windows-msvc-test",
+			"inherits": "default",
 			"configurePreset": "windows-msvc",
-			"displayName": "CI Tests on windows",
-            "inherits": "default",
-            
-			"configuration": "RelWithDebInfo",
+			"hidden": true,
 			"filter": {
 				"exclude": {
 					"name": "((example)|(minigzip))+"
 				}
 			}
+		},
+		{
+			"name": "windows-msvc-debug",
+			"inherits": "windows-msvc-test",
+			"configurePreset": "windows-msvc",
+			"displayName": "[Debug] Windows (MSVC)",
+			"description": "Runs all tests on a Windows configuration",
+			"configuration": "Debug"
+		},
+		{
+			"name": "windows-msvc-relwithdebinfo",
+			"inherits": "windows-msvc-test",
+			"configurePreset": "windows-msvc",
+			"displayName": "[RelWithDebInfo] Windows (MSVC)",
+			"description": "Runs all tests on a Windows configuration",
+			"configuration": "RelWithDebInfo"
+		},
+		{
+			"name": "windows-msvc-release",
+			"inherits": "windows-msvc-test",
+			"configurePreset": "windows-msvc",
+			"displayName": "[Release] Windows (MSVC)",
+			"description": "Runs all tests on a Windows configuration",
+			"configuration": "Release"
+		},
+		{
+			"name": "linux-clang-debug",
+			"inherits": "default",
+			"configurePreset": "linux-clang-debug",
+			"displayName": "EXPERIMENTAL - [Debug] Linux (Clang)",
+			"description": "Runs all tests on a Linux Clang configuration",
+			"configuration": "Release"
+		},
+		{
+			"name": "linux-clang-relwithdebinfo",
+			"inherits": "default",
+			"configurePreset": "linux-clang-relwithdebinfo",
+			"displayName": "EXPERIMENTAL - [RelWithDebInfo] Linux (Clang)",
+			"description": "Runs all tests on a Linux Clang configuration",
+			"configuration": "RelWithDebInfo"
+		},
+		{
+			"name": "linux-clang-release",
+			"inherits": "default",
+			"configurePreset": "linux-clang-release",
+			"displayName": "EXPERIMENTAL - [Release] Linux (Clang)",
+			"description": "Runs all tests on a Linux Clang configuration",
+			"configuration": "Release"
+		},
+		{
+			"name": "linux-gnu-debug",
+			"inherits": "default",
+			"configurePreset": "linux-gnu-debug",
+			"displayName": "[Debug] Linux (GNU)",
+			"description": "Runs all tests on a Linux GNU configuration",
+			"configuration": "Release"
+		},
+		{
+			"name": "linux-gnu-relwithdebinfo",
+			"inherits": "default",
+			"configurePreset": "linux-gnu-relwithdebinfo",
+			"displayName": "[RelWithDebInfo] Linux (GNU)",
+			"description": "Runs all tests on a Linux GNU configuration",
+			"configuration": "RelWithDebInfo"
+		},
+		{
+			"name": "linux-gnu-release",
+			"inherits": "default",
+			"configurePreset": "linux-gnu-release",
+			"displayName": "[Release] Linux (GNU)",
+			"description": "Runs all tests on a Linux GNU configuration",
+			"configuration": "Release"
+		},
+		{
+			"name": "macos-debug",
+			"inherits": "default",
+			"configurePreset": "macos",
+			"displayName": "[Debug] MacOS",
+			"description": "Runs all tests on a MacOS configuration",
+			"configuration": "Debug"
+		},
+		{
+			"name": "macos-relwithdebinfo",
+			"inherits": "default",
+			"configurePreset": "macos",
+			"displayName": "[RelWithDebInfo] MacOS",
+			"description": "Runs all tests on a MacOS configuration",
+			"configuration": "RelWithDebInfo"
+		},
+		{
+			"name": "macos-release",
+			"inherits": "default",
+			"configurePreset": "macos",
+			"displayName": "[Release] MacOS",
+			"description": "Runs all tests on a MacOS configuration",
+			"configuration": "Release"
 		}
 	],
 	"workflowPresets": [
-
+		{
+			"name": "default",
+			"steps": [
+				{
+					"type": "configure",
+					"name": "default"
+				},
+				{
+					"type": "build",
+					"name": "default"
+				},
+				{
+					"type": "test",
+					"name": "default"
+				}
+			]
+		},
+		{
+			"name": "windows-msvc-debug",
+			"displayName": "[Debug] Windows (MSVC)",
+			"description": "MSVC debug workflow preset for Windows",
+			"steps": [
+				{
+					"type": "configure",
+					"name": "windows-msvc"
+				},
+				{
+					"type": "build",
+					"name": "windows-msvc-debug"
+				},
+				{
+					"type": "test",
+					"name": "windows-msvc-debug"
+				}
+			]
+		},
+		{
+			"name": "windows-msvc-relwithdebinfo",
+			"displayName": "[RelWithDebInfo] Windows (MSVC)",
+			"description": "MSVC release with debug info workflow preset for Windows",
+			"steps": [
+				{
+					"type": "configure",
+					"name": "windows-msvc"
+				},
+				{
+					"type": "build",
+					"name": "windows-msvc-relwithdebinfo"
+				},
+				{
+					"type": "test",
+					"name": "windows-msvc-relwithdebinfo"
+				}
+			]
+		},
+		{
+			"name": "ci-windows-2022",
+			"displayName": "[Release] Windows (MSVC)",
+			"description": "CI workflow preset for Windows",
+			"steps": [
+				{
+					"type": "configure",
+					"name": "windows-msvc"
+				},
+				{
+					"type": "build",
+					"name": "windows-msvc-release"
+				},
+				{
+					"type": "test",
+					"name": "windows-msvc-release"
+				}
+			]
+		},
+		{
+			"name": "linux-gnu-debug",
+			"displayName": "[Debug] Linux (GNU)",
+			"description": "GNU debug workflow preset for Linux",
+			"steps": [
+				{
+					"type": "configure",
+					"name": "linux-gnu-debug"
+				},
+				{
+					"type": "build",
+					"name": "linux-gnu-debug"
+				},
+				{
+					"type": "test",
+					"name": "linux-gnu-debug"
+				}
+			]
+		},
+		{
+			"name": "linux-gnu-relwithdebinfo",
+			"displayName": "[RelWithDebInfo] Linux (GNU)",
+			"description": "GNU release with debug info workflow preset for Linux",
+			"steps": [
+				{
+					"type": "configure",
+					"name": "linux-gnu-relwithdebinfo"
+				},
+				{
+					"type": "build",
+					"name": "linux-gnu-relwithdebinfo"
+				},
+				{
+					"type": "test",
+					"name": "linux-gnu-relwithdebinfo"
+				}
+			]
+		},
+		{
+			"name": "ci-ubuntu-22.04",
+			"displayName": "[Release] Linux (GNU)",
+			"description": "CI workflow preset for Ubuntu",
+			"steps": [
+				{
+					"type": "configure",
+					"name": "linux-gnu-release"
+				},
+				{
+					"type": "build",
+					"name": "linux-gnu-release"
+				},
+				{
+					"type": "test",
+					"name": "linux-gnu-release"
+				}
+			]
+		},
+		{
+			"name": "linux-clang-debug",
+			"displayName": "EXPERIMENTAL - [Debug] Linux (Clang)",
+			"description": "Clang debug workflow preset for Linux",
+			"steps": [
+				{
+					"type": "configure",
+					"name": "linux-clang-debug"
+				},
+				{
+					"type": "build",
+					"name": "linux-clang-debug"
+				},
+				{
+					"type": "test",
+					"name": "linux-clang-debug"
+				}
+			]
+		},
+		{
+			"name": "linux-clang-relwithdebinfo",
+			"displayName": "EXPERIMENTAL - [RelWithDebInfo] Linux (Clang)",
+			"description": "Clang release with debug info workflow preset for Linux",
+			"steps": [
+				{
+					"type": "configure",
+					"name": "linux-clang-relwithdebinfo"
+				},
+				{
+					"type": "build",
+					"name": "linux-clang-relwithdebinfo"
+				},
+				{
+					"type": "test",
+					"name": "linux-clang-relwithdebinfo"
+				}
+			]
+		},
+		{
+			"name": "linux-clang-release",
+			"displayName": "EXPERIMENTAL - [Release] Linux (Clang)",
+			"description": "Clang release workflow preset for Linux",
+			"steps": [
+				{
+					"type": "configure",
+					"name": "linux-clang-release"
+				},
+				{
+					"type": "build",
+					"name": "linux-clang-release"
+				},
+				{
+					"type": "test",
+					"name": "linux-clang-release"
+				}
+			]
+		},
+		{
+			"name": "macos-debug",
+			"displayName": "[Debug] MacOS",
+			"description": "Release workflow preset for MacOS",
+			"steps": [
+				{
+					"type": "configure",
+					"name": "macos"
+				},
+				{
+					"type": "build",
+					"name": "macos-debug"
+				},
+				{
+					"type": "test",
+					"name": "macos-debug"
+				}
+			]
+		},
+		{
+			"name": "macos-relwithdebinfo",
+			"displayName": "[RelWithDebInfo] MacOS",
+			"description": "Release with debug info workflow preset for MacOS",
+			"steps": [
+				{
+					"type": "configure",
+					"name": "macos"
+				},
+				{
+					"type": "build",
+					"name": "macos-relwithdebinfo"
+				},
+				{
+					"type": "test",
+					"name": "macos-relwithdebinfo"
+				}
+			]
+		},
+		{
+			"name": "ci-macos-13",
+			"displayName": "[Release] MacOS",
+			"description": "CI workflow preset for MacOS",
+			"steps": [
+				{
+					"type": "configure",
+					"name": "macos"
+				},
+				{
+					"type": "build",
+					"name": "macos-release"
+				},
+				{
+					"type": "test",
+					"name": "macos-release"
+				}
+			]
+		}
 	]
 }
--- a/CMakeVariables.txt
+++ b/CMakeVariables.txt
@@ -30,6 +30,3 @@ OPENSSL_ROOT_DIR=/usr/local/opt/openssl@3/
 # Whether or not to cache the entire CDClient Database into memory instead of lazy loading.
 # 0 means to lazy load, all other values mean load the entire database.
 CDCLIENT_CACHE_ALL=0
-
-# Build a local client running server instead of a production server.
-LOCAL_SERVER=1
--- a/18
+++ b/18
@@ -23,23 +23,23 @@ RUN --mount=type=cache,id=build-apt-cache,target=/var/cache/apt \
    rm -rf /var/lib/apt/lists/*

 # Grab libraries and load them
-COPY --from=build /app/build/Linux-x86_64/GNU/Release/mariadbcpp/libmariadbcpp.so /usr/local/lib/
+COPY --from=build /app/build/mariadbcpp/libmariadbcpp.so /usr/local/lib/
 RUN ldconfig

 # Server bins
-COPY --from=build /app/build/Linux-x86_64/GNU/Release/*Server /app/
+COPY --from=build /app/build/*Server /app/

 # Necessary suplimentary files
-COPY --from=build /app/build/Linux-x86_64/GNU/Release/*.ini /app/configs/
-COPY --from=build /app/build/Linux-x86_64/GNU/Release/vanity/*.* /app/vanity/
-COPY --from=build /app/build/Linux-x86_64/GNU/Release/navmeshes /app/navmeshes
-COPY --from=build /app/build/Linux-x86_64/GNU/Release/migrations /app/migrations
-COPY --from=build /app/build/Linux-x86_64/GNU/Release/*.dcf /app/
+COPY --from=build /app/build/*.ini /app/configs/
+COPY --from=build /app/build/vanity/*.* /app/vanity/
+COPY --from=build /app/build/navmeshes /app/navmeshes
+COPY --from=build /app/build/migrations /app/migrations
+COPY --from=build /app/build/*.dcf /app/

 # backup of config and vanity files to copy to the host incase 
 # of a mount clobbering the copy from above
-COPY --from=build /app/build/Linux-x86_64/GNU/Release/*.ini /app/default-configs/ 
-COPY --from=build /app/build/Linux-x86_64/GNU/Release/vanity/*.* /app/default-vanity/
+COPY --from=build /app/build/*.ini /app/default-configs/ 
+COPY --from=build /app/build/vanity/*.* /app/default-vanity/

 # needed as the container runs with the root user
 # and therefore sudo doesn't exist
--- a/README.md
+++ b/README.md
@@ -13,33 +13,21 @@ Darkflame Universe is licensed under AGPLv3, please read [LICENSE](LICENSE). Som
 * You must disclose any changes you make to the code when you distribute it
 * Hosting a server for others counts as distribution

+## Disclaimers
+### Setup difficulty
+Throughout the entire build and setup process a level of familiarity with the command line and preferably a Unix-like development environment is greatly advantageous.
+
 ### Hosting a server
 We do not recommend hosting public servers. Darkflame Universe is intended for small scale deployment, for example within a group of friends. It has not been tested for large scale deployment which comes with additional security risks.

 ### Supply of resource files
 Darkflame Universe is a server emulator and does not distribute any LEGO® Universe files. A separate game client is required to setup this server emulator and play the game, which we cannot supply. Users are strongly suggested to refer to the safe checksums listed [here](#verifying-your-client-files) to see if a client will work.

-## Setting up a single player server
-* If you don't know what WSL is, skip this warning.
-	Warning: WSL version 1 does NOT support using sqlite as a database due to how it handles filesystem synchronization.
-	You must use Version 2 if you must run the server under WSL. Not doing so will result in save data loss.
-* Single player installs now no longer require building the server from source or installing development tools.
-* Download the [latest windows release](https://github.com/DarkflameUniverse/DarkflameServer/releases) (or whichever release you need) and extract the files into a folder inside your client. Note that this setup is expecting that when double clicking the folder that you put in the same folder as `legouniverse.exe`, the file `MasterServer.exe` is in there.
-* You should be able to see the folder with the server files in the same folder as `legouniverse.exe`.
-* Go into the server files folder and open `sharedconfig.ini`. Find the line that says `client_location` and put `..` after it so the line reads `client_location=..`.
-* To run the server, double-click `MasterServer.exe`.
-* You will be asked to create an account the first time you run the server. After you have created the account, the server will shutdown and need to be restarted.
-* To connect to the server, either delete the file `boot.cfg` which is found in your LEGO Universe client, rename the file `boot.cfg` to something else or follow the steps [here](#allowing-a-user-to-connect-to-your-server) if you wish to keep the file.
-* When shutting down the server, it is highly recommended to click the `MasterServer.exe` window and hold `ctrl` while pressing `c` to stop the server.
-* We are working on a way to make it so when you close the game, the server stops automatically alongside when you open the game, the server starts automatically.
+## Step by step walkthrough for a single-player server
+If you would like a setup for a single player server only on a Windows machine, use the [Native Windows Setup Guide by HailStorm](https://gist.github.com/HailStorm32/169df65a47a104199b5cc57d10fa57de) and skip this README.

-<font size="32">**If you are not planning on hosting a server for others, working in the codebase or wanting to use MariaDB for a database, you can stop reading here.**</font>
-
-If you would like to use a MariaDB as a database instead of the default of sqlite, follow the steps [here](#database-setup).
-
-# Steps to setup a development environment
+## Steps to setup server
 * [Clone this repository](#clone-the-repository)
-* [Setting up a development environment](#setting-up-a-development-environment)
 * [Install dependencies](#install-dependencies)
 * [Database setup](#database-setup)
 * [Build the server](#build-the-server)
@@ -51,13 +39,6 @@ If you would like to use a MariaDB as a database instead of the default of sqlit
 * [User Guide](#user-guide)
 * [Docker](#docker)

-## Disclaimers
-### Setup difficulty
-Throughout the entire build and setup process a level of familiarity with the command line and preferably a Unix-like development environment is greatly advantageous.
-
-## Step by step walkthrough for building a single-player Windows server from source
-If you would like a setup for a single player server only on a Windows machine built from source, use the [Native Windows Setup Guide by HailStorm](https://gist.github.com/HailStorm32/169df65a47a104199b5cc57d10fa57de) and skip this README.
-
 ## Clone the repository
 If you are on Windows, you will need to download and install git from [here](https://git-scm.com/download/win)

@@ -285,8 +266,8 @@ systemctl stop darkflame.service
 journalctl -xeu darkflame.service
 ```

-### First user or adding more users.
-The first time you run `MasterServer`, you will be prompted to create an account. To create more accounts from the command line, `MasterServer -a` to get prompted to create an admin account. This method is only intended for the system administrator as a means to get started, do NOT use this method to create accounts for other users!
+### First admin user
+Run `MasterServer -a` to get prompted to create an admin account. This method is only intended for the system administrator as a means to get started, do NOT use this method to create accounts for other users!

 ### Account management tool (Nexus Dashboard)
 **If you are just using this server for yourself, you can skip setting up Nexus Dashboard**
--- a/cmake/FindMariaDB.cmake
+++ b/cmake/FindMariaDB.cmake
@@ -2,8 +2,8 @@
 # On Windows ClangCL can't compile the connector from source but can link to an msvc compiled one,
 # so prefer the prebuilt binaries unless MARIADB_BUILD_SOURCE is specified
 if(WIN32 AND NOT MARIADB_BUILD_SOURCE)
-	set(MARIADB_MSI_DIR "${CMAKE_BINARY_DIR}/msi")
-	set(MARIADB_CONNECTOR_DIR "${CMAKE_BINARY_DIR}/mariadbcpp")
+	set(MARIADB_MSI_DIR "${PROJECT_BINARY_DIR}/msi")
+	set(MARIADB_CONNECTOR_DIR "${PROJECT_BINARY_DIR}/mariadbcpp")
 	set(MARIADB_C_CONNECTOR_DIR "${MARIADB_CONNECTOR_DIR}/MariaDB/MariaDB Connector C 64-bit")
 	set(MARIADB_CPP_CONNECTOR_DIR "${MARIADB_CONNECTOR_DIR}/MariaDB/MariaDB C++ Connector 64-bit")

@@ -59,7 +59,7 @@ if(WIN32 AND NOT MARIADB_BUILD_SOURCE)
 					COMMAND ${CMAKE_COMMAND} -E copy_if_different
 					"${MARIADBCPP_SHARED_LIBRARY_LOCATION}"
 					"${MARIADBC_SHARED_LIBRARY_LOCATION}"
-					"${CMAKE_BINARY_DIR}")
+					"${PROJECT_BINARY_DIR}")

 	# MariaDB uses plugins that the database needs to load, the prebuilt binaries by default will try to find the libraries in system directories,
 	# so set this define and the servers will set the MARIADB_PLUGIN_DIR environment variable to the appropriate directory.
@@ -86,13 +86,13 @@ else() # Build from source
 			-DCMAKE_CXX_FLAGS=-D_GLIBCXX_USE_CXX11_ABI=0)
 	endif()

-	set(MARIADBCPP_INSTALL_DIR ${CMAKE_BINARY_DIR}/prefix)
-	set(MARIADBCPP_LIBRARY_DIR ${CMAKE_BINARY_DIR}/mariadbcpp)
+	set(MARIADBCPP_INSTALL_DIR ${PROJECT_BINARY_DIR}/prefix)
+	set(MARIADBCPP_LIBRARY_DIR ${PROJECT_BINARY_DIR}/mariadbcpp)
 	set(MARIADBCPP_PLUGIN_DIR ${MARIADBCPP_LIBRARY_DIR}/plugin)
 	set(MARIADBCPP_SOURCE_DIR ${PROJECT_SOURCE_DIR}/thirdparty/mariadb-connector-cpp)
 	set(MARIADB_INCLUDE_DIR "${MARIADBCPP_SOURCE_DIR}/include")
 	ExternalProject_Add(mariadb_connector_cpp
-		PREFIX "${CMAKE_BINARY_DIR}/thirdparty/mariadb-connector-cpp"
+		PREFIX "${PROJECT_BINARY_DIR}/thirdparty/mariadb-connector-cpp"
 		SOURCE_DIR ${MARIADBCPP_SOURCE_DIR}
 		INSTALL_DIR ${MARIADBCPP_INSTALL_DIR}
 		CMAKE_ARGS  -Wno-dev
@@ -127,20 +127,20 @@ else() # Build from source
 endif()

 # Create mariadb connector library object
-add_library(mariadb_cpp_connector SHARED IMPORTED GLOBAL)
-add_dependencies(mariadb_cpp_connector mariadb_connector_cpp)
-set_target_properties(mariadb_cpp_connector PROPERTIES
+add_library(MariaDB::ConnCpp SHARED IMPORTED GLOBAL)
+add_dependencies(MariaDB::ConnCpp mariadb_connector_cpp)
+set_target_properties(MariaDB::ConnCpp PROPERTIES
 	IMPORTED_LOCATION "${MARIADBCPP_SHARED_LIBRARY_LOCATION}")

 if(WIN32)
-	set_target_properties(mariadb_cpp_connector PROPERTIES
+	set_target_properties(MariaDB::ConnCpp PROPERTIES
 		IMPORTED_IMPLIB "${MARIADB_IMPLIB_LOCATION}")
 elseif(APPLE)
-	set_target_properties(mariadb_cpp_connector PROPERTIES
+	set_target_properties(MariaDB::ConnCpp PROPERTIES
 		IMPORTED_SONAME "libmariadbcpp")
 endif()

 # Add directories to include lists
-target_include_directories(mariadb_cpp_connector SYSTEM INTERFACE ${MARIADB_INCLUDE_DIR})
+target_include_directories(MariaDB::ConnCpp SYSTEM INTERFACE ${MARIADB_INCLUDE_DIR})

-set(mariadb_found TRUE)
+set(MariaDB_FOUND TRUE)
--- a/dAuthServer/AuthServer.cpp
+++ b/dAuthServer/AuthServer.cpp
@@ -38,7 +38,7 @@ namespace Game {

 void HandlePacket(Packet* packet);

-int start(int argc, char** argv) {
+int main(int argc, char** argv) {
 	constexpr uint32_t authFramerate = mediumFramerate;
 	constexpr uint32_t authFrameDelta = mediumFrameDelta;
 	Diagnostics::SetProcessName("Auth");
@@ -161,43 +161,6 @@ int start(int argc, char** argv) {
 	return EXIT_SUCCESS;
 }

-#ifdef LOCAL_SERVER
-BOOL WINAPI DllMain(
-	HINSTANCE hinstDLL,  // handle to DLL module
-	DWORD fdwReason,     // reason for calling function
-	LPVOID lpvReserved)  // reserved
-{
-	// Perform actions based on the reason for calling.
-	switch (fdwReason) {
-	case DLL_PROCESS_ATTACH:
-		start(0, nullptr);
-		break;
-
-	case DLL_THREAD_ATTACH:
-		// Do thread-specific initialization.
-		break;
-
-	case DLL_THREAD_DETACH:
-		// Do thread-specific cleanup.
-		break;
-
-	case DLL_PROCESS_DETACH:
-
-		if (lpvReserved != nullptr) {
-			break; // do not do cleanup if process termination scenario
-		}
-
-		// Perform any necessary cleanup.
-		break;
-	}
-	return TRUE;  // Successful DLL_PROCESS_ATTACH.
-}
-#else
-int main(int argc, char** argv) {
-	return start(argc, argv);
-}
-#endif
-
 void HandlePacket(Packet* packet) {
 	if (packet->length < 4) return;

--- a/dAuthServer/CMakeLists.txt
+++ b/dAuthServer/CMakeLists.txt
@@ -1,9 +1,4 @@
-
-if (WIN32 AND LOCAL_SERVER)
-	add_library(AuthServer SHARED "AuthServer.cpp")
-else()
-	add_executable(AuthServer "AuthServer.cpp")
-endif()
+add_executable(AuthServer "AuthServer.cpp")

 target_link_libraries(AuthServer ${COMMON_LIBRARIES} dServer)

--- a/dChatServer/CMakeLists.txt
+++ b/dChatServer/CMakeLists.txt
@@ -4,13 +4,7 @@ set(DCHATSERVER_SOURCES
 	"PlayerContainer.cpp"
 )

-
-if (WIN32 AND LOCAL_SERVER)
-	add_library(ChatServer SHARED "ChatServer.cpp")
-else()
-	add_executable(ChatServer "ChatServer.cpp")
-endif()
-
+add_executable(ChatServer "ChatServer.cpp")
 target_include_directories(ChatServer PRIVATE "${PROJECT_SOURCE_DIR}/dChatFilter")
 add_compile_definitions(ChatServer PRIVATE PROJECT_VERSION="\"${PROJECT_VERSION}\"")

--- a/dChatServer/ChatServer.cpp
+++ b/dChatServer/ChatServer.cpp
@@ -41,7 +41,7 @@ namespace Game {

 void HandlePacket(Packet* packet);

-int start(int argc, char** argv) {
+int main(int argc, char** argv) {
 	constexpr uint32_t chatFramerate = mediumFramerate;
 	constexpr uint32_t chatFrameDelta = mediumFrameDelta;
 	Diagnostics::SetProcessName("Chat");
@@ -178,43 +178,6 @@ int start(int argc, char** argv) {
 	return EXIT_SUCCESS;
 }

-#ifdef LOCAL_SERVER
-BOOL WINAPI DllMain(
-	HINSTANCE hinstDLL,  // handle to DLL module
-	DWORD fdwReason,     // reason for calling function
-	LPVOID lpvReserved)  // reserved
-{
-	// Perform actions based on the reason for calling.
-	switch (fdwReason) {
-	case DLL_PROCESS_ATTACH:
-		start(0, nullptr);
-		break;
-
-	case DLL_THREAD_ATTACH:
-		// Do thread-specific initialization.
-		break;
-
-	case DLL_THREAD_DETACH:
-		// Do thread-specific cleanup.
-		break;
-
-	case DLL_PROCESS_DETACH:
-
-		if (lpvReserved != nullptr) {
-			break; // do not do cleanup if process termination scenario
-		}
-
-		// Perform any necessary cleanup.
-		break;
-	}
-	return TRUE;  // Successful DLL_PROCESS_ATTACH.
-}
-#else
-int main(int argc, char** argv) {
-	return start(argc, argv);
-}
-#endif
-
 void HandlePacket(Packet* packet) {
 	if (packet->length < 1) return;
 	if (packet->data[0] == ID_DISCONNECTION_NOTIFICATION || packet->data[0] == ID_CONNECTION_LOST) {
--- a/dCommon/CMakeLists.txt
+++ b/dCommon/CMakeLists.txt
@@ -37,6 +37,7 @@ target_include_directories(dCommon
 	"${PROJECT_SOURCE_DIR}/dDatabase/GameDatabase"
 	"${PROJECT_SOURCE_DIR}/dDatabase/GameDatabase/ITables"
 	"${PROJECT_SOURCE_DIR}/dDatabase/CDClientDatabase"
+	"${PROJECT_SOURCE_DIR}/thirdparty/mariadb-connector-cpp/include"
 )

 if (UNIX)
@@ -44,15 +45,11 @@ if (UNIX)
 elseif (WIN32)
 	include(FetchContent)

-    set(WITH_GTEST OFF CACHE BOOL "" FORCE)
-    set(ZLIB_ENABLE_TESTS OFF CACHE BOOL "" FORCE)
-    set(ZLIB_COMPAT ON CACHE BOOL "Enable ZLIB compatibility mode" FORCE)
-
 	# TODO Keep an eye on the zlib repository for an update to disable testing.  Don't forget to update CMakePresets
 	FetchContent_Declare(
 		zlib
-		URL https://github.com/zlib-ng/zlib-ng/archive/refs/tags/2.2.2.zip
-		URL_HASH MD5=2cf9199fb785ea579a2a9905a75c38b3
+		URL https://github.com/madler/zlib/archive/refs/tags/v1.2.11.zip
+		URL_HASH MD5=9d6a627693163bbbf3f26403a3a0b0b1
 	)

 	# Disable warning about no project version.
@@ -63,6 +60,7 @@ elseif (WIN32)
 	FetchContent_MakeAvailable(zlib)

 	set(ZLIB_INCLUDE_DIRS ${zlib_SOURCE_DIR} ${zlib_BINARY_DIR})
+	set_target_properties(zlib PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${ZLIB_INCLUDE_DIRS}")
 	add_library(ZLIB::ZLIB ALIAS zlib)
 else ()
 	message(
@@ -72,5 +70,6 @@ else ()
 endif ()

 target_link_libraries(dCommon
+	PUBLIC magic_enum::magic_enum
 	PRIVATE ZLIB::ZLIB bcrypt tinyxml2
 	INTERFACE dDatabase)
--- a/dCommon/GeneralUtils.cpp
+++ b/dCommon/GeneralUtils.cpp
@@ -291,12 +291,11 @@ std::u16string GeneralUtils::ReadWString(RakNet::BitStream& inStream) {

 std::vector<std::string> GeneralUtils::GetSqlFileNamesFromFolder(const std::string_view folder) {
 	// Because we dont know how large the initial number before the first _ is we need to make it a map like so.
-	std::map<uint32_t, std::string> filenames{};
+    std::map<uint32_t, std::string> filenames{};
 	for (const auto& t : std::filesystem::directory_iterator(folder)) {
-		if (t.is_directory() || t.is_symlink()) continue;
-		auto filename = t.path().filename().string();
-		const auto index = std::stoi(GeneralUtils::SplitString(filename, '_').at(0));
-		filenames.emplace(index, std::move(filename));
+        auto filename = t.path().filename().string();
+        const auto index = std::stoi(GeneralUtils::SplitString(filename, '_').at(0));
+        filenames.emplace(index, std::move(filename));
 	}

 	// Now sort the map by the oldest migration.
--- a/dCommon/ZCompression.cpp
+++ b/dCommon/ZCompression.cpp
@@ -9,7 +9,6 @@ namespace ZCompression {
 	}

 	int32_t Compress(const uint8_t* abSrc, int32_t nLenSrc, uint8_t* abDst, int32_t nLenDst) {
-        
 		z_stream zInfo = { 0 };
 		zInfo.total_in = zInfo.avail_in = nLenSrc;
 		zInfo.total_out = zInfo.avail_out = nLenDst;
--- a/dCommon/dClient/AssetManager.cpp
+++ b/dCommon/dClient/AssetManager.cpp
@@ -4,6 +4,8 @@
 #include "Game.h"
 #include "Logger.h"

+#include "zlib.h"
+
 AssetManager::AssetManager(const std::filesystem::path& path) {
 	if (!std::filesystem::is_directory(path)) {
 		throw std::runtime_error("Attempted to load asset bundle (" + path.string() + ") however it is not a valid directory.");
@@ -80,7 +82,7 @@ bool AssetManager::HasFile(const char* name) {
 	if (fixedName.rfind("client\\res\\", 0) != 0) fixedName = "client\\res\\" + fixedName;

 	uint32_t crc = crc32b(0xFFFFFFFF, reinterpret_cast<uint8_t*>(const_cast<char*>(fixedName.c_str())), fixedName.size());
-	crc = crc32b(crc, reinterpret_cast<uint8_t*>(const_cast<char*>("\0\0\0\0")), 4);
+	crc = crc32b(crc, reinterpret_cast<Bytef*>(const_cast<char*>("\0\0\0\0")), 4);

 	for (const auto& item : this->m_PackIndex->GetPackFileIndices()) {
 		if (item.m_Crc == crc) {
@@ -128,7 +130,7 @@ bool AssetManager::GetFile(const char* name, char** data, uint32_t* len) {
 	}
 	int32_t packIndex = -1;
 	uint32_t crc = crc32b(0xFFFFFFFF, reinterpret_cast<uint8_t*>(const_cast<char*>(fixedName.c_str())), fixedName.size());
-	crc = crc32b(crc, reinterpret_cast<uint8_t*>(const_cast<char*>("\0\0\0\0")), 4);
+	crc = crc32b(crc, reinterpret_cast<Bytef*>(const_cast<char*>("\0\0\0\0")), 4);

 	for (const auto& item : this->m_PackIndex->GetPackFileIndices()) {
 		if (item.m_Crc == crc) {
--- a/dCommon/dEnums/MessageType/Game.h
+++ b/dCommon/dEnums/MessageType/Game.h
@@ -1,7 +1,7 @@
 #pragma once
 #include <cstdint>

-#include "magic_enum.hpp"
+#include <magic_enum/magic_enum.hpp>

 namespace MessageType {
 	enum class Game : uint16_t {
--- a/dCommon/dEnums/MessageType/World.h
+++ b/dCommon/dEnums/MessageType/World.h
@@ -1,7 +1,7 @@
 #pragma once
 #include <cstdint>

-#include "magic_enum.hpp"
+#include <magic_enum/magic_enum.hpp>

 namespace MessageType {
 	enum class World : uint32_t {
--- a/dCommon/dEnums/StringifiedEnum.h
+++ b/dCommon/dEnums/StringifiedEnum.h
@@ -2,7 +2,7 @@
 #define __STRINGIFIEDENUM_H__

 #include <string>
-#include "magic_enum.hpp"
+#include <magic_enum/magic_enum.hpp>

 namespace StringifiedEnum {
 	template<typename T>
--- a/dCommon/dEnums/dPlatforms.h
+++ b/dCommon/dEnums/dPlatforms.h
@@ -8,8 +8,6 @@
 #define DARKFLAME_PLATFORM_IOS
 #elif TARGET_OS_MAC
 #define DARKFLAME_PLATFORM_MACOS
-#pragma clang diagnostic push // prevent pragma messages being counted as a warning
-#pragma clang diagnostic ignored "-W#pragma-messages"
 #else
 #error unknown Apple operating system
 #endif
--- a/dCommon/dEnums/eInventoryType.h
+++ b/dCommon/dEnums/eInventoryType.h
@@ -5,7 +5,7 @@

 #include <cstdint>

-#include "magic_enum.hpp"
+#include <magic_enum/magic_enum.hpp>

 static const uint8_t NUMBER_OF_INVENTORIES = 17;
 /**
--- a/dDatabase/CMakeLists.txt
+++ b/dDatabase/CMakeLists.txt
@@ -2,12 +2,6 @@ add_subdirectory(CDClientDatabase)
 add_subdirectory(GameDatabase)

 add_library(dDatabase STATIC "MigrationRunner.cpp")
-
-add_custom_target(conncpp_dylib
-	${CMAKE_COMMAND} -E copy $<TARGET_FILE:mariadb_cpp_connector> ${CMAKE_BINARY_DIR})
-
-add_dependencies(dDatabase conncpp_dylib)
-
 target_include_directories(dDatabase PUBLIC ".")
 target_link_libraries(dDatabase
-	PUBLIC dDatabaseCDClient dDatabaseGame)
+	PUBLIC magic_enum::magic_enum dDatabaseCDClient dDatabaseGame)
--- a/dDatabase/GameDatabase/CMakeLists.txt
+++ b/dDatabase/GameDatabase/CMakeLists.txt
@@ -8,12 +8,6 @@ foreach(file ${DDATABSE_DATABSES_MYSQL_SOURCES})
 	set(DDATABASE_GAMEDATABASE_SOURCES ${DDATABASE_GAMEDATABASE_SOURCES} "MySQL/${file}")
 endforeach()

-add_subdirectory(SQLite)
-
-foreach(file ${DDATABSE_DATABSES_SQLITE_SOURCES})
-	set(DDATABASE_GAMEDATABASE_SOURCES ${DDATABASE_GAMEDATABASE_SOURCES} "SQLite/${file}")
-endforeach()
-
 add_subdirectory(TestSQL)

 foreach(file ${DDATABSE_DATABSES_TEST_SQL_SOURCES})
@@ -22,13 +16,12 @@ endforeach()

 add_library(dDatabaseGame STATIC ${DDATABASE_GAMEDATABASE_SOURCES})
 target_include_directories(dDatabaseGame PUBLIC "."
-	"ITables" PRIVATE "MySQL" "SQLite" "TestSQL"
+	"ITables" PRIVATE "MySQL" "TestSQL"
 	"${PROJECT_SOURCE_DIR}/dCommon"
 	"${PROJECT_SOURCE_DIR}/dCommon/dEnums"
 )
-
 target_link_libraries(dDatabaseGame
-	PUBLIC mariadb_cpp_connector
+	PUBLIC MariaDB::ConnCpp
 	INTERFACE dCommon)

 # Glob together all headers that need to be precompiled
--- a/dDatabase/GameDatabase/Database.cpp
+++ b/dDatabase/GameDatabase/Database.cpp
@@ -2,12 +2,8 @@
 #include "Game.h"
 #include "dConfig.h"
 #include "Logger.h"
-#include "DluAssert.h"
-
-#include "SQLiteDatabase.h"
 #include "MySQLDatabase.h"
-
-#include <ranges>
+#include "DluAssert.h"

 #pragma warning (disable:4251) //Disables SQL warnings

@@ -15,33 +11,13 @@ namespace {
 	GameDatabase* database = nullptr;
 }

-std::string Database::GetMigrationFolder() {
-	const std::set<std::string> validMysqlTypes = { "mysql", "mariadb", "maria" };
-	auto databaseType = Game::config->GetValue("database_type");
-	std::ranges::transform(databaseType, databaseType.begin(), ::tolower);
-	if (databaseType == "sqlite") return "sqlite";
-	else if (validMysqlTypes.contains(databaseType)) return "mysql";
-	else {
-		LOG("No database specified, using MySQL");
-		return "mysql";
-	}
-}
-
 void Database::Connect() {
 	if (database) {
 		LOG("Tried to connect to database when it's already connected!");
 		return;
 	}

-	const auto databaseType = GetMigrationFolder();
-
-	if (databaseType == "sqlite") database = new SQLiteDatabase();
-	else if (databaseType == "mysql") database = new MySQLDatabase();
-	else {
-		LOG("Invalid database type specified in config, using MySQL");
-		database = new MySQLDatabase();
-	}
-
+	database = new MySQLDatabase();
 	database->Connect();
 }

--- a/dDatabase/GameDatabase/Database.h
+++ b/dDatabase/GameDatabase/Database.h
@@ -12,6 +12,4 @@ namespace Database {
 	// Used for assigning a test database as the handler for database logic.
 	// Do not use in production code.
 	void _setDatabase(GameDatabase* const db);
-
-	std::string GetMigrationFolder();
 };
--- a/dDatabase/GameDatabase/GameDatabase.h
+++ b/dDatabase/GameDatabase/GameDatabase.h
@@ -26,8 +26,13 @@
 #include "IBehaviors.h"
 #include "IUgcModularBuild.h"

+namespace sql {
+	class Statement;
+	class PreparedStatement;
+};
+
 #ifdef _DEBUG
-#  define DLU_SQL_TRY_CATCH_RETHROW(x) do { try { x; } catch (std::exception& ex) { LOG("SQL Error: %s", ex.what()); throw; } } while(0)
+#  define DLU_SQL_TRY_CATCH_RETHROW(x) do { try { x; } catch (sql::SQLException& ex) { LOG("SQL Error: %s", ex.what()); throw; } } while(0)
 #else
 #  define DLU_SQL_TRY_CATCH_RETHROW(x) x
 #endif // _DEBUG
@@ -45,6 +50,7 @@ public:
 	virtual void Connect() = 0;
 	virtual void Destroy(std::string source = "") = 0;
 	virtual void ExecuteCustomQuery(const std::string_view query) = 0;
+	virtual sql::PreparedStatement* CreatePreppedStmt(const std::string& query) = 0;
 	virtual void Commit() = 0;
 	virtual bool GetAutoCommit() = 0;
 	virtual void SetAutoCommit(bool value) = 0;
--- a/dDatabase/GameDatabase/ITables/IAccounts.h
+++ b/dDatabase/GameDatabase/ITables/IAccounts.h
@@ -36,8 +36,6 @@ public:

 	// Update the GameMaster level of an account.
 	virtual void UpdateAccountGmLevel(const uint32_t accountId, const eGameMasterLevel gmLevel) = 0;
-
-	virtual uint32_t GetAccountCount() = 0;
 };

 #endif  //!__IACCOUNTS__H__
--- a/dDatabase/GameDatabase/MySQL/MySQLDatabase.cpp
+++ b/dDatabase/GameDatabase/MySQL/MySQLDatabase.cpp
@@ -14,7 +14,6 @@ namespace {
 };

 void MySQLDatabase::Connect() {
-	LOG("Using MySQL database");
 	driver = sql::mariadb::get_driver_instance();

 	// The mariadb connector is *supposed* to handle unix:// and pipe:// prefixes to hostName, but there are bugs where
@@ -68,7 +67,7 @@ void MySQLDatabase::ExecuteCustomQuery(const std::string_view query) {

 sql::PreparedStatement* MySQLDatabase::CreatePreppedStmt(const std::string& query) {
 	if (!con) {
-		Database::Get()->Connect();
+		Connect();
 		LOG("Trying to reconnect to MySQL");
 	}

@@ -77,7 +76,7 @@ sql::PreparedStatement* MySQLDatabase::CreatePreppedStmt(const std::string& quer

 		con = nullptr;

-		Database::Get()->Connect();
+		Connect();
 		LOG("Trying to reconnect to MySQL from invalid or closed connection");
 	}

--- a/dDatabase/GameDatabase/MySQL/MySQLDatabase.h
+++ b/dDatabase/GameDatabase/MySQL/MySQLDatabase.h
@@ -30,6 +30,7 @@ public:
 	void Connect() override;
 	void Destroy(std::string source = "") override;

+	sql::PreparedStatement* CreatePreppedStmt(const std::string& query) override;
 	void Commit() override;
 	bool GetAutoCommit() override;
 	void SetAutoCommit(bool value) override;
@@ -124,8 +125,6 @@ public:
 	void IncrementTimesPlayed(const uint32_t playerId, const uint32_t gameId) override;
 	void InsertUgcBuild(const std::string& modules, const LWOOBJID bigId, const std::optional<uint32_t> characterId) override;
 	void DeleteUgcBuild(const LWOOBJID bigId) override;
-	sql::PreparedStatement* CreatePreppedStmt(const std::string& query);
-	uint32_t GetAccountCount() override;
 private:

 	// Generic query functions that can be used for any query.
--- a/dDatabase/GameDatabase/MySQL/Tables/Accounts.cpp
+++ b/dDatabase/GameDatabase/MySQL/Tables/Accounts.cpp
@@ -39,8 +39,3 @@ void MySQLDatabase::InsertNewAccount(const std::string_view username, const std:
 void MySQLDatabase::UpdateAccountGmLevel(const uint32_t accountId, const eGameMasterLevel gmLevel) {
 	ExecuteUpdate("UPDATE accounts SET gm_level = ? WHERE id = ?;", static_cast<int32_t>(gmLevel), accountId);
 }
-
-uint32_t MySQLDatabase::GetAccountCount() {
-	auto res = ExecuteSelect("SELECT COUNT(*) as count FROM accounts;");
-	return res->next() ? res->getUInt("count") : 0;
-}
--- a/dDatabase/GameDatabase/SQLite/CMakeLists.txt
+++ b/dDatabase/GameDatabase/SQLite/CMakeLists.txt
@@ -1,11 +0,0 @@
-SET(DDATABSE_DATABSES_SQLITE_SOURCES
-	"SQLiteDatabase.cpp"
-)
-
-add_subdirectory(Tables)
-
-foreach(file ${DDATABASES_DATABASES_SQLITE_TABLES_SOURCES})
-	set(DDATABSE_DATABSES_SQLITE_SOURCES ${DDATABSE_DATABSES_SQLITE_SOURCES} "Tables/${file}")
-endforeach()
-
-set(DDATABSE_DATABSES_SQLITE_SOURCES ${DDATABSE_DATABSES_SQLITE_SOURCES} PARENT_SCOPE)
--- a/dDatabase/GameDatabase/SQLite/SQLiteDatabase.cpp
+++ b/dDatabase/GameDatabase/SQLite/SQLiteDatabase.cpp
@@ -1,73 +0,0 @@
-#include "SQLiteDatabase.h"
-
-#include "Database.h"
-#include "Game.h"
-#include "dConfig.h"
-#include "Logger.h"
-#include "dPlatforms.h"
-
-// Static Variables
-
-// Status Variables
-namespace {
-	CppSQLite3DB* con = nullptr;
-	bool isConnected = false;
-};
-
-void SQLiteDatabase::Connect() {
-	LOG("Using SQLite database");
-	con = new CppSQLite3DB();
-	con->open(Game::config->GetValue("sqlite_database_path").c_str());
-	isConnected = true;
-
-	// Make sure wal is enabled for the database.
-	con->execQuery("PRAGMA journal_mode = WAL;");
-}
-
-void SQLiteDatabase::Destroy(std::string source) {
-	if (!con) return;
-
-	if (source.empty()) LOG("Destroying SQLite connection!");
-	else LOG("Destroying SQLite connection from %s!", source.c_str());
-
-	con->close();
-	delete con;
-	con = nullptr;
-}
-
-void SQLiteDatabase::ExecuteCustomQuery(const std::string_view query) {
-	con->compileStatement(query.data()).execDML();
-}
-
-CppSQLite3Statement SQLiteDatabase::CreatePreppedStmt(const std::string& query) {
-	return con->compileStatement(query.c_str());
-}
-
-void SQLiteDatabase::Commit() {
-	if (!con->IsAutoCommitOn()) con->compileStatement("COMMIT;").execDML();
-}
-
-bool SQLiteDatabase::GetAutoCommit() {
-	return con->IsAutoCommitOn();
-}
-
-void SQLiteDatabase::SetAutoCommit(bool value) {
-	if (value) {
-		if (GetAutoCommit()) con->compileStatement("BEGIN;").execDML();
-	} else {
-		if (!GetAutoCommit()) con->compileStatement("COMMIT;").execDML();
-	}
-}
-
-void SQLiteDatabase::DeleteCharacter(const uint32_t characterId) {
-	ExecuteDelete("DELETE FROM charxml WHERE id=?;", characterId);
-	ExecuteDelete("DELETE FROM command_log WHERE character_id=?;", characterId);
-	ExecuteDelete("DELETE FROM friends WHERE player_id=? OR friend_id=?;", characterId, characterId);
-	ExecuteDelete("DELETE FROM leaderboard WHERE character_id=?;", characterId);
-	ExecuteDelete("DELETE FROM properties_contents WHERE property_id IN (SELECT id FROM properties WHERE owner_id=?);", characterId);
-	ExecuteDelete("DELETE FROM properties WHERE owner_id=?;", characterId);
-	ExecuteDelete("DELETE FROM ugc WHERE character_id=?;", characterId);
-	ExecuteDelete("DELETE FROM activity_log WHERE character_id=?;", characterId);
-	ExecuteDelete("DELETE FROM mail WHERE receiver_id=?;", characterId);
-	ExecuteDelete("DELETE FROM charinfo WHERE id=?;", characterId);
-}
--- a/dDatabase/GameDatabase/SQLite/SQLiteDatabase.h
+++ b/dDatabase/GameDatabase/SQLite/SQLiteDatabase.h
@@ -1,270 +0,0 @@
-#ifndef SQLITEDATABASE_H
-#define SQLITEDATABASE_H
-
-#include "CppSQLite3.h"
-
-#include "GameDatabase.h"
-
-using PreppedStmtRef = CppSQLite3Statement&;
-
-// Purposefully no definition for this to provide linker errors in the case someone tries to
-// bind a parameter to a type that isn't defined.
-template<typename ParamType>
-inline void SetParam(PreppedStmtRef stmt, const int index, const ParamType param);
-
-// This is a function to set each parameter in a prepared statement.
-// This is accomplished with a combination of parameter packing and Fold Expressions.
-// The constexpr if statement is used to prevent the compiler from trying to call SetParam with 0 arguments.
-template<typename... Args>
-void SetParams(PreppedStmtRef stmt, Args&&... args) {
-	if constexpr (sizeof...(args) != 0) {
-		int i = 1;
-		(SetParam(stmt, i++, args), ...);
-	}
-}
-
-class SQLiteDatabase : public GameDatabase {
-public:
-	void Connect() override;
-	void Destroy(std::string source = "") override;
-
-	void Commit() override;
-	bool GetAutoCommit() override;
-	void SetAutoCommit(bool value) override;
-	void ExecuteCustomQuery(const std::string_view query) override;
-
-	// Overloaded queries
-	std::optional<IServers::MasterInfo> GetMasterInfo() override;
-
-	std::vector<std::string> GetApprovedCharacterNames() override;
-
-	std::vector<FriendData> GetFriendsList(uint32_t charID) override;
-
-	std::optional<IFriends::BestFriendStatus> GetBestFriendStatus(const uint32_t playerCharacterId, const uint32_t friendCharacterId) override;
-	void SetBestFriendStatus(const uint32_t playerAccountId, const uint32_t friendAccountId, const uint32_t bestFriendStatus) override;
-	void AddFriend(const uint32_t playerAccountId, const uint32_t friendAccountId) override;
-	void RemoveFriend(const uint32_t playerAccountId, const uint32_t friendAccountId) override;
-	void UpdateActivityLog(const uint32_t characterId, const eActivityType activityType, const LWOMAPID mapId) override;
-	void DeleteUgcModelData(const LWOOBJID& modelId) override;
-	void UpdateUgcModelData(const LWOOBJID& modelId, std::istringstream& lxfml) override;
-	std::vector<IUgc::Model> GetAllUgcModels() override;
-	void CreateMigrationHistoryTable() override;
-	bool IsMigrationRun(const std::string_view str) override;
-	void InsertMigration(const std::string_view str) override;
-	std::optional<ICharInfo::Info> GetCharacterInfo(const uint32_t charId) override;
-	std::optional<ICharInfo::Info> GetCharacterInfo(const std::string_view charId) override;
-	std::string GetCharacterXml(const uint32_t accountId) override;
-	void UpdateCharacterXml(const uint32_t characterId, const std::string_view lxfml) override;
-	std::optional<IAccounts::Info> GetAccountInfo(const std::string_view username) override;
-	void InsertNewCharacter(const ICharInfo::Info info) override;
-	void InsertCharacterXml(const uint32_t accountId, const std::string_view lxfml) override;
-	std::vector<uint32_t> GetAccountCharacterIds(uint32_t accountId) override;
-	void DeleteCharacter(const uint32_t characterId) override;
-	void SetCharacterName(const uint32_t characterId, const std::string_view name) override;
-	void SetPendingCharacterName(const uint32_t characterId, const std::string_view name) override;
-	void UpdateLastLoggedInCharacter(const uint32_t characterId) override;
-	void SetPetNameModerationStatus(const LWOOBJID& petId, const IPetNames::Info& info) override;
-	std::optional<IPetNames::Info> GetPetNameInfo(const LWOOBJID& petId) override;
-	std::optional<IProperty::Info> GetPropertyInfo(const LWOMAPID mapId, const LWOCLONEID cloneId) override;
-	void UpdatePropertyModerationInfo(const IProperty::Info& info) override;
-	void UpdatePropertyDetails(const IProperty::Info& info) override;
-	void InsertNewProperty(const IProperty::Info& info, const uint32_t templateId, const LWOZONEID& zoneId) override;
-	std::vector<IPropertyContents::Model> GetPropertyModels(const LWOOBJID& propertyId) override;
-	void RemoveUnreferencedUgcModels() override;
-	void InsertNewPropertyModel(const LWOOBJID& propertyId, const IPropertyContents::Model& model, const std::string_view name) override;
-	void UpdateModel(const LWOOBJID& propertyId, const NiPoint3& position, const NiQuaternion& rotation, const std::array<std::pair<int32_t, std::string>, 5>& behaviors) override;
-	void RemoveModel(const LWOOBJID& modelId) override;
-	void UpdatePerformanceCost(const LWOZONEID& zoneId, const float performanceCost) override;
-	void InsertNewBugReport(const IBugReports::Info& info) override;
-	void InsertCheatDetection(const IPlayerCheatDetections::Info& info) override;
-	void InsertNewMail(const IMail::MailInfo& mail) override;
-	void InsertNewUgcModel(
-		std::istringstream& sd0Data,
-		const uint32_t blueprintId,
-		const uint32_t accountId,
-		const uint32_t characterId) override;
-	std::vector<IMail::MailInfo> GetMailForPlayer(const uint32_t characterId, const uint32_t numberOfMail) override;
-	std::optional<IMail::MailInfo> GetMail(const uint64_t mailId) override;
-	uint32_t GetUnreadMailCount(const uint32_t characterId) override;
-	void MarkMailRead(const uint64_t mailId) override;
-	void DeleteMail(const uint64_t mailId) override;
-	void ClaimMailItem(const uint64_t mailId) override;
-	void InsertSlashCommandUsage(const uint32_t characterId, const std::string_view command) override;
-	void UpdateAccountUnmuteTime(const uint32_t accountId, const uint64_t timeToUnmute) override;
-	void UpdateAccountBan(const uint32_t accountId, const bool banned) override;
-	void UpdateAccountPassword(const uint32_t accountId, const std::string_view bcryptpassword) override;
-	void InsertNewAccount(const std::string_view username, const std::string_view bcryptpassword) override;
-	void SetMasterIp(const std::string_view ip, const uint32_t port) override;
-	std::optional<uint32_t> GetCurrentPersistentId() override;
-	void InsertDefaultPersistentId() override;
-	void UpdatePersistentId(const uint32_t id) override;
-	std::optional<uint32_t> GetDonationTotal(const uint32_t activityId) override;
-	std::optional<bool> IsPlaykeyActive(const int32_t playkeyId) override;
-	std::vector<IUgc::Model> GetUgcModels(const LWOOBJID& propertyId) override;
-	void AddIgnore(const uint32_t playerId, const uint32_t ignoredPlayerId) override;
-	void RemoveIgnore(const uint32_t playerId, const uint32_t ignoredPlayerId) override;
-	std::vector<IIgnoreList::Info> GetIgnoreList(const uint32_t playerId) override;
-	void InsertRewardCode(const uint32_t account_id, const uint32_t reward_code) override;
-	std::vector<uint32_t> GetRewardCodesByAccountID(const uint32_t account_id) override;
-	void AddBehavior(const IBehaviors::Info& info) override;
-	std::string GetBehavior(const int32_t behaviorId) override;
-	void RemoveBehavior(const int32_t characterId) override;
-	void UpdateAccountGmLevel(const uint32_t accountId, const eGameMasterLevel gmLevel) override;
-	std::optional<IProperty::PropertyEntranceResult> GetProperties(const IProperty::PropertyLookup& params) override;
-	std::vector<ILeaderboard::Entry> GetDescendingLeaderboard(const uint32_t activityId) override;
-	std::vector<ILeaderboard::Entry> GetAscendingLeaderboard(const uint32_t activityId) override;
-	std::vector<ILeaderboard::Entry> GetNsLeaderboard(const uint32_t activityId) override;
-	std::vector<ILeaderboard::Entry> GetAgsLeaderboard(const uint32_t activityId) override;
-	void SaveScore(const uint32_t playerId, const uint32_t gameId, const Score& score) override;
-	void UpdateScore(const uint32_t playerId, const uint32_t gameId, const Score& score) override;
-	std::optional<ILeaderboard::Score> GetPlayerScore(const uint32_t playerId, const uint32_t gameId) override;
-	void IncrementNumWins(const uint32_t playerId, const uint32_t gameId) override;
-	void IncrementTimesPlayed(const uint32_t playerId, const uint32_t gameId) override;
-	void InsertUgcBuild(const std::string& modules, const LWOOBJID bigId, const std::optional<uint32_t> characterId) override;
-	void DeleteUgcBuild(const LWOOBJID bigId) override;
-	uint32_t GetAccountCount() override;
-private:
-	CppSQLite3Statement CreatePreppedStmt(const std::string& query);
-
-	// Generic query functions that can be used for any query.
-	// Return type may be different depending on the query, so it is up to the caller to check the return type.
-	// The first argument is the query string, and the rest are the parameters to bind to the query.
-	// The return type is a unique_ptr to the result set, which is deleted automatically when it goes out of scope
-	template<typename... Args>
-	inline std::pair<CppSQLite3Statement, CppSQLite3Query> ExecuteSelect(const std::string& query, Args&&... args) {
-		std::pair<CppSQLite3Statement, CppSQLite3Query> toReturn;
-		toReturn.first = CreatePreppedStmt(query);
-		SetParams(toReturn.first, std::forward<Args>(args)...);
-		DLU_SQL_TRY_CATCH_RETHROW(toReturn.second = toReturn.first.execQuery());
-		return toReturn;
-	}
-
-	template<typename... Args>
-	inline void ExecuteDelete(const std::string& query, Args&&... args) {
-		auto preppedStmt = CreatePreppedStmt(query);
-		SetParams(preppedStmt, std::forward<Args>(args)...);
-		DLU_SQL_TRY_CATCH_RETHROW(preppedStmt.execDML());
-	}
-
-	template<typename... Args>
-	inline int32_t ExecuteUpdate(const std::string& query, Args&&... args) {
-		auto preppedStmt = CreatePreppedStmt(query);
-		SetParams(preppedStmt, std::forward<Args>(args)...);
-		DLU_SQL_TRY_CATCH_RETHROW(return preppedStmt.execDML());
-	}
-
-	template<typename... Args>
-	inline int ExecuteInsert(const std::string& query, Args&&... args) {
-		auto preppedStmt = CreatePreppedStmt(query);
-		SetParams(preppedStmt, std::forward<Args>(args)...);
-		DLU_SQL_TRY_CATCH_RETHROW(return preppedStmt.execDML());
-	}
-};
-
-// Below are each of the definitions of SetParam for each supported type.
-
-template<>
-inline void SetParam(PreppedStmtRef stmt, const int index, const std::string_view param) {
-	LOG("%s", param.data());
-	stmt.bind(index, param.data());
-}
-
-template<>
-inline void SetParam(PreppedStmtRef stmt, const int index, const char* param) {
-	LOG("%s", param);
-	stmt.bind(index, param);
-}
-
-template<>
-inline void SetParam(PreppedStmtRef stmt, const int index, const std::string param) {
-	LOG("%s", param.c_str());
-	stmt.bind(index, param.c_str());
-}
-
-template<>
-inline void SetParam(PreppedStmtRef stmt, const int index, const int8_t param) {
-	LOG("%u", param);
-	stmt.bind(index, param);
-}
-
-template<>
-inline void SetParam(PreppedStmtRef stmt, const int index, const uint8_t param) {
-	LOG("%d", param);
-	stmt.bind(index, param);
-}
-
-template<>
-inline void SetParam(PreppedStmtRef stmt, const int index, const int16_t param) {
-	LOG("%u", param);
-	stmt.bind(index, param);
-}
-
-template<>
-inline void SetParam(PreppedStmtRef stmt, const int index, const uint16_t param) {
-	LOG("%d", param);
-	stmt.bind(index, param);
-}
-
-template<>
-inline void SetParam(PreppedStmtRef stmt, const int index, const uint32_t param) {
-	LOG("%u", param);
-	stmt.bind(index, static_cast<int32_t>(param));
-}
-
-template<>
-inline void SetParam(PreppedStmtRef stmt, const int index, const int32_t param) {
-	LOG("%d", param);
-	stmt.bind(index, param);
-}
-
-template<>
-inline void SetParam(PreppedStmtRef stmt, const int index, const int64_t param) {
-	LOG("%llu", param);
-	stmt.bind(index, static_cast<sqlite_int64>(param));
-}
-
-template<>
-inline void SetParam(PreppedStmtRef stmt, const int index, const uint64_t param) {
-	LOG("%llu", param);
-	stmt.bind(index, static_cast<sqlite_int64>(param));
-}
-
-template<>
-inline void SetParam(PreppedStmtRef stmt, const int index, const float param) {
-	LOG("%f", param);
-	stmt.bind(index, param);
-}
-
-template<>
-inline void SetParam(PreppedStmtRef stmt, const int index, const double param) {
-	LOG("%f", param);
-	stmt.bind(index, param);
-}
-
-template<>
-inline void SetParam(PreppedStmtRef stmt, const int index, const bool param) {
-	LOG("%d", param);
-	stmt.bind(index, param);
-}
-
-template<>
-inline void SetParam(PreppedStmtRef stmt, const int index, const std::istream* param) {
-	LOG("Blob");
-	// This is the one time you will ever see me use const_cast.
-	std::stringstream stream;
-	stream << param->rdbuf();
-	stmt.bind(index, reinterpret_cast<const unsigned char*>(stream.str().c_str()), stream.str().size());
-}
-
-template<>
-inline void SetParam(PreppedStmtRef stmt, const int index, const std::optional<uint32_t> param) {
-	if (param) {
-		LOG("%d", param.value());
-		stmt.bind(index, static_cast<int>(param.value()));
-	} else {
-		LOG("Null");
-		stmt.bindNull(index);
-	}
-}
-
-#endif  //!SQLITEDATABASE_H
--- a/dDatabase/GameDatabase/SQLite/Tables/Accounts.cpp
+++ b/dDatabase/GameDatabase/SQLite/Tables/Accounts.cpp
@@ -1,49 +0,0 @@
-#include "SQLiteDatabase.h"
-
-#include "eGameMasterLevel.h"
-#include "Database.h"
-
-std::optional<IAccounts::Info> SQLiteDatabase::GetAccountInfo(const std::string_view username) {
-	auto [_, result] = ExecuteSelect("SELECT * FROM accounts WHERE name = ? LIMIT 1", username);
-
-	if (result.eof()) {
-		return std::nullopt;
-	}
-
-	IAccounts::Info toReturn;
-	toReturn.id = result.getIntField("id");
-	toReturn.maxGmLevel = static_cast<eGameMasterLevel>(result.getIntField("gm_level"));
-	toReturn.bcryptPassword = result.getStringField("password");
-	toReturn.banned = result.getIntField("banned");
-	toReturn.locked = result.getIntField("locked");
-	toReturn.playKeyId = result.getIntField("play_key_id");
-
-	return toReturn;
-}
-
-void SQLiteDatabase::UpdateAccountUnmuteTime(const uint32_t accountId, const uint64_t timeToUnmute) {
-	ExecuteUpdate("UPDATE accounts SET mute_expire = ? WHERE id = ?;", timeToUnmute, accountId);
-}
-
-void SQLiteDatabase::UpdateAccountBan(const uint32_t accountId, const bool banned) {
-	ExecuteUpdate("UPDATE accounts SET banned = ? WHERE id = ?;", banned, accountId);
-}
-
-void SQLiteDatabase::UpdateAccountPassword(const uint32_t accountId, const std::string_view bcryptpassword) {
-	ExecuteUpdate("UPDATE accounts SET password = ? WHERE id = ?;", bcryptpassword, accountId);
-}
-
-void SQLiteDatabase::InsertNewAccount(const std::string_view username, const std::string_view bcryptpassword) {
-	ExecuteInsert("INSERT INTO accounts (name, password, gm_level) VALUES (?, ?, ?);", username, bcryptpassword, static_cast<int32_t>(eGameMasterLevel::OPERATOR));
-}
-
-void SQLiteDatabase::UpdateAccountGmLevel(const uint32_t accountId, const eGameMasterLevel gmLevel) {
-	ExecuteUpdate("UPDATE accounts SET gm_level = ? WHERE id = ?;", static_cast<int32_t>(gmLevel), accountId);
-}
-
-uint32_t SQLiteDatabase::GetAccountCount() {
-	auto [_, res] = ExecuteSelect("SELECT COUNT(*) as count FROM accounts;");
-	if (res.eof()) return 0;
-
-	return res.getIntField("count");
-}
--- a/dDatabase/GameDatabase/SQLite/Tables/AccountsRewardCodes.cpp
+++ b/dDatabase/GameDatabase/SQLite/Tables/AccountsRewardCodes.cpp
@@ -1,17 +0,0 @@
-#include "SQLiteDatabase.h"
-
-void SQLiteDatabase::InsertRewardCode(const uint32_t account_id, const uint32_t reward_code) {
-	ExecuteInsert("INSERT OR IGNORE INTO accounts_rewardcodes (account_id, rewardcode) VALUES (?, ?);", account_id, reward_code);
-}
-
-std::vector<uint32_t> SQLiteDatabase::GetRewardCodesByAccountID(const uint32_t account_id) {
-	auto [_, result] = ExecuteSelect("SELECT rewardcode FROM accounts_rewardcodes WHERE account_id = ?;", account_id);
-
-	std::vector<uint32_t> toReturn;
-	while (!result.eof()) {
-		toReturn.push_back(result.getIntField("rewardcode"));
-		result.nextRow();
-	}
-
-	return toReturn;
-}
--- a/dDatabase/GameDatabase/SQLite/Tables/ActivityLog.cpp
+++ b/dDatabase/GameDatabase/SQLite/Tables/ActivityLog.cpp
@@ -1,6 +0,0 @@
-#include "SQLiteDatabase.h"
-
-void SQLiteDatabase::UpdateActivityLog(const uint32_t characterId, const eActivityType activityType, const LWOMAPID mapId) {
-	ExecuteInsert("INSERT INTO activity_log (character_id, activity, time, map_id) VALUES (?, ?, ?, ?);",
-		characterId, static_cast<uint32_t>(activityType), static_cast<uint32_t>(time(NULL)), mapId);
-}
--- a/dDatabase/GameDatabase/SQLite/Tables/Behaviors.cpp
+++ b/dDatabase/GameDatabase/SQLite/Tables/Behaviors.cpp
@@ -1,19 +0,0 @@
-#include "IBehaviors.h"
-
-#include "SQLiteDatabase.h"
-
-void SQLiteDatabase::AddBehavior(const IBehaviors::Info& info) {
-	ExecuteInsert(
-		"INSERT INTO behaviors (behavior_info, character_id, behavior_id) VALUES (?, ?, ?) ON CONFLICT(behavior_id) DO UPDATE SET behavior_info = ?",
-		info.behaviorInfo, info.characterId, info.behaviorId, info.behaviorInfo
-	);
-}
-
-void SQLiteDatabase::RemoveBehavior(const int32_t behaviorId) {
-	ExecuteDelete("DELETE FROM behaviors WHERE behavior_id = ?", behaviorId);
-}
-
-std::string SQLiteDatabase::GetBehavior(const int32_t behaviorId) {
-	auto [_, result] = ExecuteSelect("SELECT behavior_info FROM behaviors WHERE behavior_id = ?", behaviorId);
-	return !result.eof() ? result.getStringField("behavior_info") : "";
-}
--- a/dDatabase/GameDatabase/SQLite/Tables/BugReports.cpp
+++ b/dDatabase/GameDatabase/SQLite/Tables/BugReports.cpp
@@ -1,6 +0,0 @@
-#include "SQLiteDatabase.h"
-
-void SQLiteDatabase::InsertNewBugReport(const IBugReports::Info& info) {
-	ExecuteInsert("INSERT INTO `bug_reports`(body, client_version, other_player_id, selection, reporter_id) VALUES (?, ?, ?, ?, ?)",
-		info.body, info.clientVersion, info.otherPlayer, info.selection, info.characterId);
-}
--- a/dDatabase/GameDatabase/SQLite/Tables/CMakeLists.txt
+++ b/dDatabase/GameDatabase/SQLite/Tables/CMakeLists.txt
@@ -1,26 +0,0 @@
-set(DDATABASES_DATABASES_SQLITE_TABLES_SOURCES
-	"Accounts.cpp"
-	"AccountsRewardCodes.cpp"
-	"ActivityLog.cpp"
-	"Behaviors.cpp"
-	"BugReports.cpp"
-	"CharInfo.cpp"
-	"CharXml.cpp"
-	"CommandLog.cpp"
-	"Friends.cpp"
-	"IgnoreList.cpp"
-	"Leaderboard.cpp"
-	"Mail.cpp"
-	"MigrationHistory.cpp"
-	"ObjectIdTracker.cpp"
-	"PetNames.cpp"
-	"PlayerCheatDetections.cpp"
-	"PlayKeys.cpp"
-	"Property.cpp"
-	"PropertyContents.cpp"
-	"Servers.cpp"
-	"Ugc.cpp"
-	"UgcModularBuild.cpp"
-	PARENT_SCOPE
-)
-
--- a/dDatabase/GameDatabase/SQLite/Tables/CharInfo.cpp
+++ b/dDatabase/GameDatabase/SQLite/Tables/CharInfo.cpp
@@ -1,79 +0,0 @@
-#include "SQLiteDatabase.h"
-
-std::vector<std::string> SQLiteDatabase::GetApprovedCharacterNames() {
-	auto [_, result] = ExecuteSelect("SELECT name FROM charinfo;");
-
-	std::vector<std::string> toReturn;
-
-	while (!result.eof()) {
-		toReturn.push_back(result.getStringField("name"));
-		result.nextRow();
-	}
-
-	return toReturn;
-}
-
-std::optional<ICharInfo::Info> CharInfoFromQueryResult(CppSQLite3Query stmt) {
-	if (stmt.eof()) {
-		return std::nullopt;
-	}
-
-	ICharInfo::Info toReturn;
-
-	toReturn.id = stmt.getIntField("id");
-	toReturn.name = stmt.getStringField("name");
-	toReturn.pendingName = stmt.getStringField("pending_name");
-	toReturn.needsRename = stmt.getIntField("needs_rename");
-	toReturn.cloneId = stmt.getInt64Field("prop_clone_id");
-	toReturn.accountId = stmt.getIntField("account_id");
-	toReturn.permissionMap = static_cast<ePermissionMap>(stmt.getIntField("permission_map"));
-
-	return toReturn;
-}
-
-std::optional<ICharInfo::Info> SQLiteDatabase::GetCharacterInfo(const uint32_t charId) {
-	return CharInfoFromQueryResult(
-		ExecuteSelect("SELECT name, pending_name, needs_rename, prop_clone_id, permission_map, id, account_id FROM charinfo WHERE id = ? LIMIT 1;", charId).second
-	);
-}
-
-std::optional<ICharInfo::Info> SQLiteDatabase::GetCharacterInfo(const std::string_view name) {
-	return CharInfoFromQueryResult(
-		ExecuteSelect("SELECT name, pending_name, needs_rename, prop_clone_id, permission_map, id, account_id FROM charinfo WHERE name = ? LIMIT 1;", name).second
-	);
-}
-
-std::vector<uint32_t> SQLiteDatabase::GetAccountCharacterIds(const uint32_t accountId) {
-	auto [_, result] = ExecuteSelect("SELECT id FROM charinfo WHERE account_id = ? ORDER BY last_login DESC LIMIT 4;", accountId);
-
-	std::vector<uint32_t> toReturn;
-	while (!result.eof()) {
-		toReturn.push_back(result.getIntField("id"));
-		result.nextRow();
-	}
-
-	return toReturn;
-}
-
-void SQLiteDatabase::InsertNewCharacter(const ICharInfo::Info info) {
-	ExecuteInsert(
-		"INSERT INTO `charinfo`(`id`, `account_id`, `name`, `pending_name`, `needs_rename`, `last_login`, `prop_clone_id`) VALUES (?,?,?,?,?,?,(SELECT IFNULL(MAX(`prop_clone_id`), 0) + 1 FROM `charinfo`))",
-		info.id,
-		info.accountId,
-		info.name,
-		info.pendingName,
-		false,
-		static_cast<uint32_t>(time(NULL)));
-}
-
-void SQLiteDatabase::SetCharacterName(const uint32_t characterId, const std::string_view name) {
-	ExecuteUpdate("UPDATE charinfo SET name = ?, pending_name = '', needs_rename = 0, last_login = ? WHERE id = ?;", name, static_cast<uint32_t>(time(NULL)), characterId);
-}
-
-void SQLiteDatabase::SetPendingCharacterName(const uint32_t characterId, const std::string_view name) {
-	ExecuteUpdate("UPDATE charinfo SET pending_name = ?, needs_rename = 0, last_login = ? WHERE id = ?;", name, static_cast<uint32_t>(time(NULL)), characterId);
-}
-
-void SQLiteDatabase::UpdateLastLoggedInCharacter(const uint32_t characterId) {
-	ExecuteUpdate("UPDATE charinfo SET last_login = ? WHERE id = ?;", static_cast<uint32_t>(time(NULL)), characterId);
-}
--- a/dDatabase/GameDatabase/SQLite/Tables/CharXml.cpp
+++ b/dDatabase/GameDatabase/SQLite/Tables/CharXml.cpp
@@ -1,19 +0,0 @@
-#include "SQLiteDatabase.h"
-
-std::string SQLiteDatabase::GetCharacterXml(const uint32_t charId) {
-	auto [_, result] = ExecuteSelect("SELECT xml_data FROM charxml WHERE id = ? LIMIT 1;", charId);
-
-	if (result.eof()) {
-		return "";
-	}
-
-	return result.getStringField("xml_data");
-}
-
-void SQLiteDatabase::UpdateCharacterXml(const uint32_t charId, const std::string_view lxfml) {
-	ExecuteUpdate("UPDATE charxml SET xml_data = ? WHERE id = ?;", lxfml, charId);
-}
-
-void SQLiteDatabase::InsertCharacterXml(const uint32_t characterId, const std::string_view lxfml) {
-	ExecuteInsert("INSERT INTO `charxml` (`id`, `xml_data`) VALUES (?,?)", characterId, lxfml);
-}
--- a/dDatabase/GameDatabase/SQLite/Tables/CommandLog.cpp
+++ b/dDatabase/GameDatabase/SQLite/Tables/CommandLog.cpp
@@ -1,5 +0,0 @@
-#include "SQLiteDatabase.h"
-
-void SQLiteDatabase::InsertSlashCommandUsage(const uint32_t characterId, const std::string_view command) {
-	ExecuteInsert("INSERT INTO command_log (character_id, command) VALUES (?, ?);", characterId, command);
-}
--- a/dDatabase/GameDatabase/SQLite/Tables/Friends.cpp
+++ b/dDatabase/GameDatabase/SQLite/Tables/Friends.cpp
@@ -1,73 +0,0 @@
-#include "SQLiteDatabase.h"
-
-std::vector<FriendData> SQLiteDatabase::GetFriendsList(const uint32_t charId) {
-	auto [_, friendsList] = ExecuteSelect(
-		R"QUERY(
-			SELECT fr.requested_player AS player, best_friend AS bff, ci.name AS name FROM 
-			(
-				SELECT CASE 
-				WHEN player_id = ? THEN friend_id 
-				WHEN friend_id = ? THEN player_id 
-				END AS requested_player, best_friend FROM friends
-			) AS fr 
-			JOIN charinfo AS ci ON ci.id = fr.requested_player 
-			WHERE fr.requested_player IS NOT NULL AND fr.requested_player != ?;
-		)QUERY", charId, charId, charId);
-
-	std::vector<FriendData> toReturn;
-
-	while (!friendsList.eof()) {
-		FriendData fd;
-		fd.friendID = friendsList.getIntField("player");
-		fd.isBestFriend = friendsList.getIntField("bff") == 3; // 0 = friends, 1 = left_requested, 2 = right_requested, 3 = both_accepted - are now bffs
-		fd.friendName = friendsList.getStringField("name");
-
-		toReturn.push_back(fd);
-		friendsList.nextRow();
-	}
-
-	return toReturn;
-}
-
-std::optional<IFriends::BestFriendStatus> SQLiteDatabase::GetBestFriendStatus(const uint32_t playerCharacterId, const uint32_t friendCharacterId) {
-	auto [_, result] = ExecuteSelect("SELECT * FROM friends WHERE (player_id = ? AND friend_id = ?) OR (player_id = ? AND friend_id = ?) LIMIT 1;",
-		playerCharacterId,
-		friendCharacterId,
-		friendCharacterId,
-		playerCharacterId
-	);
-
-	if (result.eof()) {
-		return std::nullopt;
-	}
-
-	IFriends::BestFriendStatus toReturn;
-	toReturn.playerCharacterId = result.getIntField("player_id");
-	toReturn.friendCharacterId = result.getIntField("friend_id");
-	toReturn.bestFriendStatus = result.getIntField("best_friend");
-
-	return toReturn;
-}
-
-void SQLiteDatabase::SetBestFriendStatus(const uint32_t playerCharacterId, const uint32_t friendCharacterId, const uint32_t bestFriendStatus) {
-	ExecuteUpdate("UPDATE friends SET best_friend = ? WHERE (player_id = ? AND friend_id = ?) OR (player_id = ? AND friend_id = ?);",
-		bestFriendStatus,
-		playerCharacterId,
-		friendCharacterId,
-		friendCharacterId,
-		playerCharacterId
-	);
-}
-
-void SQLiteDatabase::AddFriend(const uint32_t playerCharacterId, const uint32_t friendCharacterId) {
-	ExecuteInsert("INSERT OR IGNORE INTO friends (player_id, friend_id, best_friend) VALUES (?, ?, 0);", playerCharacterId, friendCharacterId);
-}
-
-void SQLiteDatabase::RemoveFriend(const uint32_t playerCharacterId, const uint32_t friendCharacterId) {
-	ExecuteDelete("DELETE FROM friends WHERE (player_id = ? AND friend_id = ?) OR (player_id = ? AND friend_id = ?);",
-		playerCharacterId,
-		friendCharacterId,
-		friendCharacterId,
-		playerCharacterId
-	);
-}
--- a/dDatabase/GameDatabase/SQLite/Tables/IgnoreList.cpp
+++ b/dDatabase/GameDatabase/SQLite/Tables/IgnoreList.cpp
@@ -1,22 +0,0 @@
-#include "SQLiteDatabase.h"
-
-std::vector<IIgnoreList::Info> SQLiteDatabase::GetIgnoreList(const uint32_t playerId) {
-	auto [_, result] = ExecuteSelect("SELECT ci.name AS name, il.ignored_player_id AS ignore_id FROM ignore_list AS il JOIN charinfo AS ci ON il.ignored_player_id = ci.id WHERE il.player_id = ?", playerId);
-
-	std::vector<IIgnoreList::Info> ignoreList;
-
-	while (!result.eof()) {
-		ignoreList.push_back(IIgnoreList::Info{ result.getStringField("name"), static_cast<uint32_t>(result.getIntField("ignore_id")) });
-		result.nextRow();
-	}
-
-	return ignoreList;
-}
-
-void SQLiteDatabase::AddIgnore(const uint32_t playerId, const uint32_t ignoredPlayerId) {
-	ExecuteInsert("INSERT OR IGNORE INTO ignore_list (player_id, ignored_player_id) VALUES (?, ?)", playerId, ignoredPlayerId);
-}
-
-void SQLiteDatabase::RemoveIgnore(const uint32_t playerId, const uint32_t ignoredPlayerId) {
-	ExecuteDelete("DELETE FROM ignore_list WHERE player_id = ? AND ignored_player_id = ?", playerId, ignoredPlayerId);
-}
--- a/dDatabase/GameDatabase/SQLite/Tables/Leaderboard.cpp
+++ b/dDatabase/GameDatabase/SQLite/Tables/Leaderboard.cpp
@@ -1,91 +0,0 @@
-#include "SQLiteDatabase.h"
-
-#include "Game.h"
-#include "Logger.h"
-#include "dConfig.h"
-
-std::optional<uint32_t> SQLiteDatabase::GetDonationTotal(const uint32_t activityId) {
-	auto [_, donation_total] = ExecuteSelect("SELECT SUM(primaryScore) as donation_total FROM leaderboard WHERE game_id = ?;", activityId);
-
-	if (donation_total.eof()) {
-		return std::nullopt;
-	}
-
-	return donation_total.getIntField("donation_total");
-}
-
-std::vector<ILeaderboard::Entry> ProcessQuery(CppSQLite3Query& rows) {
-	std::vector<ILeaderboard::Entry> entries;
-
-	while (!rows.eof()) {
-		auto& entry = entries.emplace_back();
-
-		entry.charId = rows.getIntField("character_id");
-		entry.lastPlayedTimestamp = rows.getIntField("lp_unix");
-		entry.primaryScore = rows.getFloatField("primaryScore");
-		entry.secondaryScore = rows.getFloatField("secondaryScore");
-		entry.tertiaryScore = rows.getFloatField("tertiaryScore");
-		entry.numWins = rows.getIntField("numWins");
-		entry.numTimesPlayed = rows.getIntField("timesPlayed");
-		entry.name = rows.getStringField("char_name");
-		// entry.ranking is never set because its calculated in leaderboard in code.
-		rows.nextRow();
-	}
-
-	return entries;
-}
-
-std::vector<ILeaderboard::Entry> SQLiteDatabase::GetDescendingLeaderboard(const uint32_t activityId) {
-	auto [_, result] = ExecuteSelect("SELECT *, CAST(strftime('%s', last_played) as INT) as lp_unix, ci.name as char_name FROM leaderboard lb JOIN charinfo ci on ci.id = lb.character_id where game_id = ? ORDER BY primaryscore DESC, secondaryscore DESC, tertiaryScore DESC, last_played ASC;", activityId);
-	return ProcessQuery(result);
-}
-
-std::vector<ILeaderboard::Entry> SQLiteDatabase::GetAscendingLeaderboard(const uint32_t activityId) {
-	auto [_, result] = ExecuteSelect("SELECT *, CAST(strftime('%s', last_played) as INT) as lp_unix, ci.name as char_name FROM leaderboard lb JOIN charinfo ci on ci.id = lb.character_id where game_id = ? ORDER BY primaryscore ASC, secondaryscore ASC, tertiaryScore ASC, last_played ASC;", activityId);
-	return ProcessQuery(result);
-}
-
-std::vector<ILeaderboard::Entry> SQLiteDatabase::GetAgsLeaderboard(const uint32_t activityId) {
-	auto query = Game::config->GetValue("classic_survival_scoring") != "1" ? 
-	"SELECT *, CAST(strftime('%s', last_played) as INT) as lp_unix, ci.name as char_name FROM leaderboard lb JOIN charinfo ci on ci.id = lb.character_id where game_id = ? ORDER BY primaryscore DESC, secondaryscore DESC, tertiaryScore DESC, last_played ASC;" : 
-	"SELECT *, CAST(strftime('%s', last_played) as INT) as lp_unix, ci.name as char_name FROM leaderboard lb JOIN charinfo ci on ci.id = lb.character_id where game_id = ? ORDER BY secondaryscore DESC, primaryscore DESC, tertiaryScore DESC, last_played ASC;";
-	auto [_, result] = ExecuteSelect(query, activityId);
-	return ProcessQuery(result);
-}
-
-std::vector<ILeaderboard::Entry> SQLiteDatabase::GetNsLeaderboard(const uint32_t activityId) {
-	auto [_, result] = ExecuteSelect("SELECT *, CAST(strftime('%s', last_played) as INT) as lp_unix, ci.name as char_name FROM leaderboard lb JOIN charinfo ci on ci.id = lb.character_id where game_id = ? ORDER BY primaryscore DESC, secondaryscore ASC, tertiaryScore DESC, last_played ASC;", activityId);
-	return ProcessQuery(result);
-}
-
-void SQLiteDatabase::SaveScore(const uint32_t playerId, const uint32_t gameId, const Score& score) {
-	ExecuteInsert("INSERT INTO leaderboard (primaryScore, secondaryScore, tertiaryScore, character_id, game_id, last_played) VALUES (?,?,?,?,?,CURRENT_TIMESTAMP) ;",
-		score.primaryScore, score.secondaryScore, score.tertiaryScore, playerId, gameId);
-}
-
-void SQLiteDatabase::UpdateScore(const uint32_t playerId, const uint32_t gameId, const Score& score) {
-	ExecuteInsert("UPDATE leaderboard SET primaryScore = ?, secondaryScore = ?, tertiaryScore = ?, timesPlayed = timesPlayed + 1, last_played = CURRENT_TIMESTAMP WHERE character_id = ? AND game_id = ?;",
-		score.primaryScore, score.secondaryScore, score.tertiaryScore, playerId, gameId);
-}
-
-std::optional<ILeaderboard::Score> SQLiteDatabase::GetPlayerScore(const uint32_t playerId, const uint32_t gameId) {
-	std::optional<ILeaderboard::Score> toReturn = std::nullopt;
-	auto [_, res] = ExecuteSelect("SELECT * FROM leaderboard WHERE character_id = ? AND game_id = ?;", playerId, gameId);
-	if (!res.eof()) {
-		toReturn = ILeaderboard::Score{
-			.primaryScore = static_cast<float>(res.getFloatField("primaryScore")),
-			.secondaryScore = static_cast<float>(res.getFloatField("secondaryScore")),
-			.tertiaryScore = static_cast<float>(res.getFloatField("tertiaryScore"))
-		};
-	}
-
-	return toReturn;
-}
-
-void SQLiteDatabase::IncrementNumWins(const uint32_t playerId, const uint32_t gameId) {
-	ExecuteUpdate("UPDATE leaderboard SET numWins = numWins + 1, last_played = CURRENT_TIMESTAMP WHERE character_id = ? AND game_id = ?;", playerId, gameId);
-}
-
-void SQLiteDatabase::IncrementTimesPlayed(const uint32_t playerId, const uint32_t gameId) {
-	ExecuteUpdate("UPDATE leaderboard SET timesPlayed = timesPlayed + 1, last_played = CURRENT_TIMESTAMP WHERE character_id = ? AND game_id = ?;", playerId, gameId);
-}
--- a/dDatabase/GameDatabase/SQLite/Tables/Mail.cpp
+++ b/dDatabase/GameDatabase/SQLite/Tables/Mail.cpp
@@ -1,83 +0,0 @@
-#include "SQLiteDatabase.h"
-
-void SQLiteDatabase::InsertNewMail(const IMail::MailInfo& mail) {
-	ExecuteInsert(
-		"INSERT INTO `mail` "
-		"(`sender_id`, `sender_name`, `receiver_id`, `receiver_name`, `time_sent`, `subject`, `body`, `attachment_id`, `attachment_lot`, `attachment_subkey`, `attachment_count`, `was_read`)"
-		" VALUES (?,?,?,?,?,?,?,?,?,?,?,0)",
-		mail.senderId,
-		mail.senderUsername,
-		mail.receiverId,
-		mail.recipient,
-		static_cast<uint32_t>(time(NULL)),
-		mail.subject,
-		mail.body,
-		mail.itemID,
-		mail.itemLOT,
-		0,
-		mail.itemCount);
-}
-
-std::vector<IMail::MailInfo> SQLiteDatabase::GetMailForPlayer(const uint32_t characterId, const uint32_t numberOfMail) {
-	auto [_, res] = ExecuteSelect(
-		"SELECT id, subject, body, sender_name, attachment_id, attachment_lot, attachment_subkey, attachment_count, was_read, time_sent"
-		" FROM mail WHERE receiver_id=? limit ?;",
-		characterId, numberOfMail);
-
-	std::vector<IMail::MailInfo> toReturn;
-
-	while (!res.eof()) {
-		IMail::MailInfo mail;
-		mail.id = res.getInt64Field("id");
-		mail.subject = res.getStringField("subject");
-		mail.body = res.getStringField("body");
-		mail.senderUsername = res.getStringField("sender_name");
-		mail.itemID = res.getIntField("attachment_id");
-		mail.itemLOT = res.getIntField("attachment_lot");
-		mail.itemSubkey = res.getIntField("attachment_subkey");
-		mail.itemCount = res.getIntField("attachment_count");
-		mail.timeSent = res.getInt64Field("time_sent");
-		mail.wasRead = res.getIntField("was_read");
-
-		toReturn.push_back(std::move(mail));
-		res.nextRow();
-	}
-
-	return toReturn;
-}
-
-std::optional<IMail::MailInfo> SQLiteDatabase::GetMail(const uint64_t mailId) {
-	auto [_, res] = ExecuteSelect("SELECT attachment_lot, attachment_count FROM mail WHERE id=? LIMIT 1;", mailId);
-
-	if (res.eof()) {
-		return std::nullopt;
-	}
-
-	IMail::MailInfo toReturn;
-	toReturn.itemLOT = res.getIntField("attachment_lot");
-	toReturn.itemCount = res.getIntField("attachment_count");
-
-	return toReturn;
-}
-
-uint32_t SQLiteDatabase::GetUnreadMailCount(const uint32_t characterId) {
-	auto [_, res] = ExecuteSelect("SELECT COUNT(*) AS number_unread FROM mail WHERE receiver_id=? AND was_read=0;", characterId);
-
-	if (res.eof()) {
-		return 0;
-	}
-
-	return res.getIntField("number_unread");
-}
-
-void SQLiteDatabase::MarkMailRead(const uint64_t mailId) {
-	ExecuteUpdate("UPDATE mail SET was_read=1 WHERE id=?;", mailId);
-}
-
-void SQLiteDatabase::ClaimMailItem(const uint64_t mailId) {
-	ExecuteUpdate("UPDATE mail SET attachment_lot=0 WHERE id=?;", mailId);
-}
-
-void SQLiteDatabase::DeleteMail(const uint64_t mailId) {
-	ExecuteDelete("DELETE FROM mail WHERE id=?;", mailId);
-}
--- a/dDatabase/GameDatabase/SQLite/Tables/MigrationHistory.cpp
+++ b/dDatabase/GameDatabase/SQLite/Tables/MigrationHistory.cpp
@@ -1,13 +0,0 @@
-#include "SQLiteDatabase.h"
-
-void SQLiteDatabase::CreateMigrationHistoryTable() {
-	ExecuteInsert("CREATE TABLE IF NOT EXISTS migration_history (name TEXT NOT NULL, date DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP);");
-}
-
-bool SQLiteDatabase::IsMigrationRun(const std::string_view str) {
-	return !ExecuteSelect("SELECT name FROM migration_history WHERE name = ?;", str).second.eof();
-}
-
-void SQLiteDatabase::InsertMigration(const std::string_view str) {
-	ExecuteInsert("INSERT INTO migration_history (name) VALUES (?);", str);
-}
--- a/dDatabase/GameDatabase/SQLite/Tables/ObjectIdTracker.cpp
+++ b/dDatabase/GameDatabase/SQLite/Tables/ObjectIdTracker.cpp
@@ -1,17 +0,0 @@
-#include "SQLiteDatabase.h"
-
-std::optional<uint32_t> SQLiteDatabase::GetCurrentPersistentId() {
-	auto [_, result] = ExecuteSelect("SELECT last_object_id FROM object_id_tracker");
-	if (result.eof()) {
-		return std::nullopt;
-	}
-	return result.getIntField("last_object_id");
-}
-
-void SQLiteDatabase::InsertDefaultPersistentId() {
-	ExecuteInsert("INSERT INTO object_id_tracker VALUES (1);");
-}
-
-void SQLiteDatabase::UpdatePersistentId(const uint32_t newId) {
-	ExecuteUpdate("UPDATE object_id_tracker SET last_object_id = ?;", newId);
-}
--- a/dDatabase/GameDatabase/SQLite/Tables/PetNames.cpp
+++ b/dDatabase/GameDatabase/SQLite/Tables/PetNames.cpp
@@ -1,26 +0,0 @@
-#include "SQLiteDatabase.h"
-
-void SQLiteDatabase::SetPetNameModerationStatus(const LWOOBJID& petId, const IPetNames::Info& info) {
-	ExecuteInsert(
-		"INSERT INTO `pet_names` (`id`, `pet_name`, `approved`) VALUES (?, ?, ?) "
-		"ON CONFLICT(id) DO UPDATE SET pet_name = ?, approved = ?;",
-		petId,
-		info.petName,
-		info.approvalStatus,
-		info.petName,
-		info.approvalStatus);
-}
-
-std::optional<IPetNames::Info> SQLiteDatabase::GetPetNameInfo(const LWOOBJID& petId) {
-	auto [_, result] = ExecuteSelect("SELECT pet_name, approved FROM pet_names WHERE id = ? LIMIT 1;", petId);
-
-	if (result.eof()) {
-		return std::nullopt;
-	}
-
-	IPetNames::Info toReturn;
-	toReturn.petName = result.getStringField("pet_name");
-	toReturn.approvalStatus = result.getIntField("approved");
-
-	return toReturn;
-}
--- a/dDatabase/GameDatabase/SQLite/Tables/PlayKeys.cpp
+++ b/dDatabase/GameDatabase/SQLite/Tables/PlayKeys.cpp
@@ -1,11 +0,0 @@
-#include "SQLiteDatabase.h"
-
-std::optional<bool> SQLiteDatabase::IsPlaykeyActive(const int32_t playkeyId) {
-	auto [_, keyCheckRes] = ExecuteSelect("SELECT active FROM `play_keys` WHERE id=?", playkeyId);
-
-	if (keyCheckRes.eof()) {
-		return std::nullopt;
-	}
-
-	return keyCheckRes.getIntField("active");
-}
--- a/dDatabase/GameDatabase/SQLite/Tables/PlayerCheatDetections.cpp
+++ b/dDatabase/GameDatabase/SQLite/Tables/PlayerCheatDetections.cpp
@@ -1,7 +0,0 @@
-#include "SQLiteDatabase.h"
-
-void SQLiteDatabase::InsertCheatDetection(const IPlayerCheatDetections::Info& info) {
-	ExecuteInsert(
-		"INSERT INTO player_cheat_detections (account_id, name, violation_msg, violation_system_address) VALUES (?, ?, ?, ?)",
-		info.userId, info.username, info.extraMessage, info.systemAddress);
-}
--- a/dDatabase/GameDatabase/SQLite/Tables/Property.cpp
+++ b/dDatabase/GameDatabase/SQLite/Tables/Property.cpp
@@ -1,195 +0,0 @@
-#include "SQLiteDatabase.h"
-#include "ePropertySortType.h"
-
-std::optional<IProperty::PropertyEntranceResult> SQLiteDatabase::GetProperties(const IProperty::PropertyLookup& params) {
-	std::optional<IProperty::PropertyEntranceResult> result;
-	std::string query;
-	std::pair<CppSQLite3Statement, CppSQLite3Query> propertiesRes;
-
-	if (params.sortChoice == SORT_TYPE_FEATURED || params.sortChoice == SORT_TYPE_FRIENDS) {
-		query = R"QUERY(
-		FROM properties as p
-		JOIN charinfo as ci
-		ON ci.prop_clone_id = p.clone_id
-		where p.zone_id = ?
-		AND (
-			p.description LIKE ?
-		    OR p.name LIKE ?
-		    OR ci.name LIKE ?
-		)
-		AND p.privacy_option >= ?
-		AND p.owner_id IN (
-			SELECT fr.requested_player AS player FROM (
-				SELECT CASE 
-				WHEN player_id = ? THEN friend_id 
-				WHEN friend_id = ? THEN player_id 
-				END AS requested_player FROM friends
-			) AS fr 
-			JOIN charinfo AS ci ON ci.id = fr.requested_player 
-			WHERE fr.requested_player IS NOT NULL AND fr.requested_player != ?
-		) ORDER BY ci.name ASC
-		)QUERY";
-		const auto completeQuery = "SELECT p.* " + query + " LIMIT ? OFFSET ?;";
-		propertiesRes = ExecuteSelect(
-			completeQuery,
-			params.mapId,
-			"%" + params.searchString + "%",
-			"%" + params.searchString + "%",
-			"%" + params.searchString + "%",
-			params.playerSort,
-			params.playerId,
-			params.playerId,
-			params.playerId,
-			params.numResults,
-			params.startIndex
-		);
-		const auto countQuery = "SELECT COUNT(*) as count" + query + ";";
-		auto [_, count] = ExecuteSelect(
-			countQuery,
-			params.mapId,
-			"%" + params.searchString + "%",
-			"%" + params.searchString + "%",
-			"%" + params.searchString + "%",
-			params.playerSort,
-			params.playerId,
-			params.playerId,
-			params.playerId
-		);
-		if (!count.eof()) {
-			result = IProperty::PropertyEntranceResult();
-			result->totalEntriesMatchingQuery = count.getIntField("count");
-		}
-	} else {
-		if (params.sortChoice == SORT_TYPE_REPUTATION) {
-			query = R"QUERY(
-			FROM properties as p
-			JOIN charinfo as ci
-			ON ci.prop_clone_id = p.clone_id
-			where p.zone_id = ?
-			AND (
-				p.description LIKE ?
-			    OR p.name LIKE ?
-			    OR ci.name LIKE ?
-			)
-			AND p.privacy_option >= ?
-			ORDER BY p.reputation DESC, p.last_updated DESC 
-			)QUERY";
-		} else {
-			query = R"QUERY(
-			FROM properties as p
-			JOIN charinfo as ci
-			ON ci.prop_clone_id = p.clone_id
-			where p.zone_id = ?
-			AND (
-				p.description LIKE ?
-			    OR p.name LIKE ?
-			    OR ci.name LIKE ?
-			)
-			AND p.privacy_option >= ?
-			ORDER BY p.last_updated DESC
-			)QUERY";
-		}
-		const auto completeQuery = "SELECT p.* " + query + " LIMIT ? OFFSET ?;";
-		propertiesRes = ExecuteSelect(
-			completeQuery,
-			params.mapId,
-			"%" + params.searchString + "%",
-			"%" + params.searchString + "%",
-			"%" + params.searchString + "%",
-			params.playerSort,
-			params.numResults,
-			params.startIndex
-		);
-		const auto countQuery = "SELECT COUNT(*) as count" + query + ";";
-		auto [_, count] = ExecuteSelect(
-			countQuery,
-			params.mapId,
-			"%" + params.searchString + "%",
-			"%" + params.searchString + "%",
-			"%" + params.searchString + "%",
-			params.playerSort
-		);
-		if (!count.eof()) {
-			result = IProperty::PropertyEntranceResult();
-			result->totalEntriesMatchingQuery = count.getIntField("count");
-		}
-	}
-
-	auto& [_, properties] = propertiesRes;
-	if (!properties.eof() && !result.has_value()) result = IProperty::PropertyEntranceResult();
-	while (!properties.eof()) {
-		auto& entry = result->entries.emplace_back();
-		entry.id = properties.getInt64Field("id");
-		entry.ownerId = properties.getInt64Field("owner_id");
-		entry.cloneId = properties.getInt64Field("clone_id");
-		entry.name = properties.getStringField("name");
-		entry.description = properties.getStringField("description");
-		entry.privacyOption = properties.getIntField("privacy_option");
-		entry.rejectionReason = properties.getStringField("rejection_reason");
-		entry.lastUpdatedTime = properties.getIntField("last_updated");
-		entry.claimedTime = properties.getIntField("time_claimed");
-		entry.reputation = properties.getIntField("reputation");
-		entry.modApproved = properties.getIntField("mod_approved");
-		entry.performanceCost = properties.getFloatField("performance_cost");
-		properties.nextRow();
-	}
-
-	return result;
-}
-
-std::optional<IProperty::Info> SQLiteDatabase::GetPropertyInfo(const LWOMAPID mapId, const LWOCLONEID cloneId) {
-	auto [_, propertyEntry] = ExecuteSelect(
-		"SELECT id, owner_id, clone_id, name, description, privacy_option, rejection_reason, last_updated, time_claimed, reputation, mod_approved, performance_cost "
-		"FROM properties WHERE zone_id = ? AND clone_id = ?;", mapId, cloneId);
-
-	if (propertyEntry.eof()) {
-		return std::nullopt;
-	}
-
-	IProperty::Info toReturn;
-	toReturn.id = propertyEntry.getInt64Field("id");
-	toReturn.ownerId = propertyEntry.getInt64Field("owner_id");
-	toReturn.cloneId = propertyEntry.getInt64Field("clone_id");
-	toReturn.name = propertyEntry.getStringField("name");
-	toReturn.description = propertyEntry.getStringField("description");
-	toReturn.privacyOption = propertyEntry.getIntField("privacy_option");
-	toReturn.rejectionReason = propertyEntry.getStringField("rejection_reason");
-	toReturn.lastUpdatedTime = propertyEntry.getIntField("last_updated");
-	toReturn.claimedTime = propertyEntry.getIntField("time_claimed");
-	toReturn.reputation = propertyEntry.getIntField("reputation");
-	toReturn.modApproved = propertyEntry.getIntField("mod_approved");
-	toReturn.performanceCost = propertyEntry.getFloatField("performance_cost");
-
-	return toReturn;
-}
-
-void SQLiteDatabase::UpdatePropertyModerationInfo(const IProperty::Info& info) {
-	ExecuteUpdate("UPDATE properties SET privacy_option = ?, rejection_reason = ?, mod_approved = ? WHERE id = ?;",
-		info.privacyOption,
-		info.rejectionReason,
-		info.modApproved,
-		info.id);
-}
-
-void SQLiteDatabase::UpdatePropertyDetails(const IProperty::Info& info) {
-	ExecuteUpdate("UPDATE properties SET name = ?, description = ? WHERE id = ?;", info.name, info.description, info.id);
-}
-
-void SQLiteDatabase::UpdatePerformanceCost(const LWOZONEID& zoneId, const float performanceCost) {
-	ExecuteUpdate("UPDATE properties SET performance_cost = ? WHERE zone_id = ? AND clone_id = ?;", performanceCost, zoneId.GetMapID(), zoneId.GetCloneID());
-}
-
-void SQLiteDatabase::InsertNewProperty(const IProperty::Info& info, const uint32_t templateId, const LWOZONEID& zoneId) {
-	auto insertion = ExecuteInsert(
-		"INSERT INTO properties"
-		" (id, owner_id, template_id, clone_id, name, description, zone_id, rent_amount, rent_due, privacy_option, last_updated, time_claimed, rejection_reason, reputation, performance_cost)"
-		" VALUES (?, ?, ?, ?, ?, ?, ?, 0, 0, 0, CAST(strftime('%s', 'now') as INT), CAST(strftime('%s', 'now') as INT), '', 0, 0.0)",
-		info.id,
-		info.ownerId,
-		templateId,
-		zoneId.GetCloneID(),
-		info.name,
-		info.description,
-		zoneId.GetMapID()
-	);
-}
--- a/dDatabase/GameDatabase/SQLite/Tables/PropertyContents.cpp
+++ b/dDatabase/GameDatabase/SQLite/Tables/PropertyContents.cpp
@@ -1,65 +0,0 @@
-#include "SQLiteDatabase.h"
-
-std::vector<IPropertyContents::Model> SQLiteDatabase::GetPropertyModels(const LWOOBJID& propertyId) {
-	auto [_, result] = ExecuteSelect(
-		"SELECT id, lot, x, y, z, rx, ry, rz, rw, ugc_id, "
-		"behavior_1, behavior_2, behavior_3, behavior_4, behavior_5 "
-		"FROM properties_contents WHERE property_id = ?;", propertyId);
-
-	std::vector<IPropertyContents::Model> toReturn;
-	while (!result.eof()) {
-		IPropertyContents::Model model;
-		model.id = result.getInt64Field("id");
-		model.lot = static_cast<LOT>(result.getIntField("lot"));
-		model.position.x = result.getFloatField("x");
-		model.position.y = result.getFloatField("y");
-		model.position.z = result.getFloatField("z");
-		model.rotation.w = result.getFloatField("rw");
-		model.rotation.x = result.getFloatField("rx");
-		model.rotation.y = result.getFloatField("ry");
-		model.rotation.z = result.getFloatField("rz");
-		model.ugcId = result.getInt64Field("ugc_id");
-		model.behaviors[0] = result.getIntField("behavior_1");
-		model.behaviors[1] = result.getIntField("behavior_2");
-		model.behaviors[2] = result.getIntField("behavior_3");
-		model.behaviors[3] = result.getIntField("behavior_4");
-		model.behaviors[4] = result.getIntField("behavior_5");
-
-		toReturn.push_back(std::move(model));
-		result.nextRow();
-	}
-	return toReturn;
-}
-
-void SQLiteDatabase::InsertNewPropertyModel(const LWOOBJID& propertyId, const IPropertyContents::Model& model, const std::string_view name) {
-	try {
-		ExecuteInsert(
-			"INSERT INTO properties_contents"
-			"(id, property_id, ugc_id, lot, x, y, z, rx, ry, rz, rw, model_name, model_description, behavior_1, behavior_2, behavior_3, behavior_4, behavior_5)"
-			"VALUES (?,  ?,           ?,      ?,   ?, ?, ?, ?,  ?,  ?,  ?,  ?,    ?,           ?,          ?,          ?,          ?,          ?)",
-			//       1,  2,           3,      4,   5, 6, 7, 8,  9,  10, 11, 12,   13,          14,         15,         16,         17          18
-			model.id, propertyId, model.ugcId == 0 ? std::nullopt : std::optional(model.ugcId), static_cast<uint32_t>(model.lot),
-			model.position.x, model.position.y, model.position.z, model.rotation.x, model.rotation.y, model.rotation.z, model.rotation.w,
-			name, "", // Model description.  TODO implement this.
-			model.behaviors[0], // behavior 1
-			model.behaviors[1], // behavior 2
-			model.behaviors[2], // behavior 3
-			model.behaviors[3], // behavior 4
-			model.behaviors[4] // behavior 5
-		);
-	} catch (std::exception& e) {
-		LOG("Error inserting new property model: %s", e.what());
-	}
-}
-
-void SQLiteDatabase::UpdateModel(const LWOOBJID& propertyId, const NiPoint3& position, const NiQuaternion& rotation, const std::array<std::pair<int32_t, std::string>, 5>& behaviors) {
-	ExecuteUpdate(
-		"UPDATE properties_contents SET x = ?, y = ?, z = ?, rx = ?, ry = ?, rz = ?, rw = ?, "
-		"behavior_1 = ?, behavior_2 = ?, behavior_3 = ?, behavior_4 = ?, behavior_5 = ? WHERE id = ?;",
-		position.x, position.y, position.z, rotation.x, rotation.y, rotation.z, rotation.w,
-		behaviors[0].first, behaviors[1].first, behaviors[2].first, behaviors[3].first, behaviors[4].first, propertyId);
-}
-
-void SQLiteDatabase::RemoveModel(const LWOOBJID& modelId) {
-	ExecuteDelete("DELETE FROM properties_contents WHERE id = ?;", modelId);
-}
--- a/dDatabase/GameDatabase/SQLite/Tables/Servers.cpp
+++ b/dDatabase/GameDatabase/SQLite/Tables/Servers.cpp
@@ -1,23 +0,0 @@
-#include "SQLiteDatabase.h"
-
-void SQLiteDatabase::SetMasterIp(const std::string_view ip, const uint32_t port) {
-	// We only want our 1 entry anyways, so we can just delete all and reinsert the one we want
-	// since it would be two queries anyways.
-	ExecuteDelete("DELETE FROM servers;");
-	ExecuteInsert("INSERT INTO `servers` (`name`, `ip`, `port`, `state`, `version`) VALUES ('master', ?, ?, 0, 171022)", ip, port);
-}
-
-std::optional<IServers::MasterInfo> SQLiteDatabase::GetMasterInfo() {
-	auto [_, result] = ExecuteSelect("SELECT ip, port FROM servers WHERE name='master' LIMIT 1;");
-
-	if (result.eof()) {
-		return std::nullopt;
-	}
-
-	MasterInfo toReturn;
-
-	toReturn.ip = result.getStringField("ip");
-	toReturn.port = result.getIntField("port");
-
-	return toReturn;
-}
--- a/dDatabase/GameDatabase/SQLite/Tables/Ugc.cpp
+++ b/dDatabase/GameDatabase/SQLite/Tables/Ugc.cpp
@@ -1,72 +0,0 @@
-#include "SQLiteDatabase.h"
-
-std::vector<IUgc::Model> SQLiteDatabase::GetUgcModels(const LWOOBJID& propertyId) {
-	auto [_, result] = ExecuteSelect(
-		"SELECT lxfml, u.id FROM ugc AS u JOIN properties_contents AS pc ON u.id = pc.ugc_id WHERE lot = 14 AND property_id = ? AND pc.ugc_id IS NOT NULL;",
-		propertyId);
-
-	std::vector<IUgc::Model> toReturn;
-
-	while (!result.eof()) {
-		IUgc::Model model;
-
-		int blobSize{};
-		const auto* blob = result.getBlobField("lxfml", blobSize);
-		model.lxfmlData << std::string(reinterpret_cast<const char*>(blob), blobSize);
-		model.id = result.getInt64Field("id");
-		toReturn.push_back(std::move(model));
-		result.nextRow();
-	}
-
-	return toReturn;
-}
-
-std::vector<IUgc::Model> SQLiteDatabase::GetAllUgcModels() {
-	auto [_, result] = ExecuteSelect("SELECT id, lxfml FROM ugc;");
-
-	std::vector<IUgc::Model> models;
-	while (!result.eof()) {
-		IUgc::Model model;
-		model.id = result.getInt64Field("id");
-
-		int blobSize{};
-		const auto* blob = result.getBlobField("lxfml", blobSize);
-		model.lxfmlData << std::string(reinterpret_cast<const char*>(blob), blobSize);
-		models.push_back(std::move(model));
-		result.nextRow();
-	}
-
-	return models;
-}
-
-void SQLiteDatabase::RemoveUnreferencedUgcModels() {
-	ExecuteDelete("DELETE FROM ugc WHERE id NOT IN (SELECT ugc_id FROM properties_contents WHERE ugc_id IS NOT NULL);");
-}
-
-void SQLiteDatabase::InsertNewUgcModel(
-	std::istringstream& sd0Data, // cant be const sad
-	const uint32_t blueprintId,
-	const uint32_t accountId,
-	const uint32_t characterId) {
-	const std::istream stream(sd0Data.rdbuf());
-	ExecuteInsert(
-		"INSERT INTO `ugc`(`id`, `account_id`, `character_id`, `is_optimized`, `lxfml`, `bake_ao`, `filename`) VALUES (?,?,?,?,?,?,?)",
-		blueprintId,
-		accountId,
-		characterId,
-		0,
-		&stream,
-		false,
-		"weedeater.lxfml"
-	);
-}
-
-void SQLiteDatabase::DeleteUgcModelData(const LWOOBJID& modelId) {
-	ExecuteDelete("DELETE FROM ugc WHERE id = ?;", modelId);
-	ExecuteDelete("DELETE FROM properties_contents WHERE ugc_id = ?;", modelId);
-}
-
-void SQLiteDatabase::UpdateUgcModelData(const LWOOBJID& modelId, std::istringstream& lxfml) {
-	const std::istream stream(lxfml.rdbuf());
-	ExecuteUpdate("UPDATE ugc SET lxfml = ? WHERE id = ?;", &stream, modelId);
-}
--- a/dDatabase/GameDatabase/SQLite/Tables/UgcModularBuild.cpp
+++ b/dDatabase/GameDatabase/SQLite/Tables/UgcModularBuild.cpp
@@ -1,9 +0,0 @@
-#include "SQLiteDatabase.h"
-
-void SQLiteDatabase::InsertUgcBuild(const std::string& modules, const LWOOBJID bigId, const std::optional<uint32_t> characterId) {
-	ExecuteInsert("INSERT INTO ugc_modular_build (ugc_id, ldf_config, character_id) VALUES (?,?,?)", bigId, modules, characterId);
-}
-
-void SQLiteDatabase::DeleteUgcBuild(const LWOOBJID bigId) {
-	ExecuteDelete("DELETE FROM ugc_modular_build WHERE ugc_id = ?;", bigId);
-}
--- a/dDatabase/GameDatabase/TestSQL/TestSQLDatabase.cpp
+++ b/dDatabase/GameDatabase/TestSQL/TestSQLDatabase.cpp
@@ -8,6 +8,10 @@ void TestSQLDatabase::Destroy(std::string source) {

 }

+sql::PreparedStatement* TestSQLDatabase::CreatePreppedStmt(const std::string& query) {
+	return nullptr;
+}
+
 void TestSQLDatabase::Commit() {

 }
--- a/dDatabase/GameDatabase/TestSQL/TestSQLDatabase.h
+++ b/dDatabase/GameDatabase/TestSQL/TestSQLDatabase.h
@@ -7,6 +7,7 @@ class TestSQLDatabase : public GameDatabase {
 	void Connect() override;
 	void Destroy(std::string source = "") override;

+	sql::PreparedStatement* CreatePreppedStmt(const std::string& query) override;
 	void Commit() override;
 	bool GetAutoCommit() override;
 	void SetAutoCommit(bool value) override;
@@ -101,7 +102,6 @@ class TestSQLDatabase : public GameDatabase {
 	void IncrementTimesPlayed(const uint32_t playerId, const uint32_t gameId) override {};
 	void InsertUgcBuild(const std::string& modules, const LWOOBJID bigId, const std::optional<uint32_t> characterId) override {};
 	void DeleteUgcBuild(const LWOOBJID bigId) override {};
-	uint32_t GetAccountCount() override { return 0; };
 };

 #endif  //!TESTSQLDATABASE_H
--- a/dDatabase/MigrationRunner.cpp
+++ b/dDatabase/MigrationRunner.cpp
@@ -10,9 +10,9 @@

 #include <fstream>

-Migration LoadMigration(std::string folder, std::string path) {
+Migration LoadMigration(std::string path) {
 	Migration migration{};
-	std::ifstream file(BinaryPathFinder::GetBinaryDir() / "migrations/" / folder / path);
+	std::ifstream file(BinaryPathFinder::GetBinaryDir() / "migrations/" / path);

 	if (file.is_open()) {
 		std::string line;
@@ -34,19 +34,10 @@ Migration LoadMigration(std::string folder, std::string path) {
 void MigrationRunner::RunMigrations() {
 	Database::Get()->CreateMigrationHistoryTable();

-	// has to be here because when moving the files to the new folder, the migration_history table is not updated so it will run them all again.
-	
-	const auto migrationFolder = Database::GetMigrationFolder();
-	if (!Database::Get()->IsMigrationRun("17_migration_for_migrations.sql") && migrationFolder == "mysql") {
-		LOG("Running migration: 17_migration_for_migrations.sql");
-		Database::Get()->ExecuteCustomQuery("UPDATE `migration_history` SET `name` = SUBSTR(`name`, 5) WHERE `name` LIKE \"dlu%\";");
-		Database::Get()->InsertMigration("17_migration_for_migrations.sql");
-	}
-
 	std::string finalSQL = "";
 	bool runSd0Migrations = false;
-	for (const auto& entry : GeneralUtils::GetSqlFileNamesFromFolder((BinaryPathFinder::GetBinaryDir() / "./migrations/dlu/" / migrationFolder).string())) {
-		auto migration = LoadMigration("dlu/" + migrationFolder + "/", entry);
+	for (const auto& entry : GeneralUtils::GetSqlFileNamesFromFolder((BinaryPathFinder::GetBinaryDir() / "./migrations/dlu/").string())) {
+		auto migration = LoadMigration("dlu/" + entry);

 		if (migration.data.empty()) {
 			continue;
@@ -55,7 +46,7 @@ void MigrationRunner::RunMigrations() {
 		if (Database::Get()->IsMigrationRun(migration.name)) continue;

 		LOG("Running migration: %s", migration.name.c_str());
-		if (migration.name == "5_brick_model_sd0.sql") {
+		if (migration.name == "dlu/5_brick_model_sd0.sql") {
 			runSd0Migrations = true;
 		} else {
 			finalSQL.append(migration.data.c_str());
@@ -95,14 +86,10 @@ void MigrationRunner::RunSQLiteMigrations() {
 	cdstmt.execQuery().finalize();
 	cdstmt.finalize();

-	if (CDClientDatabase::ExecuteQuery("select * from migration_history where name = \"7_migration_for_migrations.sql\";").eof()) {
-		LOG("Running migration: 7_migration_for_migrations.sql");
-		CDClientDatabase::ExecuteQuery("UPDATE `migration_history` SET `name` = SUBSTR(`name`, 10) WHERE `name` LIKE \"cdserver%\";");
-		CDClientDatabase::ExecuteQuery("INSERT INTO migration_history (name) VALUES (\"7_migration_for_migrations.sql\");");
-	}
+	Database::Get()->CreateMigrationHistoryTable();

 	for (const auto& entry : GeneralUtils::GetSqlFileNamesFromFolder((BinaryPathFinder::GetBinaryDir() / "migrations/cdserver/").string())) {
-		auto migration = LoadMigration("cdserver/", entry);
+		auto migration = LoadMigration("cdserver/" + entry);

 		if (migration.data.empty()) continue;

--- a/dECS/CMakeLists.txt
+++ b/dECS/CMakeLists.txt
@@ -0,0 +1,15 @@
+set(gcc_like_cxx "$<COMPILE_LANG_AND_ID:CXX,ARMClang,AppleClang,Clang,GNU,LCC>")
+set(msvc_cxx "$<COMPILE_LANG_AND_ID:CXX,MSVC>")
+
+add_library(dECS STATIC
+    "Core.h"
+    "Iter.h"
+    "Core.cpp"
+    "System.cpp"
+)
+target_include_directories(dECS PUBLIC .)
+target_link_libraries(dECS PRIVATE dCommon magic_enum::magic_enum)
+target_compile_options(dECS PRIVATE
+  "$<${gcc_like_cxx}:$<BUILD_INTERFACE:-Wall;-Wextra>>"
+  "$<${msvc_cxx}:$<BUILD_INTERFACE:/W3>>"
+)
--- a/dECS/Core.cpp
+++ b/dECS/Core.cpp
@@ -0,0 +1,70 @@
+#include <atomic>
+#include <magic_enum/magic_enum_containers.hpp>
+#include <eReplicaComponentType.h>
+#include "Core.h"
+
+namespace dECS {
+    struct WorldData {
+        using CompSignature = magic_enum::containers::bitset<eReplicaComponentType>;
+        using CompMap = std::unordered_map<LWOOBJID, CompSignature>;
+        using CompStorage = std::unordered_map<eReplicaComponentType, std::unique_ptr<IStorage>>;
+
+        std::atomic<LWOOBJID> nextId = 1;
+        CompMap map;
+        CompStorage data;
+    };
+
+    World::World() : m_World{ std::make_shared<WorldData>() } {};
+
+    Entity World::MakeEntity() {
+        return Entity{ m_World->nextId.fetch_add(1, std::memory_order::relaxed),
+                       m_World };
+    }
+
+    void* Entity::AddComponent(const eReplicaComponentType kind, const StorageConstructor storageConstructor) {
+        if (auto w = m_World.lock()) {
+            // Add to kind signature
+            w->map[m_Id].set(kind, true);
+
+            // Get or add storage
+            auto storageIt = w->data.find(kind);
+            if (storageIt == w->data.cend()) {
+                bool inserted = false;
+                std::tie(storageIt, inserted) = w->data.try_emplace(kind, storageConstructor());
+                if (!inserted) throw "storage emplacement failure";
+            }
+            auto& storage = *storageIt->second;
+
+            // Return reference if already mapped, otherwise add component
+            auto compIt = storage.rowMap.find(m_Id);
+            if (compIt == storage.rowMap.cend()) {
+                const auto curSize = storage.rowMap.size();
+                storage.rowMap.emplace(m_Id, curSize);
+                return storage.emplace_back();
+            }
+            const auto row = compIt->second;
+            return storage.at(row);
+        }
+        return nullptr;
+    }
+
+    const void* Entity::GetComponent(const eReplicaComponentType kind) const {
+        if (auto const w = m_World.lock()) {
+            // Check that the entity has this component
+            if (!w->map[m_Id].test(kind)) return nullptr;
+
+            // Get the location where it's stored
+            const auto& storage = *w->data.at(kind);
+            const auto it = storage.rowMap.find(m_Id);
+            if (it == storage.rowMap.cend()) return nullptr;
+            const auto row = it->second;
+            return storage.at(row);
+        }
+        return nullptr;
+    }
+
+    void* Entity::GetComponent(const eReplicaComponentType kind) {
+        // Casting away const for this overload is safe, if not at all pretty
+        return const_cast<void*>(std::as_const(*this).GetComponent(kind));
+    }
+}
--- a/dECS/Core.h
+++ b/dECS/Core.h
@@ -0,0 +1,180 @@
+#pragma once
+#include <cstdint>
+#include <memory>
+#include <string_view>
+#include <type_traits>
+#include <unordered_map>
+#include <vector>
+
+class Component;
+enum class eReplicaComponentType : uint32_t;
+using LWOOBJID = int64_t;
+
+namespace dECS {
+    // template <typename C>
+    // concept IsComponent = std::derived_from<C, Component>;
+
+    // Data structures
+    struct WorldData;
+    class World;
+
+    template <typename... Cs>
+    class System;
+
+    class Entity;
+    struct IStorage;
+
+    template <typename C>
+    class Storage;
+
+    using WorldPtr = std::shared_ptr<WorldData>;
+    using WeakWorldPtr = std::weak_ptr<WorldData>;
+
+    class World {
+    public:
+        World();
+
+        [[nodiscard]]
+        Entity MakeEntity();
+
+        template <typename... Cs>
+        [[nodiscard]]
+        System<Cs...> MakeSystem() {
+            return System<Cs...>{};
+        }
+
+        template <typename... Cs, typename S>
+        [[nodiscard]]
+        System<Cs...> MakeSystem(S&& name) {
+            return System<Cs...>{ std::forward<S>(name) };
+        }
+
+    private:
+        WorldPtr m_World;
+    };
+
+    template <typename... Cs>
+    class System {
+    public:
+        friend System World::MakeSystem<Cs...>();
+
+        template <typename... Ts, typename S>
+        friend System<Ts...> World::MakeSystem(S&&);
+
+        /*template <typename Fn>
+            requires std::is_invocable_r_v<void, Fn(Cs...), ObjId, Cs...>
+        void ForEach(Fn&& f) {
+            for (ObjId i = 0; i < mT.size(); ++i) {
+                auto& c = mT[i];
+                f(i, std::get<Cs>(c)...);
+            }
+        }*/
+
+        template <typename Fn>
+            requires std::is_invocable_r_v<void, Fn(Cs...), Cs...>
+        void ForEach(Fn&& fn) {
+            std::tuple<Cs...> comps; // some sort of iterator that returns a tuple each 'step?'
+            for (size_t i = 0; i < 5; ++i) {
+                fn(std::get<Cs>(comps)...);
+            }
+        }
+
+    private:
+        System() = default;
+
+        template <typename S>
+        explicit System(S&& name)
+            : m_name{ std::forward<S>(name) }
+        {}
+
+        std::string m_name;
+    };
+
+    class Entity {
+    public:
+        friend Entity World::MakeEntity();
+
+        using StorageConstructor = std::function<std::unique_ptr<IStorage>()>;
+
+        [[nodiscard]]
+        constexpr LWOOBJID GetObjectID() const noexcept {
+            return m_Id;
+        }
+
+        [[maybe_unused]]
+        void* AddComponent(eReplicaComponentType, StorageConstructor);
+
+        template <typename C>
+        [[maybe_unused]]
+        C* AddComponent() {
+            return static_cast<C*>(AddComponent(C::ComponentType, std::make_unique<Storage<C>>));
+        }
+
+        [[nodiscard]]
+        const void* GetComponent(eReplicaComponentType) const;
+
+        [[nodiscard]]
+        void* GetComponent(eReplicaComponentType);
+
+        template <typename C>
+        [[nodiscard]]
+        const C* GetComponent() const {
+            return static_cast<const C*>(GetComponent(C::ComponentType));
+        }
+
+        template <typename C>
+        [[nodiscard]]
+        C* GetComponent() {
+            return static_cast<C*>(GetComponent(C::ComponentType));
+        }
+
+    private:
+        Entity(const LWOOBJID id, const WeakWorldPtr world)
+            : m_Id{ id }
+            , m_World { world }
+            {}
+
+        LWOOBJID m_Id;
+
+        WeakWorldPtr m_World;
+    };
+
+    struct IStorage {
+        using RowMap = std::unordered_map<LWOOBJID, size_t>;
+
+        virtual ~IStorage() = default;
+
+        [[nodiscard]]
+        virtual void* at(size_t) = 0;
+
+        [[nodiscard]]
+        virtual const void* at(size_t) const = 0;
+
+        [[nodiscard]]
+        virtual void* emplace_back() = 0;
+
+        RowMap rowMap;
+    };
+
+    template <typename C>
+    class Storage : public IStorage {
+    public:
+        [[nodiscard]]
+        void* at(const size_t index) override {
+            return static_cast<void*>(&m_Vec.at(index));
+        }
+
+        [[nodiscard]]
+        const void* at(const size_t index) const override {
+            return static_cast<const void*>(&m_Vec.at(index));
+        }
+
+        [[nodiscard]]
+        void* emplace_back() override {
+            return static_cast<void*>(&m_Vec.emplace_back());
+        }
+
+    private:
+        std::vector<C> m_Vec;
+    };
+}
--- a/dECS/Iter.h
+++ b/dECS/Iter.h
@@ -0,0 +1,12 @@
+#include "Core.h"
+
+namespace dECS {
+    class Iter {
+    public:
+        [[nodiscard]]
+        bool Next();
+
+    private:
+        WeakWorldPtr m_World;
+    };
+}
--- a/dECS/System.cpp
+++ b/dECS/System.cpp
@@ -0,0 +1,52 @@
+#include "PetComponent.h"
+#include "MovementAIComponent.h"
+#include "MissionComponent.h"
+#include "eMissionState.h"
+
+using Pet = PetComponent;
+using Mission = MissionComponent;
+using MovementAI = MovementAIComponent;
+
+struct Position : NiPoint3 {};
+struct Treasure {};
+
+namespace decs {
+    template <typename... Cs>
+    class System {
+    public:
+        template <typename Fn>
+        void each(Fn&& fn) {
+            fn();
+        }
+    };
+
+    class Scene {
+    public:
+        template <typename... Cs>
+        System<Cs...> system() {
+            return System<Cs...>{};
+        }
+    };
+}
+
+void run() {
+    auto scene = decs::Scene{};
+
+    scene.system<Pet>()
+        .each([](Pet& pet) {
+
+        });
+
+    scene.system<Pet, MovementAI>()
+        .each([](Pet& pet, MovementAI& move) {
+
+        });
+
+    scene.system<Pet, const Mission, const Position>()
+        .each([](Pet& pet, Mission const& mission, Position const& pos) {
+            auto const digUnlocked = mission.GetMissionState(842) == eMissionState::COMPLETE;
+            auto const treasurePos = PetDigServer::GetClosestTreasure(pos);
+
+
+        });
+}
--- a/dGame/CMakeLists.txt
+++ b/dGame/CMakeLists.txt
@@ -26,6 +26,7 @@ target_include_directories(dGameBase PUBLIC "." "dEntity"
 	"${PROJECT_SOURCE_DIR}/dDatabase/CDClientDatabase/CDClientTables"
 	"${PROJECT_SOURCE_DIR}/dDatabase/GameDatabase"
 	"${PROJECT_SOURCE_DIR}/dDatabase/GameDatabase/ITables"
+	"${PROJECT_SOURCE_DIR}/thirdparty/mariadb-connector-cpp/include"
 	# dPhysics
 	"${PROJECT_SOURCE_DIR}/thirdparty/recastnavigation/Recast/Include"
 	"${PROJECT_SOURCE_DIR}/thirdparty/recastnavigation/Detour/Include"
--- a/dGame/dBehaviors/CMakeLists.txt
+++ b/dGame/dBehaviors/CMakeLists.txt
@@ -55,7 +55,7 @@ set(DGAME_DBEHAVIORS_SOURCES "AirMovementBehavior.cpp"
 	"VerifyBehavior.cpp")

 add_library(dBehaviors OBJECT ${DGAME_DBEHAVIORS_SOURCES})
-target_link_libraries(dBehaviors PUBLIC dDatabaseCDClient dPhysics)
+target_link_libraries(dBehaviors PUBLIC dDatabaseCDClient dPhysics magic_enum::magic_enum)
 target_include_directories(dBehaviors PUBLIC "."
 	"${PROJECT_SOURCE_DIR}/dGame/dGameMessages" # via BehaviorContext.h
 	PRIVATE
--- a/dGame/dComponents/CMakeLists.txt
+++ b/dGame/dComponents/CMakeLists.txt
@@ -7,6 +7,7 @@ set(DGAME_DCOMPONENTS_SOURCES
 	"BuildBorderComponent.cpp"
 	"CharacterComponent.cpp"
 	"CollectibleComponent.cpp"
+	"Component.cpp"
 	"ControllablePhysicsComponent.cpp"
 	"DestroyableComponent.cpp"
 	"DonationVendorComponent.cpp"
@@ -64,6 +65,7 @@ target_include_directories(dComponents PUBLIC "."
 	"${PROJECT_SOURCE_DIR}/dDatabase/CDClientDatabase/CDClientTables"
 	"${PROJECT_SOURCE_DIR}/dDatabase/GameDatabase"
 	"${PROJECT_SOURCE_DIR}/dDatabase/GameDatabase/ITables"
+	"${PROJECT_SOURCE_DIR}/thirdparty/mariadb-connector-cpp/include"
 	# dPhysics (via dpWorld.h)
 	"${PROJECT_SOURCE_DIR}/thirdparty/recastnavigation/Recast/Include"
 	"${PROJECT_SOURCE_DIR}/thirdparty/recastnavigation/Detour/Include"
@@ -77,4 +79,4 @@ target_include_directories(dComponents PUBLIC "."
 )
 target_precompile_headers(dComponents REUSE_FROM dGameBase)

-target_link_libraries(dComponents INTERFACE dBehaviors)
+target_link_libraries(dComponents PUBLIC magic_enum::magic_enum INTERFACE dBehaviors)
--- a/dGame/dComponents/Component.cpp
+++ b/dGame/dComponents/Component.cpp
@@ -0,0 +1,21 @@
+#include "Component.h"
+
+void Component::Update(float deltaTime) {
+
+}
+
+void Component::OnUse(Entity* originator) {
+
+}
+
+void Component::UpdateXml(tinyxml2::XMLDocument& doc) {
+
+}
+
+void Component::LoadFromXml(const tinyxml2::XMLDocument& doc) {
+
+}
+
+void Component::Serialize(RakNet::BitStream& outBitStream, bool isConstruction) {
+
+}
--- a/dGame/dComponents/Component.h
+++ b/dGame/dComponents/Component.h
@@ -1,12 +1,10 @@
 #pragma once

-namespace tinyxml2 {
-	class XMLDocument;
-}
+#include "tinyxml2.h"

 namespace RakNet {
 	class BitStream;
-}
+};

 class Entity;

@@ -15,6 +13,7 @@ class Entity;
 */
 class Component {
 public:
+	Component() = default;
 	Component(Entity* parent) : m_Parent{ parent } {}
 	virtual ~Component() = default;

@@ -28,27 +27,27 @@ public:
 	 * Updates the component in the game loop
 	 * @param deltaTime time passed since last update
 	 */
-	virtual void Update(float deltaTime) {}
+	virtual void Update(float deltaTime);

 	/**
 	 * Event called when this component is being used, e.g. when some entity interacted with it
 	 * @param originator
 	 */
-	virtual void OnUse(Entity* originator) {}
+	virtual void OnUse(Entity* originator);

 	/**
 	 * Save data from this componennt to character XML
 	 * @param doc the document to write data to
 	 */
-	virtual void UpdateXml(tinyxml2::XMLDocument& doc) {}
+	virtual void UpdateXml(tinyxml2::XMLDocument& doc);

 	/**
 	 * Load base data for this component from character XML
 	 * @param doc the document to read data from
 	 */
-	virtual void LoadFromXml(const tinyxml2::XMLDocument& doc) {}
+	virtual void LoadFromXml(const tinyxml2::XMLDocument& doc);

-	virtual void Serialize(RakNet::BitStream& outBitStream, bool isConstruction) {}
+	virtual void Serialize(RakNet::BitStream& outBitStream, bool isConstruction);

 protected:

--- a/dGame/dComponents/InventoryComponent.cpp
+++ b/dGame/dComponents/InventoryComponent.cpp
@@ -31,7 +31,6 @@
 #include "eStateChangeType.h"
 #include "eUseItemResponse.h"
 #include "Mail.h"
-#include "ProximityMonitorComponent.h"

 #include "CDComponentsRegistryTable.h"
 #include "CDInventoryComponentTable.h"
@@ -830,30 +829,6 @@ void InventoryComponent::EquipItem(Item* item, const bool skipChecks) {
 				break;
 			}

-			return;
-		} else if (item->GetLot() == 8092) {
-			// Trying to equip a car
-			const auto proximityObjects = Game::entityManager->GetEntitiesByComponent(eReplicaComponentType::PROXIMITY_MONITOR);
-
-			// look for car instancers and check if we are in its setup range
-			for (auto* const entity : proximityObjects) {
-				if (!entity) continue;
-
-				auto* proximityMonitorComponent = entity->GetComponent<ProximityMonitorComponent>();
-				if (!proximityMonitorComponent) continue;
-
-				if (proximityMonitorComponent->IsInProximity("Interaction_Distance", m_Parent->GetObjectID())) {
-					// in the range of a car instancer
-					entity->OnUse(m_Parent);
-					GameMessages::UseItemOnClient itemMsg;
-					itemMsg.target = entity->GetObjectID();
-					itemMsg.itemLOT = item->GetLot();
-					itemMsg.itemToUse = item->GetId();
-					itemMsg.playerId = m_Parent->GetObjectID();
-					itemMsg.Send(m_Parent->GetSystemAddress());
-					break;
-				}
-			}
 			return;
 		}

--- a/dGame/dGameMessages/CMakeLists.txt
+++ b/dGame/dGameMessages/CMakeLists.txt
@@ -6,7 +6,7 @@ set(DGAME_DGAMEMESSAGES_SOURCES

 add_library(dGameMessages OBJECT ${DGAME_DGAMEMESSAGES_SOURCES})
 target_link_libraries(dGameMessages
-	PUBLIC dDatabase
+	PUBLIC magic_enum::magic_enum dDatabase
 	INTERFACE dGameBase # TradingManager
 )
 target_include_directories(dGameMessages PUBLIC "."
--- a/dGame/dGameMessages/GameMessages.cpp
+++ b/dGame/dGameMessages/GameMessages.cpp
@@ -6342,57 +6342,36 @@ void GameMessages::SendUpdateInventoryUi(LWOOBJID objectId, const SystemAddress&
 	SEND_PACKET;
 }

-namespace GameMessages {
-	void GameMsg::Send(const SystemAddress& sysAddr) const {
-		CBITSTREAM;
-		CMSGHEADER;
+void GameMessages::DisplayTooltip::Send() const {
+	CBITSTREAM;
+	CMSGHEADER;

-		bitStream.Write(target); // Who this message will be sent to on the (a) client
-		bitStream.Write(msgId); // the ID of this message
+	bitStream.Write(target);
+	bitStream.Write(msgId);

-		Serialize(bitStream); // write the message data
+	bitStream.Write(doOrDie);
+	bitStream.Write(noRepeat);
+	bitStream.Write(noRevive);
+	bitStream.Write(isPropertyTooltip);
+	bitStream.Write(show);
+	bitStream.Write(translate);
+	bitStream.Write(time);
+	bitStream.Write<int32_t>(id.size());
+	bitStream.Write(id);

-		// Send to everyone if someone sent unassigned system address, or to one specific client.
-		if (sysAddr == UNASSIGNED_SYSTEM_ADDRESS) {
-			SEND_PACKET_BROADCAST;
-		} else {
-			SEND_PACKET;
-		}
+	std::string toWrite;
+	for (const auto* item : localizeParams) {
+		toWrite += item->GetString() + "\n";
 	}
+	if (!toWrite.empty()) toWrite.pop_back();
+	bitStream.Write<int32_t>(toWrite.size());
+	bitStream.Write(GeneralUtils::ASCIIToUTF16(toWrite));
+	if (!toWrite.empty()) bitStream.Write<uint16_t>(0x00); // Null Terminator

-	void DisplayTooltip::Serialize(RakNet::BitStream& bitStream) const {
-		bitStream.Write(doOrDie);
-		bitStream.Write(noRepeat);
-		bitStream.Write(noRevive);
-		bitStream.Write(isPropertyTooltip);
-		bitStream.Write(show);
-		bitStream.Write(translate);
-		bitStream.Write(time);
-		bitStream.Write<int32_t>(id.size());
-		bitStream.Write(id);
+	bitStream.Write<int32_t>(imageName.size());
+	bitStream.Write(imageName);
+	bitStream.Write<int32_t>(text.size());
+	bitStream.Write(text);

-		std::string toWrite;
-		for (const auto* item : localizeParams) {
-			toWrite += item->GetString() + "\n";
-		}
-		if (!toWrite.empty()) toWrite.pop_back();
-		bitStream.Write<int32_t>(toWrite.size());
-		bitStream.Write(GeneralUtils::ASCIIToUTF16(toWrite));
-		if (!toWrite.empty()) bitStream.Write<uint16_t>(0x00); // Null Terminator
-
-		bitStream.Write<int32_t>(imageName.size());
-		bitStream.Write(imageName);
-		bitStream.Write<int32_t>(text.size());
-		bitStream.Write(text);
-	}
-
-	void UseItemOnClient::Serialize(RakNet::BitStream& bitStream) const {
-		bitStream.Write(itemLOT);
-		bitStream.Write(itemToUse);
-		bitStream.Write(itemType);
-		bitStream.Write(playerId);
-		bitStream.Write(targetPosition.x);
-		bitStream.Write(targetPosition.y);
-		bitStream.Write(targetPosition.z);
-	}
+	SEND_PACKET;
 }
--- a/dGame/dGameMessages/GameMessages.h
+++ b/dGame/dGameMessages/GameMessages.h
@@ -52,10 +52,10 @@ namespace GameMessages {
 	struct GameMsg {
 		GameMsg(MessageType::Game gmId) : msgId{ gmId } {}
 		virtual ~GameMsg() = default;
-		void Send(const SystemAddress& sysAddr) const;
-		virtual void Serialize(RakNet::BitStream& bitStream) const {}
+		virtual void Send() const {}
 		MessageType::Game msgId;
 		LWOOBJID target{ LWOOBJID_EMPTY };
+		SystemAddress sysAddr{ UNASSIGNED_SYSTEM_ADDRESS };
 	};

 	class PropertyDataMessage;
@@ -705,17 +705,7 @@ namespace GameMessages {
 		std::vector<LDFBaseData*> localizeParams{};
 		std::u16string imageName{};
 		std::u16string text{};
-		void Serialize(RakNet::BitStream& bitStream) const override;
-	};
-
-	struct UseItemOnClient : public GameMsg {
-		UseItemOnClient() : GameMsg(MessageType::Game::USE_ITEM_ON_CLIENT) {}
-		LWOOBJID playerId{};
-		LWOOBJID itemToUse{};
-		uint32_t itemType{};
-		LOT itemLOT{};
-		NiPoint3 targetPosition{};
-		void Serialize(RakNet::BitStream& bitStream) const override;
+		void Send() const override;
 	};
 };

--- a/dGame/dInventory/CMakeLists.txt
+++ b/dGame/dInventory/CMakeLists.txt
@@ -24,6 +24,7 @@ target_include_directories(dInventory PUBLIC "."
 	"${PROJECT_SOURCE_DIR}/dGame/dMission" # via MissionComponent.h
 	"${PROJECT_SOURCE_DIR}/dZoneManager" # via Item.cpp
 )
+target_link_libraries(dInventory PUBLIC magic_enum::magic_enum)
 target_precompile_headers(dInventory REUSE_FROM dGameBase)
 # Workaround for compiler bug where the optimized code could result in a memcpy of 0 bytes, even though that isnt possible.
 # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=97185
--- a/dGame/dPropertyBehaviors/ControlBehaviorMessages/MoveToInventoryMessage.h
+++ b/dGame/dPropertyBehaviors/ControlBehaviorMessages/MoveToInventoryMessage.h
@@ -8,8 +8,6 @@ class AMFArrayValue;
 /**
 * @brief Sent when a player moves a Behavior A at position B to their inventory. 
 */
-#pragma message("MoveToInventory.h This Control Behavior Message does not have a test yet. Non-developers can ignore this warning.")
-
 class MoveToInventoryMessage : public BehaviorMessageBase {
 public:
 	MoveToInventoryMessage(const AMFArrayValue& arguments);
--- a/dGame/dUtilities/Preconditions.cpp
+++ b/dGame/dUtilities/Preconditions.cpp
@@ -137,7 +137,7 @@ bool Precondition::CheckValue(Entity* player, const uint32_t value, bool evaluat

 		return inventoryComponent->GetLotCount(value) >= count;
 	case PreconditionType::DoesNotHaveItem:
-		return (inventoryComponent->IsEquipped(value) ? 1 : 0) < count;
+		return inventoryComponent->IsEquipped(value) && count > 0;
 	case PreconditionType::HasAchievement:
 		if (missionComponent == nullptr) return false;
 		return missionComponent->GetMissionState(value) >= eMissionState::COMPLETE;
--- a/dGame/dUtilities/SlashCommandHandler.cpp
+++ b/dGame/dUtilities/SlashCommandHandler.cpp
@@ -287,8 +287,8 @@ void SlashCommandHandler::Startup() {
 	RegisterCommand(SpawnPhysicsVertsCommand);

 	Command TeleportCommand{
-		.help = "Teleports you to a position or a player to another player.",
-		.info = "Teleports you. If no Y is given, you are teleported to the height of the terrain or physics object at (x, z). Any of the coordinates can use the syntax of an exact position (10.0), or a relative position (~+10.0). A ~ means use the current value of that axis as the base value. Addition or subtraction is supported (~+10) (~-10). If source player and target player are players that exist in the world, then the source player will be teleported to target player.",
+		.help = "Teleports you",
+		.info = "Teleports you. If no Y is given, you are teleported to the height of the terrain or physics object at (x, z)",
 		.aliases = { "teleport", "tele", "tp" },
 		.handle = DEVGMCommands::Teleport,
 		.requiredLevel = eGameMasterLevel::JUNIOR_DEVELOPER
@@ -1056,15 +1056,6 @@ void SlashCommandHandler::Startup() {
 	};
 	RegisterCommand(InstanceInfoCommand);

-	Command ServerUptimeCommand{
-		.help = "Display the time the current world server has been active",
-		.info = "Display the time the current world server has been active",
-		.aliases = { "uptime" },
-		.handle = GMZeroCommands::ServerUptime,
-		.requiredLevel = eGameMasterLevel::DEVELOPER
-	};
-	RegisterCommand(ServerUptimeCommand);
-
 	//Commands that are handled by the client

 	Command faqCommand{
--- a/dGame/dUtilities/SlashCommands/DEVGMCommands.cpp
+++ b/dGame/dUtilities/SlashCommands/DEVGMCommands.cpp
@@ -555,45 +555,25 @@ namespace DEVGMCommands {
 		}
 	}

-	std::optional<float> ParseRelativeAxis(const float sourcePos, const std::string& toParse) {
-		if (toParse.empty()) return std::nullopt;
-
-		// relative offset from current position
-		if (toParse[0] == '~') {
-			if (toParse.size() == 1) return sourcePos;
-
-			if (toParse.size() < 3 || !(toParse[1] != '+' || toParse[1] != '-')) return std::nullopt;
-
-			const auto offset = GeneralUtils::TryParse<float>(toParse.substr(2));
-			if (!offset.has_value()) return std::nullopt;
-
-			bool isNegative = toParse[1] == '-';
-			return isNegative ? sourcePos - offset.value() : sourcePos + offset.value();
-		}
-
-		return GeneralUtils::TryParse<float>(toParse);
-	}
-
 	void Teleport(Entity* entity, const SystemAddress& sysAddr, const std::string args) {
 		const auto splitArgs = GeneralUtils::SplitString(args, ' ');

-		const auto& sourcePos = entity->GetPosition();
 		NiPoint3 pos{};
-		auto* sourceEntity = entity;
 		if (splitArgs.size() == 3) {
-			const auto x = ParseRelativeAxis(sourcePos.x, splitArgs[0]);
+
+			const auto x = GeneralUtils::TryParse<float>(splitArgs.at(0));
 			if (!x) {
 				ChatPackets::SendSystemMessage(sysAddr, u"Invalid x.");
 				return;
 			}

-			const auto y = ParseRelativeAxis(sourcePos.y, splitArgs[1]);
+			const auto y = GeneralUtils::TryParse<float>(splitArgs.at(1));
 			if (!y) {
 				ChatPackets::SendSystemMessage(sysAddr, u"Invalid y.");
 				return;
 			}

-			const auto z = ParseRelativeAxis(sourcePos.z, splitArgs[2]);
+			const auto z = GeneralUtils::TryParse<float>(splitArgs.at(2));
 			if (!z) {
 				ChatPackets::SendSystemMessage(sysAddr, u"Invalid z.");
 				return;
@@ -604,39 +584,32 @@ namespace DEVGMCommands {
 			pos.SetZ(z.value());

 			LOG("Teleporting objectID: %llu to %f, %f, %f", entity->GetObjectID(), pos.x, pos.y, pos.z);
+			GameMessages::SendTeleport(entity->GetObjectID(), pos, NiQuaternion(), sysAddr);
 		} else if (splitArgs.size() == 2) {
-			const auto x = ParseRelativeAxis(sourcePos.x, splitArgs[0]);
-			auto* sourcePlayer = PlayerManager::GetPlayer(splitArgs[0]);
-			if (!x && !sourcePlayer) {
-				ChatPackets::SendSystemMessage(sysAddr, u"Invalid x or source player not found.");
-				return;
-			}
-			if (sourcePlayer) sourceEntity = sourcePlayer;

-			const auto z = ParseRelativeAxis(sourcePos.z, splitArgs[1]);
-			const auto* const targetPlayer = PlayerManager::GetPlayer(splitArgs[1]);
-			if (!z && !targetPlayer) {
-				ChatPackets::SendSystemMessage(sysAddr, u"Invalid z or target player not found.");
+			const auto x = GeneralUtils::TryParse<float>(splitArgs.at(0));
+			if (!x) {
+				ChatPackets::SendSystemMessage(sysAddr, u"Invalid x.");
 				return;
 			}

-			if (x && z) {
-				pos.SetX(x.value());
-				pos.SetY(0.0f);
-				pos.SetZ(z.value());
-			} else if (sourcePlayer && targetPlayer) {
-				pos = targetPlayer->GetPosition();
-			} else {
-				ChatPackets::SendSystemMessage(sysAddr, u"Unable to teleport.");
+			const auto z = GeneralUtils::TryParse<float>(splitArgs.at(1));
+			if (!z) {
+				ChatPackets::SendSystemMessage(sysAddr, u"Invalid z.");
 				return;
 			}
+
+			pos.SetX(x.value());
+			pos.SetY(0.0f);
+			pos.SetZ(z.value());
+
 			LOG("Teleporting objectID: %llu to X: %f, Z: %f", entity->GetObjectID(), pos.x, pos.z);
+			GameMessages::SendTeleport(entity->GetObjectID(), pos, NiQuaternion(), sysAddr);
 		} else {
 			ChatPackets::SendSystemMessage(sysAddr, u"Correct usage: /teleport <x> (<y>) <z> - if no Y given, will teleport to the height of the terrain (or any physics object).");
 		}
-		GameMessages::SendTeleport(sourceEntity->GetObjectID(), pos, sourceEntity->GetRotation(), sourceEntity->GetSystemAddress());

-		auto* possessorComponent = sourceEntity->GetComponent<PossessorComponent>();
+		auto* possessorComponent = entity->GetComponent<PossessorComponent>();
 		if (possessorComponent) {
 			auto* possassableEntity = Game::entityManager->GetEntity(possessorComponent->GetPossessable());

--- a/dGame/dUtilities/SlashCommands/GMZeroCommands.cpp
+++ b/dGame/dUtilities/SlashCommands/GMZeroCommands.cpp
@@ -225,13 +225,8 @@ namespace GMZeroCommands {
 		ChatPackets::SendSystemMessage(sysAddr, u"Map: " + (GeneralUtils::to_u16string(zoneId.GetMapID())) + u"\nClone: " + (GeneralUtils::to_u16string(zoneId.GetCloneID())) + u"\nInstance: " + (GeneralUtils::to_u16string(zoneId.GetInstanceID())));
 	}

-	// Display the server uptime
-	void ServerUptime(Entity* entity, const SystemAddress& sysAddr, const std::string args) {
-		const auto time = Game::server->GetUptime();
-		const auto seconds = std::chrono::duration_cast<std::chrono::seconds>(time).count();
-		ChatPackets::SendSystemMessage(sysAddr, u"Server has been up for " + GeneralUtils::to_u16string(seconds) + u" s");
-	}
-
 	//For client side commands
 	void ClientHandled(Entity* entity, const SystemAddress& sysAddr, const std::string args) {}
+
 };
+
--- a/dGame/dUtilities/SlashCommands/GMZeroCommands.h
+++ b/dGame/dUtilities/SlashCommands/GMZeroCommands.h
@@ -15,7 +15,6 @@ namespace GMZeroCommands {
 	void LeaveZone(Entity* entity, const SystemAddress& sysAddr, const std::string args);
 	void Resurrect(Entity* entity, const SystemAddress& sysAddr, const std::string args);
 	void InstanceInfo(Entity* entity, const SystemAddress& sysAddr, const std::string args);
-	void ServerUptime(Entity* entity, const SystemAddress& sysAddr, const std::string args);
 	void ClientHandled(Entity* entity, const SystemAddress& sysAddr, const std::string args);
 }

--- a/dLocalServer/CMakeLists.txt
+++ b/dLocalServer/CMakeLists.txt
@@ -1,7 +0,0 @@
-set(DLOCAL_SERVER_SOURCES
-	"dllmain.cpp"
-)
-
-add_library(dLocalServer OBJECT ${DLOCAL_SERVER_SOURCES})
-
-target_link_libraries(dLocalServer)
--- a/dLocalServer/dllmain.cpp
+++ b/dLocalServer/dllmain.cpp
@@ -1,32 +0,0 @@
-#include <windows.h>
-
-BOOL WINAPI DllMain(
-	HINSTANCE hinstDLL,  // handle to DLL module
-	DWORD fdwReason,     // reason for calling function
-	LPVOID lpvReserved)  // reserved
-{
-	// Perform actions based on the reason for calling.
-	switch (fdwReason) {
-	case DLL_PROCESS_ATTACH:
-		
-		break;
-
-	case DLL_THREAD_ATTACH:
-		// Do thread-specific initialization.
-		break;
-
-	case DLL_THREAD_DETACH:
-		// Do thread-specific cleanup.
-		break;
-
-	case DLL_PROCESS_DETACH:
-
-		if (lpvReserved != nullptr) {
-			break; // do not do cleanup if process termination scenario
-		}
-
-		// Perform any necessary cleanup.
-		break;
-	}
-	return TRUE;  // Successful DLL_PROCESS_ATTACH.
-}
--- a/dMasterServer/CMakeLists.txt
+++ b/dMasterServer/CMakeLists.txt
@@ -1,23 +1,11 @@
 set(DMASTERSERVER_SOURCES
 	"InstanceManager.cpp"
 	"PersistentIDManager.cpp"
-	"StartLocal.cpp"
+	"Start.cpp"
 )

-if(WIN32 AND LOCAL_SERVER)
-	set(DMASTERSERVER_SOURCES ${DMASTERSERVER_SOURCES} "StartLocal.cpp") 
-else()
-	set(DMASTERSERVER_SOURCES ${DMASTERSERVER_SOURCES} "Start.cpp") 
-endif()
-
 add_library(dMasterServer ${DMASTERSERVER_SOURCES})
-
-if (WIN32 AND LOCAL_SERVER)
-	add_library(MasterServer SHARED "MasterServer.cpp")
-else()
-	add_executable(MasterServer "MasterServer.cpp")
-endif()
-
+add_executable(MasterServer "MasterServer.cpp")
 target_compile_definitions(MasterServer PRIVATE PROJECT_VERSION="\"${PROJECT_VERSION}\"")
 target_include_directories(dMasterServer PUBLIC "."
 	"${PROJECT_SOURCE_DIR}/dZoneManager" # InstanceManager.h uses dZMCommon.h
--- a/dMasterServer/MasterServer.cpp
+++ b/dMasterServer/MasterServer.cpp
@@ -62,7 +62,7 @@ std::map<uint32_t, std::string> activeSessions;
 SystemAddress authServerMasterPeerSysAddr;
 SystemAddress chatServerMasterPeerSysAddr;

-int start(int argc, char** argv) {
+int main(int argc, char** argv) {
 	constexpr uint32_t masterFramerate = mediumFramerate;
 	constexpr uint32_t masterFrameDelta = mediumFrameDelta;
 	Diagnostics::SetProcessName("Master");
@@ -126,7 +126,6 @@ int start(int argc, char** argv) {

 	MigrationRunner::RunMigrations();
 	const auto resServerPath = BinaryPathFinder::GetBinaryDir() / "resServer";
-	std::filesystem::create_directories(resServerPath);
 	const bool cdServerExists = std::filesystem::exists(resServerPath / "CDServer.sqlite");
 	const bool oldCDServerExists = std::filesystem::exists(Game::assetManager->GetResPath() / "CDServer.sqlite");
 	const bool fdbExists = std::filesystem::exists(Game::assetManager->GetResPath() / "cdclient.fdb");
@@ -177,16 +176,12 @@ int start(int argc, char** argv) {
 	}

 	// Run migrations should any need to be run.
-	MigrationRunner::RunSQLiteMigrations();	
+	MigrationRunner::RunSQLiteMigrations();

 	//If the first command line argument is -a or --account then make the user
 	//input a username and password, with the password being hidden.
-	bool createAccount = Database::Get()->GetAccountCount() == 0 && Game::config->GetValue("skip_account_creation") != "1";
-	if (createAccount) {
-		LOG("No accounts exist in the database.  Please create an account.");
-	}
-	if ((argc > 1 &&
-		(strcmp(argv[1], "-a") == 0 || strcmp(argv[1], "--account") == 0)) || createAccount) {
+	if (argc > 1 &&
+		(strcmp(argv[1], "-a") == 0 || strcmp(argv[1], "--account") == 0)) {
 		std::string username;
 		std::string password;

@@ -429,44 +424,6 @@ int start(int argc, char** argv) {
 	return ShutdownSequence(EXIT_SUCCESS);
 }

-#ifdef LOCAL_SERVER
-BOOL WINAPI DllMain(
-	HINSTANCE hinstDLL,  // handle to DLL module
-	DWORD fdwReason,     // reason for calling function
-	LPVOID lpvReserved)  // reserved
-{
-	// Perform actions based on the reason for calling.
-	switch (fdwReason) {
-	case DLL_PROCESS_ATTACH:
-		AllocConsole();
-		start(0, nullptr);
-		break;
-
-	case DLL_THREAD_ATTACH:
-		// Do thread-specific initialization.
-		break;
-
-	case DLL_THREAD_DETACH:
-		// Do thread-specific cleanup.
-		break;
-
-	case DLL_PROCESS_DETACH:
-
-		if (lpvReserved != nullptr) {
-			break; // do not do cleanup if process termination scenario
-		}
-
-		// Perform any necessary cleanup.
-		break;
-	}
-	return TRUE;  // Successful DLL_PROCESS_ATTACH.
-}
-#else
-int main(int argc, char** argv) {
-	return start(argc, argv);
-}
-#endif
-
 void HandlePacket(Packet* packet) {
 	if (packet->length < 1) return;
 	if (packet->data[0] == ID_DISCONNECTION_NOTIFICATION) {
--- a/dMasterServer/Start.cpp
+++ b/dMasterServer/Start.cpp
@@ -13,7 +13,7 @@ void StartChatServer() {
 	//macOS doesn't need sudo to run on ports < 1024
 	auto result = system(((BinaryPathFinder::GetBinaryDir() / "ChatServer").string() + "&").c_str());
 #elif _WIN32
-	auto result = system(("start /B " + (BinaryPathFinder::GetBinaryDir() / "ChatServer.exe").string()).c_str());
+	auto result = system(("start " + (BinaryPathFinder::GetBinaryDir() / "ChatServer.exe").string()).c_str());
 #else
 	if (std::atoi(Game::config->GetValue("use_sudo_chat").c_str())) {
 		auto result = system(("sudo " + (BinaryPathFinder::GetBinaryDir() / "ChatServer").string() + "&").c_str());
@@ -31,7 +31,7 @@ void StartAuthServer() {
 #ifdef __APPLE__
 	auto result = system(((BinaryPathFinder::GetBinaryDir() / "AuthServer").string() + "&").c_str());
 #elif _WIN32
-	auto result = system(("start /B " + (BinaryPathFinder::GetBinaryDir() / "AuthServer.exe").string()).c_str());
+	auto result = system(("start " + (BinaryPathFinder::GetBinaryDir() / "AuthServer.exe").string()).c_str());
 #else
 	if (std::atoi(Game::config->GetValue("use_sudo_auth").c_str())) {
 		auto result = system(("sudo " + (BinaryPathFinder::GetBinaryDir() / "AuthServer").string() + "&").c_str());
@@ -43,7 +43,7 @@ void StartAuthServer() {

 void StartWorldServer(LWOMAPID mapID, uint16_t port, LWOINSTANCEID lastInstanceID, int maxPlayers, LWOCLONEID cloneID) {
 #ifdef _WIN32
-	std::string cmd = "start /B " + (BinaryPathFinder::GetBinaryDir() / "WorldServer.exe").string() + " -zone ";
+	std::string cmd = "start " + (BinaryPathFinder::GetBinaryDir() / "WorldServer.exe").string() + " -zone ";
 #else
 	std::string cmd;
 	if (std::atoi(Game::config->GetValue("use_sudo_world").c_str())) {
--- a/dMasterServer/StartLocal.cpp
+++ b/dMasterServer/StartLocal.cpp
@@ -1,121 +0,0 @@
-#include <windows.h>
-#include <iostream>
-#include <string>
-#include "Start.h"
-#include "Logger.h"
-#include "dConfig.h"
-#include "Game.h"
-#include "BinaryPathFinder.h"
-
-// Function to create a process and execute a DLL
-bool RunDLLAsApplication(const char* dllPath) {
-	STARTUPINFOA si = { sizeof(STARTUPINFOA) };
-	PROCESS_INFORMATION pi = { 0 };
-
-	// Path to a dummy executable
-	const char* dummyProcessPath = "C:\\Windows\\System32\\notepad.exe";
-
-	// Create a suspended dummy process
-	if (!CreateProcessA(
-		dummyProcessPath,
-		NULL,
-		NULL,
-		NULL,
-		FALSE,
-		CREATE_SUSPENDED,
-		NULL,
-		NULL,
-		&si,
-		&pi)) {
-		std::cerr << "Failed to create dummy process. Error: " << GetLastError() << std::endl;
-		return false;
-	}
-
-	// Get the address of LoadLibraryA in the current process
-	HMODULE kernel32 = GetModuleHandleA("kernel32.dll");
-	if (!kernel32) {
-		std::cerr << "Failed to get handle for kernel32.dll. Error: " << GetLastError() << std::endl;
-		TerminateProcess(pi.hProcess, 1);
-		return false;
-	}
-
-	void* loadLibraryAddr = (void*)GetProcAddress(kernel32, "LoadLibraryA");
-	if (!loadLibraryAddr) {
-		std::cerr << "Failed to get address of LoadLibraryA. Error: " << GetLastError() << std::endl;
-		TerminateProcess(pi.hProcess, 1);
-		return false;
-	}
-
-	// Allocate memory in the target process for the DLL path
-	void* remoteMemory = VirtualAllocEx(pi.hProcess, NULL, strlen(dllPath) + 1, MEM_COMMIT | MEM_RESERVE, PAGE_READWRITE);
-	if (!remoteMemory) {
-		std::cerr << "Failed to allocate memory in target process. Error: " << GetLastError() << std::endl;
-		TerminateProcess(pi.hProcess, 1);
-		return false;
-	}
-
-	// Write the DLL path into the allocated memory
-	if (!WriteProcessMemory(pi.hProcess, remoteMemory, dllPath, strlen(dllPath) + 1, NULL)) {
-		std::cerr << "Failed to write DLL path to target process. Error: " << GetLastError() << std::endl;
-		VirtualFreeEx(pi.hProcess, remoteMemory, 0, MEM_RELEASE);
-		TerminateProcess(pi.hProcess, 1);
-		return false;
-	}
-
-	// Create a remote thread in the target process to load the DLL
-	HANDLE remoteThread = CreateRemoteThread(pi.hProcess, NULL, 0, (LPTHREAD_START_ROUTINE)loadLibraryAddr, remoteMemory, 0, NULL);
-	if (!remoteThread) {
-		std::cerr << "Failed to create remote thread. Error: " << GetLastError() << std::endl;
-		VirtualFreeEx(pi.hProcess, remoteMemory, 0, MEM_RELEASE);
-		TerminateProcess(pi.hProcess, 1);
-		return false;
-	}
-
-	// Wait for the remote thread to complete
-	WaitForSingleObject(remoteThread, INFINITE);
-	CloseHandle(remoteThread);
-
-	// Free the allocated memory
-	VirtualFreeEx(pi.hProcess, remoteMemory, 0, MEM_RELEASE);
-
-	// Resume the main thread of the process
-	ResumeThread(pi.hThread);
-
-	// Clean up process and thread handles
-	CloseHandle(pi.hThread);
-	CloseHandle(pi.hProcess);
-
-	return true;
-}
-
-void StartChatServer() {
-	if (Game::ShouldShutdown()) {
-		LOG("Currently shutting down.  Chat will not be restarted.");
-		return;
-	}
-
-	RunDLLAsApplication("ChatServer.dll");
-}
-
-void StartAuthServer() {
-	if (Game::ShouldShutdown()) {
-		LOG("Currently shutting down.  Auth will not be restarted.");
-		return;
-	}
-
-	RunDLLAsApplication("AuthServer.dll");
-}
-
-void StartWorldServer(LWOMAPID mapID, uint16_t port, LWOINSTANCEID lastInstanceID, int maxPlayers, LWOCLONEID cloneID) {
-	RunDLLAsApplication("WorldServer.dll");
-
-	//cmd.append(std::to_string(mapID));
-	//cmd.append(" -port ");
-	//cmd.append(std::to_string(port));
-	//cmd.append(" -instance ");
-	//cmd.append(std::to_string(lastInstanceID));
-	//cmd.append(" -maxclients ");
-	//cmd.append(std::to_string(maxPlayers));
-	//cmd.append(" -clone ");
-	//cmd.append(std::to_string(cloneID));
-}
--- a/dNet/AuthPackets.cpp
+++ b/dNet/AuthPackets.cpp
@@ -82,14 +82,14 @@ void AuthPackets::SendHandshake(dServer* server, const SystemAddress& sysAddr, c
 	if (serverType == ServerType::Auth) bitStream.Write(ServiceId::Auth);
 	else if (serverType == ServerType::World) bitStream.Write(ServiceId::World);
 	else bitStream.Write(ServiceId::General);
-	bitStream.Write<uint64_t>(219818241584);
+	bitStream.Write<uint64_t>(215523470896);

 	server->Send(bitStream, sysAddr, false);
 }

 std::string CleanReceivedString(const std::string& str) {
 	std::string toReturn = str;
-	const auto removed = std::ranges::find_if(toReturn, [](unsigned char c) { return isprint(c) == 0 && isblank(c) == 0; });
+	const auto removed = std::ranges::find_if(toReturn, [](char c) { return isprint(c) == 0 && isblank(c) == 0; });
 	toReturn.erase(removed, toReturn.end());
 	return toReturn;
 }
--- a/dNet/AuthPackets.h
+++ b/dNet/AuthPackets.h
@@ -4,7 +4,7 @@
 #define _VARIADIC_MAX 10
 #include "dCommonVars.h"
 #include "dNetCommon.h"
-#include "magic_enum.hpp"
+#include <magic_enum/magic_enum.hpp>

 enum class ServerType : uint32_t;
 enum class eLoginResponse : uint8_t;
--- a/dNet/CMakeLists.txt
+++ b/dNet/CMakeLists.txt
@@ -8,7 +8,7 @@ set(DNET_SOURCES "AuthPackets.cpp"
 	"ZoneInstanceManager.cpp")

 add_library(dNet STATIC ${DNET_SOURCES})
-target_link_libraries(dNet PRIVATE bcrypt MD5)
+target_link_libraries(dNet PUBLIC magic_enum::magic_enum PRIVATE bcrypt MD5)
 target_include_directories(dNet PRIVATE
 	"${PROJECT_SOURCE_DIR}/dCommon"
 	"${PROJECT_SOURCE_DIR}/dCommon/dEnums"
@@ -19,6 +19,7 @@ target_include_directories(dNet PRIVATE
 	"${PROJECT_SOURCE_DIR}/dDatabase/CDClientDatabase/CDClientTables"
 	"${PROJECT_SOURCE_DIR}/dDatabase/GameDatabase"
 	"${PROJECT_SOURCE_DIR}/dDatabase/GameDatabase/ITables"
+	"${PROJECT_SOURCE_DIR}/thirdparty/mariadb-connector-cpp/include"

 	"${PROJECT_SOURCE_DIR}/dGame" # UserManager.h
 	"${PROJECT_SOURCE_DIR}/dGame/dComponents"
--- a/dNet/dServer.h
+++ b/dNet/dServer.h
@@ -1,6 +1,5 @@
 #pragma once
 #include <string>
-#include <chrono>
 #include <csignal>
 #include "RakPeerInterface.h"
 #include "ReplicaManager.h"
@@ -81,11 +80,6 @@ public:

 	const ServerType GetServerType() const { return mServerType; }

-	[[nodiscard]]
-	std::chrono::steady_clock::duration GetUptime() const {
-		return std::chrono::steady_clock::now() - mStartTime;
-	}
-
 private:
 	bool Startup();
 	void Shutdown();
@@ -120,5 +114,4 @@ protected:
 	SystemAddress mMasterSystemAddress;
 	std::string mMasterIP;
 	int mMasterPort;
-	std::chrono::steady_clock::time_point mStartTime = std::chrono::steady_clock::now();
 };
--- a/dScripts/02_server/Map/AG/NpcAgCourseStarter.cpp
+++ b/dScripts/02_server/Map/AG/NpcAgCourseStarter.cpp
@@ -3,106 +3,104 @@
 #include "ScriptedActivityComponent.h"
 #include "GameMessages.h"
 #include "LeaderboardManager.h"
-#include "dServer.h"
 #include "eMissionTaskType.h"
 #include "eMissionState.h"
 #include "MissionComponent.h"
-#include <chrono>
+#include <ctime>

-void NpcAgCourseStarter::OnStartup(Entity* self) {}
+void NpcAgCourseStarter::OnStartup(Entity* self) {
+
+}

 void NpcAgCourseStarter::OnUse(Entity* self, Entity* user) {
-	auto* const scriptedActivityComponent = self->GetComponent<ScriptedActivityComponent>();
-	if (!scriptedActivityComponent) return;
+	auto* scriptedActivityComponent = self->GetComponent<ScriptedActivityComponent>();

-	const auto selfId = self->GetObjectID();
-	const auto userId = user->GetObjectID();
-	const auto& userSysAddr = user->GetSystemAddress();
+	if (scriptedActivityComponent == nullptr) {
+		return;
+	}

-	if (scriptedActivityComponent->GetActivityPlayerData(userId) != nullptr) {
-		GameMessages::SendNotifyClientObject(selfId, u"exit", 0, 0, LWOOBJID_EMPTY, "", userSysAddr);
+	if (scriptedActivityComponent->GetActivityPlayerData(user->GetObjectID()) != nullptr) {
+		GameMessages::SendNotifyClientObject(self->GetObjectID(), u"exit", 0, 0, LWOOBJID_EMPTY, "", user->GetSystemAddress());
 	} else {
-		GameMessages::SendNotifyClientObject(selfId, u"start", 0, 0, LWOOBJID_EMPTY, "", userSysAddr);
+		GameMessages::SendNotifyClientObject(self->GetObjectID(), u"start", 0, 0, LWOOBJID_EMPTY, "", user->GetSystemAddress());
 	}
 }

 void NpcAgCourseStarter::OnMessageBoxResponse(Entity* self, Entity* sender, int32_t button, const std::u16string& identifier, const std::u16string& userData) {
-	auto* const scriptedActivityComponent = self->GetComponent<ScriptedActivityComponent>();
-	if (!scriptedActivityComponent) return;
+	auto* scriptedActivityComponent = self->GetComponent<ScriptedActivityComponent>();

-	const auto selfId = self->GetObjectID();
-	const auto senderId = sender->GetObjectID();
-	const auto& senderSysAddr = sender->GetSystemAddress();
+	if (scriptedActivityComponent == nullptr) {
+		return;
+	}

 	if (identifier == u"player_dialog_cancel_course" && button == 1) {
-		GameMessages::SendNotifyClientObject(selfId, u"stop_timer", 0, 0, LWOOBJID_EMPTY, "", senderSysAddr);
-		GameMessages::SendNotifyClientObject(selfId, u"cancel_timer", 0, 0, LWOOBJID_EMPTY, "", senderSysAddr);
+		GameMessages::SendNotifyClientObject(self->GetObjectID(), u"stop_timer", 0, 0, LWOOBJID_EMPTY, "", sender->GetSystemAddress());

-		scriptedActivityComponent->RemoveActivityPlayerData(senderId);
+		GameMessages::SendNotifyClientObject(self->GetObjectID(), u"cancel_timer", 0, 0, LWOOBJID_EMPTY, "", sender->GetSystemAddress());
+
+		scriptedActivityComponent->RemoveActivityPlayerData(sender->GetObjectID());

 		Game::entityManager->SerializeEntity(self);
 	} else if (identifier == u"player_dialog_start_course" && button == 1) {
-		GameMessages::SendNotifyClientObject(selfId, u"start_timer", 0, 0, LWOOBJID_EMPTY, "", senderSysAddr);
-		GameMessages::SendActivityStart(selfId, senderSysAddr);
+		GameMessages::SendNotifyClientObject(self->GetObjectID(), u"start_timer", 0, 0, LWOOBJID_EMPTY, "", sender->GetSystemAddress());
+
+		GameMessages::SendActivityStart(self->GetObjectID(), sender->GetSystemAddress());
+
+		auto* data = scriptedActivityComponent->AddActivityPlayerData(sender->GetObjectID());

-		auto* const data = scriptedActivityComponent->AddActivityPlayerData(senderId);
 		if (data->values[1] != 0) return;

-		const auto raceStartTime = Game::server->GetUptime() + std::chrono::seconds(4); // Offset for starting timer
-		const auto fRaceStartTime = std::chrono::duration<float, std::ratio<1>>(raceStartTime).count();
-		data->values[1] = fRaceStartTime;
+		time_t startTime = std::time(0) + 4; // Offset for starting timer
+
+		data->values[1] = *reinterpret_cast<float*>(&startTime);

 		Game::entityManager->SerializeEntity(self);
 	} else if (identifier == u"FootRaceCancel") {
-		GameMessages::SendNotifyClientObject(selfId, u"stop_timer", 0, 0, LWOOBJID_EMPTY, "", senderSysAddr);
+		GameMessages::SendNotifyClientObject(self->GetObjectID(), u"stop_timer", 0, 0, LWOOBJID_EMPTY, "", sender->GetSystemAddress());

-		if (scriptedActivityComponent->GetActivityPlayerData(senderId) != nullptr) {
-			GameMessages::SendNotifyClientObject(selfId, u"exit", 0, 0, LWOOBJID_EMPTY, "", senderSysAddr);
+		if (scriptedActivityComponent->GetActivityPlayerData(sender->GetObjectID()) != nullptr) {
+			GameMessages::SendNotifyClientObject(self->GetObjectID(), u"exit", 0, 0, LWOOBJID_EMPTY, "", sender->GetSystemAddress());
 		} else {
-			GameMessages::SendNotifyClientObject(selfId, u"start", 0, 0, LWOOBJID_EMPTY, "", senderSysAddr);
+			GameMessages::SendNotifyClientObject(self->GetObjectID(), u"start", 0, 0, LWOOBJID_EMPTY, "", sender->GetSystemAddress());
 		}

-		scriptedActivityComponent->RemoveActivityPlayerData(senderId);
+		scriptedActivityComponent->RemoveActivityPlayerData(sender->GetObjectID());
 	}
 }

 void NpcAgCourseStarter::OnFireEventServerSide(Entity* self, Entity* sender, std::string args, int32_t param1, int32_t param2, int32_t param3) {
-	auto* const scriptedActivityComponent = self->GetComponent<ScriptedActivityComponent>();
-	if (!scriptedActivityComponent) return;
+	auto* scriptedActivityComponent = self->GetComponent<ScriptedActivityComponent>();
+	if (scriptedActivityComponent == nullptr) return;

-	const auto selfId = self->GetObjectID();
-	const auto senderId = sender->GetObjectID();
-	const auto& senderSysAddr = sender->GetSystemAddress();
-
-	auto* const data = scriptedActivityComponent->GetActivityPlayerData(senderId);
-	if (!data) return;
+	auto* data = scriptedActivityComponent->GetActivityPlayerData(sender->GetObjectID());
+	if (data == nullptr) return;

 	if (args == "course_cancel") {
-		GameMessages::SendNotifyClientObject(selfId, u"cancel_timer", 0, 0,
-			LWOOBJID_EMPTY, "", senderSysAddr);
-		scriptedActivityComponent->RemoveActivityPlayerData(senderId);
+		GameMessages::SendNotifyClientObject(self->GetObjectID(), u"cancel_timer", 0, 0,
+			LWOOBJID_EMPTY, "", sender->GetSystemAddress());
+		scriptedActivityComponent->RemoveActivityPlayerData(sender->GetObjectID());
 	} else if (args == "course_finish") {
-		const auto raceEndTime = Game::server->GetUptime();
-		const auto fRaceEndTime = std::chrono::duration<float, std::ratio<1>>(raceEndTime).count();
-		const auto raceTimeElapsed = fRaceEndTime - data->values[1];
-		data->values[2] = raceTimeElapsed;
+		time_t endTime = std::time(0);
+		time_t finish = (endTime - *reinterpret_cast<time_t*>(&data->values[1]));

-		auto* const missionComponent = sender->GetComponent<MissionComponent>();
+		data->values[2] = *reinterpret_cast<float*>(&finish);
+
+		auto* missionComponent = sender->GetComponent<MissionComponent>();
 		if (missionComponent != nullptr) {
 			missionComponent->ForceProgressTaskType(1884, 1, 1, false);
-			missionComponent->Progress(eMissionTaskType::PERFORM_ACTIVITY, -raceTimeElapsed, selfId,
+			missionComponent->Progress(eMissionTaskType::PERFORM_ACTIVITY, -finish, self->GetObjectID(),
 				"performact_time");
 		}

 		Game::entityManager->SerializeEntity(self);
-		LeaderboardManager::SaveScore(senderId, scriptedActivityComponent->GetActivityID(), raceTimeElapsed);
+		LeaderboardManager::SaveScore(sender->GetObjectID(), scriptedActivityComponent->GetActivityID(), static_cast<float>(finish));

-		GameMessages::SendNotifyClientObject(selfId, u"ToggleLeaderBoard",
-			scriptedActivityComponent->GetActivityID(), 0, senderId,
-			"", senderSysAddr);
-		GameMessages::SendNotifyClientObject(selfId, u"stop_timer", 1, raceTimeElapsed, LWOOBJID_EMPTY, "",
-			senderSysAddr);
+		GameMessages::SendNotifyClientObject(self->GetObjectID(), u"ToggleLeaderBoard",
+			scriptedActivityComponent->GetActivityID(), 0, sender->GetObjectID(),
+			"", sender->GetSystemAddress());
+		GameMessages::SendNotifyClientObject(self->GetObjectID(), u"stop_timer", 1, finish, LWOOBJID_EMPTY, "",
+			sender->GetSystemAddress());

-		scriptedActivityComponent->RemoveActivityPlayerData(senderId);
+		scriptedActivityComponent->RemoveActivityPlayerData(sender->GetObjectID());
 	}
 }
--- a/dScripts/02_server/Map/AM/RandomSpawnerFin.cpp
+++ b/dScripts/02_server/Map/AM/RandomSpawnerFin.cpp
@@ -65,13 +65,13 @@ void RandomSpawnerFin::OnStartup(Entity* self) {
 	};

 	sectionMultipliers = {
-		{"secA", 1.0f},
-		{"secB", 1.0f},
+		{"secA", 1},
+		{"secB", 1},
 		{"secC", 1.2f},
 		{"secD", 1.3f},
 		{"secE", 1.6f},
-		{"secF", 1.0f},
-		{"secG", 1.0f},
+		{"secF", 1},
+		{"secG", 1},
 		{"secH", 1.2f},
 	};

--- a/dScripts/02_server/Map/AM/RandomSpawnerPit.cpp
+++ b/dScripts/02_server/Map/AM/RandomSpawnerPit.cpp
@@ -65,7 +65,7 @@ void RandomSpawnerPit::OnStartup(Entity* self) {
 	};

 	sectionMultipliers = {
-		{"secA", 1.0f},
+		{"secA", 1},
 		{"secB", 1.2f},
 		{"secC", 1.2f},
 		{"secD", 1},
--- a/dScripts/02_server/Map/AM/RandomSpawnerStr.cpp
+++ b/dScripts/02_server/Map/AM/RandomSpawnerStr.cpp
@@ -65,8 +65,8 @@ void RandomSpawnerStr::OnStartup(Entity* self) {
 	};

 	sectionMultipliers = {
-		{"secA", 1.0f},
-		{"secB", 1.0f},
+		{"secA", 1},
+		{"secB", 1},
 		{"secC", 1.2f},
 	};

--- a/dScripts/CppScripts.cpp
+++ b/dScripts/CppScripts.cpp
@@ -329,7 +329,6 @@
 #include "WblRobotCitizen.h"
 #include "EnemyClearThreat.h"
 #include "AgSpiderBossMessage.h"
-#include "GfRaceInstancer.h"

 #include <map>
 #include <string>
@@ -691,7 +690,6 @@ namespace {
 		{"scripts\\zone\\LUPs\\RobotCity Intro\\WBL_RCIntro_RobotCitizenYellow.lua", []() {return new WblRobotCitizen();}},
 		{"scripts\\02_server\\Map\\General\\L_ENEMY_CLEAR_THREAT.lua", []() {return new EnemyClearThreat();}},
 		{"scripts\\ai\\AG\\L_AG_SPIDER_BOSS_MESSAGE.lua", []() {return new AgSpiderBossMessage();}},
-		{"scripts\\ai\\GF\\L_GF_RACE_INSTANCER.lua", []() {return new GfRaceInstancer();}},

 	};

@@ -705,8 +703,6 @@ namespace {
 		"scripts\\zone\\AG\\L_ZONE_AG.lua",
 		"scripts\\zone\\NS\\L_ZONE_NS.lua",
 		"scripts\\zone\\GF\\L_ZONE_GF.lua",
-		"scripts\\ai\\AG\\CONCERT_STAGE.lua",
-		"scripts\\ai\\NS\\L_NS_CAR_MODULAR_BUILD.lua", // In our implementation, this is done in GameMessages.cpp
 	};
 };

--- a/dScripts/CppScripts.h
+++ b/dScripts/CppScripts.h
@@ -354,7 +354,7 @@ namespace CppScripts {
 		 * @param player the player to remove
 		 * @param canceled if it was done via the cancel button
 		 */
-		virtual void OnRequestActivityExit(Entity* sender, LWOOBJID player, bool canceled) {};
+		virtual void OnRequestActivityExit(Entity* sender, LWOOBJID player, bool canceled){};
 	};

 	Script* const GetScript(Entity* parent, const std::string& scriptName);
--- a/dScripts/ai/AG/AgSpiderBossMessage.cpp
+++ b/dScripts/ai/AG/AgSpiderBossMessage.cpp
@@ -25,10 +25,11 @@ void AgSpiderBossMessage::MakeBox(Entity* self) const {
 	if (!tgt) return;
 	GameMessages::DisplayTooltip tooltip;
 	tooltip.target = tgt->GetObjectID();
+	tooltip.sysAddr = tgt->GetSystemAddress();
 	tooltip.show = true;
 	tooltip.text = box.boxText;
 	tooltip.time = box.boxTime * 1000; // to ms
-	tooltip.Send(tgt->GetSystemAddress());
+	tooltip.Send();
 }

 void AgSpiderBossMessage::OnCollisionPhantom(Entity* self, Entity* target) {
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
jadebenn	a36b611367	conceptualizing	2024-12-24 00:41:37 -06:00
jadebenn	85eb5a7261	testing iteration	2024-12-17 22:06:41 -06:00
jadebenn	93dcfddac5	try to fix CI failures on Windows and MacOS	2024-12-17 01:10:17 -06:00
jadebenn	82f510c642	syntax	2024-12-17 01:02:30 -06:00
jadebenn	ae4d9c4bcb	rename object ID method to match existing	2024-12-17 00:57:25 -06:00
jadebenn	b9e4aa5344	fix struct/class declaration mismatch	2024-12-17 00:55:22 -06:00
jadebenn	eab57e4022	documentation and cleanup	2024-12-17 00:25:29 -06:00
jadebenn	179f0cf32d	Merge branch 'main' of https://github.com/DarkflameUniverse/DarkflameServer into ecs-experiment	2024-12-17 00:13:59 -06:00
jadebenn	427b7c1047	initial implementation	2024-12-17 00:13:14 -06:00
jadebenn	afc2966507	make polymorphic component storage type	2024-12-14 13:47:35 -06:00